paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a problem causing [sqldiff --rbu] to fail on tables for which all columns are part of the PRIMARY KEY.

Browse Source 
FossilOrigin-Name: 93449e7046d60cad020ca439ded82e759c2e3cd9
This commit is contained in:
dan
2015-07-31 15:13:29 +00:00
parent 79e2347fdf
commit dd688e7970
4 changed files with 101 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/rbu/rbudiff.test
+64 -35
View File
@@ -53,48 +53,77 @@ proc apply_rbudiff {sql target} {
}
proc rbudiff_cksum {db1} {
set txt ""
sqlite3 dbtmp $db1
set txt [dbtmp eval {
SELECT a || '.' || b || '.' || c FROM t1 ORDER BY 1;
SELECT a || '.' || b || '.' || c FROM t2 ORDER BY 1;
}]
foreach tbl [dbtmp eval {SELECT name FROM sqlite_master WHERE type='table'}] {
append txt [dbtmp eval \
"SELECT a || '.' || b || '.' || c FROM $tbl ORDER BY 1"
]
}
dbtmp close
md5 $txt
}
sqlite3 db test.db
do_execsql_test 1.0 {
CREATE TABLE t1(a PRIMARY KEY, b, c);
INSERT INTO t1 VALUES(1, 2, 3);
INSERT INTO t1 VALUES(4, 5, 6);
foreach {tn init mod} {
1 {
CREATE TABLE t1(a PRIMARY KEY, b, c);
INSERT INTO t1 VALUES(1, 2, 3);
INSERT INTO t1 VALUES(4, 5, 6);
CREATE TABLE t2(a, b, c, PRIMARY KEY(b, c));
INSERT INTO t2 VALUES(1, 2, 3);
INSERT INTO t2 VALUES(4, 5, 6);
} {
INSERT INTO t1 VALUES(7, 8, 9);
DELETE FROM t1 WHERE a=4;
UPDATE t1 SET c = 11 WHERE a = 1;
INSERT INTO t2 VALUES(7, 8, 9);
DELETE FROM t2 WHERE a=4;
UPDATE t2 SET c = 11 WHERE a = 1;
}
CREATE TABLE t2(a, b, c, PRIMARY KEY(b, c));
INSERT INTO t2 VALUES(1, 2, 3);
INSERT INTO t2 VALUES(4, 5, 6);
2 {
CREATE TABLE t1(a, b, c, PRIMARY KEY(a, b, c));
INSERT INTO t1 VALUES('u', 'v', 'w');
INSERT INTO t1 VALUES('x', 'y', 'z');
} {
DELETE FROM t1 WHERE a='u';
INSERT INTO t1 VALUES('a', 'b', 'c');
}
} {
catch { db close }
forcedelete test.db test.db2
sqlite3 db test.db
db eval "$init"
sqlite3 db test.db2
db eval "$init ; $mod"
db close
do_test 1.$tn.2 {
set sql [get_rbudiff_sql test.db test.db2]
apply_rbudiff $sql test.db
} {SQLITE_DONE}
do_test 1.$tn.3 { rbudiff_cksum test.db } [rbudiff_cksum test.db2]
forcedelete test.db test.db2
sqlite3 db test.db
db eval "$init ; $mod"
sqlite3 db test.db2
db eval "$init"
db close
do_test 1.$tn.4 {
set sql [get_rbudiff_sql test.db test.db2]
apply_rbudiff $sql test.db
} {SQLITE_DONE}
do_test 1.$tn.5 { rbudiff_cksum test.db } [rbudiff_cksum test.db2]
}
db close
forcedelete test.db2
forcecopy test.db test.db2
sqlite3 db test.db
do_execsql_test 1.1 {
INSERT INTO t1 VALUES(7, 8, 9);
DELETE FROM t1 WHERE a=4;
UPDATE t1 SET c = 11 WHERE a = 1;
INSERT INTO t2 VALUES(7, 8, 9);
DELETE FROM t2 WHERE a=4;
UPDATE t2 SET c = 11 WHERE a = 1;
}
db close
do_test 1.2 {
set sql [get_rbudiff_sql test.db test.db2]
apply_rbudiff $sql test.db
} {SQLITE_DONE}
do_test 1.3 { rbudiff_cksum test.db } [rbudiff_cksum test.db2]
finish_test