-# 2011 March 07
+# 2021 Februar 20
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
set testprefix sessionnoop
-foreach {tn wo} {
- 1 ""
- 2 " WITHOUT ROWID "
-} {
- reset_db
- eval [string map [list %WO% $wo] {
-do_execsql_test $tn.1.0 {
- CREATE TABLE t1(a PRIMARY KEY, b, c) %WO%;
- INSERT INTO t1 VALUES('a', 'A', 'AAA');
- INSERT INTO t1 VALUES('b', 'B', 'BBB');
- INSERT INTO t1 VALUES('c', 'C', 'CCC');
- INSERT INTO t1 VALUES('d', 'D', 'DDD');
- INSERT INTO t1 VALUES('e', 'E', 'EEE');
-}
-
-forcedelete test.db2
-sqlite3 db2 test.db2
+#-------------------------------------------------------------------------
+# Test plan:
+#
+# 1.*: Test that concatenating changesets cannot produce a noop UPDATE.
+# 2.*: Test that rebasing changesets cannot produce a noop UPDATE.
+# 3.*: Test that sqlite3changeset_apply() ignores noop UPDATE changes.
+#
-do_execsql_test -db db2 $tn.1.1 {
- CREATE TABLE t1(a PRIMARY KEY, b, c) %WO%;
- INSERT INTO t1 VALUES('a', 'A', 'AAA');
- INSERT INTO t1 VALUES('b', 'B', '123');
- INSERT INTO t1 VALUES('c', 'C', 'CCC');
- INSERT INTO t1 VALUES('e', 'E', 'EEE');
- INSERT INTO t1 VALUES('f', 'F', 'FFF');
+do_execsql_test 1.0 {
+ CREATE TABLE t1(a PRIMARY KEY, b, c, d);
+ INSERT INTO t1 VALUES(1, 1, 1, 1);
+ INSERT INTO t1 VALUES(2, 2, 2, 2);
+ INSERT INTO t1 VALUES(3, 3, 3, 3);
}
-set C [changeset_from_sql {
- UPDATE t1 SET c='123' WHERE a='b';
- DELETE FROM t1 WHERE a='d';
- INSERT INTO t1 VALUES('f', 'F', 'FFF');
-}]
-
-
-set ::conflict_list [list]
-proc xConflict {args} {
- lappend ::conflict_list $args
- return "OMIT"
+proc do_concat_test {tn sql1 sql2 res} {
+ uplevel [list do_test $tn [subst -nocommands {
+ set C1 [changeset_from_sql {$sql1}]
+ set C2 [changeset_from_sql {$sql2}]
+ set C3 [sqlite3changeset_concat [set C1] [set C2]]
+ set got [list]
+ sqlite3session_foreach elem [set C3] { lappend got [set elem] }
+ set got
+ }] [list {*}$res]]
}
-do_test $tn.1.2 {
- sqlite3changeset_apply_v2 db2 $C xConflict
- set ::conflict_list
-} [list {*}{
- {UPDATE t1 DATA {t b {} {} t BBB} {{} {} {} {} t 123} {t b t B t 123}}
- {INSERT t1 CONFLICT {t f t F t FFF} {t f t F t FFF}}
- {DELETE t1 NOTFOUND {t d t D t DDD}}
-}]
-do_test $tn.1.3 {
- set ::conflict_list [list]
- sqlite3changeset_apply_v2 db2 $C xConflict
- set ::conflict_list
-} [list {*}{
- {UPDATE t1 DATA {t b {} {} t BBB} {{} {} {} {} t 123} {t b t B t 123}}
- {INSERT t1 CONFLICT {t f t F t FFF} {t f t F t FFF}}
- {DELETE t1 NOTFOUND {t d t D t DDD}}
-}]
-
-do_test $tn.1.4 {
- set ::conflict_list [list]
- sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
- set ::conflict_list
-} {}
-do_execsql_test -db db2 1.5 {
- UPDATE t1 SET b='G' WHERE a='f';
- UPDATE t1 SET c='456' WHERE a='b';
+do_concat_test 1.1 {
+ UPDATE t1 SET c=c+1;
+} {
+ UPDATE t1 SET c=c-1;
+} {
}
-do_test $tn.1.6 {
- set ::conflict_list [list]
- sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
- set ::conflict_list
-} [list {*}{
- {UPDATE t1 DATA {t b {} {} t BBB} {{} {} {} {} t 123} {t b t B t 456}}
- {INSERT t1 CONFLICT {t f t F t FFF} {t f t G t FFF}}
-}]
-
-db2 close
-
-#--------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------
reset_db
-forcedelete test.db2
-sqlite3 db2 test.db2
-do_execsql_test $tn.2.0 {
- CREATE TABLE t1(a PRIMARY KEY, b) %WO%;
+do_execsql_test 2.0 {
+ CREATE TABLE t1(a PRIMARY KEY, b, c);
+ INSERT INTO t1 VALUES(1, 1, 1);
+ INSERT INTO t1 VALUES(2, 2, 2);
+ INSERT INTO t1 VALUES(3, 3, 3);
}
-do_execsql_test -db db2 $tn.2.1 {
- CREATE TABLE t1(a PRIMARY KEY, b, c DEFAULT 'val') %WO%;
+
+proc do_rebase_test {tn sql_local sql_remote conflict_res expected} {
+ proc xConflict {args} [list return $conflict_res]
+
+ uplevel [list \
+ do_test $tn [subst -nocommands {
+ execsql BEGIN
+ set c_remote [changeset_from_sql {$sql_remote}]
+ execsql ROLLBACK
+
+ execsql BEGIN
+ set c_local [changeset_from_sql {$sql_local}]
+ set base [sqlite3changeset_apply_v2 db [set c_remote] xConflict]
+ execsql ROLLBACK
+
+ sqlite3rebaser_create R
+ R config [set base]
+ set res [list]
+ sqlite3session_foreach elem [R rebase [set c_local]] {
+ lappend res [set elem]
+ }
+ R delete
+ set res
+ }] [list {*}$expected]
+ ]
}
-do_test $tn.2.2 {
- do_then_apply_sql -ignorenoop {
- INSERT INTO t1 VALUES(1, 2);
- }
- do_then_apply_sql -ignorenoop {
- UPDATE t1 SET b=2 WHERE a=1
- }
-} {}
+do_rebase_test 2.1 {
+ UPDATE t1 SET c=2 WHERE a=1; -- local
+} {
+ UPDATE t1 SET c=3 WHERE a=1; -- remote
+} OMIT {
+ {UPDATE t1 0 X.. {i 1 {} {} i 3} {{} {} {} {} i 2}}
+}
+do_rebase_test 2.2 {
+ UPDATE t1 SET c=2 WHERE a=1; -- local
+} {
+ UPDATE t1 SET c=3 WHERE a=1; -- remote
+} REPLACE {
+}
-}]
+do_rebase_test 2.3.1 {
+ UPDATE t1 SET c=4 WHERE a=1; -- local
+} {
+ UPDATE t1 SET c=4 WHERE a=1 -- remote
+} OMIT {
+ {UPDATE t1 0 X.. {i 1 {} {} i 4} {{} {} {} {} i 4}}
}
-db2 close
+do_rebase_test 2.3.2 {
+ UPDATE t1 SET c=5 WHERE a=1; -- local
+} {
+ UPDATE t1 SET c=5 WHERE a=1 -- remote
+} REPLACE {
+}
#-------------------------------------------------------------------------
+#
reset_db
-forcedelete test.db2
do_execsql_test 3.0 {
- CREATE TABLE xyz(a, b, c, PRIMARY KEY(a, b), UNIQUE(c));
- ANALYZE;
- WITH s(i) AS (
- VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<100
- )
- INSERT INTO xyz SELECT i, i, i FROM s;
- VACUUM INTO 'test.db2';
+ CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
+ INSERT INTO t1 VALUES(1, 1, 1);
+ INSERT INTO t1 VALUES(2, 2, 2);
+ INSERT INTO t1 VALUES(3, 3, 3);
+ INSERT INTO t1 VALUES(4, 4, 4);
+}
+
+# Arg $pkstr contains one character for each column in the table. An
+# "X" for PK column, or a "." for a non-PK.
+#
+proc mk_tbl_header {name pkstr} {
+ set ret [binary format H2c 54 [string length $pkstr]]
+ foreach i [split $pkstr {}] {
+ if {$i=="X"} {
+ append ret [binary format H2 01]
+ } else {
+ if {$i!="."} {error "bad pkstr: $pkstr ($i)"}
+ append ret [binary format H2 00]
+ }
+ }
+ append ret $name
+ append ret [binary format H2 00]
+ set ret
}
-set C [changeset_from_sql { ANALYZE }]
-sqlite3 db2 test.db2
+proc mk_update_change {args} {
+ set ret [binary format H2H2 17 00]
+ foreach a $args {
+ if {$a==""} {
+ append ret [binary format H2 00]
+ } else {
+ append ret [binary format H2W 01 $a]
+ }
+ }
+ set ret
+}
-set ::conflict_list [list]
-proc xConflict {args} { lappend ::conflict_list $args ; return "OMIT" }
+proc xConflict {args} { return "ABORT" }
do_test 3.1 {
- sqlite3changeset_apply_v2 db2 $C xConflict
- set ::conflict_list
-} {}
+ set C [mk_tbl_header t1 X..]
+ append C [mk_update_change 1 {} 1 {} {} 500]
+ append C [mk_update_change 2 {} {} {} {} {}]
+ append C [mk_update_change 3 3 {} {} 600 {}]
+ append C [mk_update_change 4 {} {} {} {} {}]
-do_test 3.2 {
- sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
- set ::conflict_list
+ sqlite3changeset_apply_v2 db $C xConflict
} {}
+do_execsql_test 3.2 {
+ SELECT * FROM t1
+} {
+ 1 1 500
+ 2 2 2
+ 3 600 3
+ 4 4 4
+}
-do_test 3.3 {
- sqlite3changeset_apply_v2 db2 $C xConflict
- set ::conflict_list
-} [list {*}{
- {INSERT sqlite_stat1 CONFLICT {t xyz t sqlite_autoindex_xyz_1 t {100 1 1}} {t xyz t sqlite_autoindex_xyz_1 t {100 1 1}}}
- {INSERT sqlite_stat1 CONFLICT {t xyz t sqlite_autoindex_xyz_2 t {100 1}} {t xyz t sqlite_autoindex_xyz_2 t {100 1}}}
-}]
-do_execsql_test -db db2 3.4 {
- UPDATE sqlite_stat1 SET stat='200 1 1' WHERE idx='sqlite_autoindex_xyz_1';
-}
-do_test 3.5 {
- set ::conflict_list [list]
- sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
- set ::conflict_list
-} [list {*}{
- {INSERT sqlite_stat1 CONFLICT {t xyz t sqlite_autoindex_xyz_1 t {100 1 1}} {t xyz t sqlite_autoindex_xyz_1 t {200 1 1}}}
-}]
--- /dev/null
+# 2011 March 07
+#
+# The author disclaims copyright to this source code. In place of
+# a legal notice, here is a blessing:
+#
+# May you do good and not evil.
+# May you find forgiveness for yourself and forgive others.
+# May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+#
+
+if {![info exists testdir]} {
+ set testdir [file join [file dirname [info script]] .. .. test]
+}
+source [file join [file dirname [info script]] session_common.tcl]
+source $testdir/tester.tcl
+ifcapable !session {finish_test; return}
+
+set testprefix sessionnoop
+
+foreach {tn wo} {
+ 1 ""
+ 2 " WITHOUT ROWID "
+} {
+ reset_db
+ eval [string map [list %WO% $wo] {
+do_execsql_test $tn.1.0 {
+ CREATE TABLE t1(a PRIMARY KEY, b, c) %WO%;
+ INSERT INTO t1 VALUES('a', 'A', 'AAA');
+ INSERT INTO t1 VALUES('b', 'B', 'BBB');
+ INSERT INTO t1 VALUES('c', 'C', 'CCC');
+ INSERT INTO t1 VALUES('d', 'D', 'DDD');
+ INSERT INTO t1 VALUES('e', 'E', 'EEE');
+}
+
+forcedelete test.db2
+sqlite3 db2 test.db2
+
+do_execsql_test -db db2 $tn.1.1 {
+ CREATE TABLE t1(a PRIMARY KEY, b, c) %WO%;
+ INSERT INTO t1 VALUES('a', 'A', 'AAA');
+ INSERT INTO t1 VALUES('b', 'B', '123');
+ INSERT INTO t1 VALUES('c', 'C', 'CCC');
+ INSERT INTO t1 VALUES('e', 'E', 'EEE');
+ INSERT INTO t1 VALUES('f', 'F', 'FFF');
+}
+
+set C [changeset_from_sql {
+ UPDATE t1 SET c='123' WHERE a='b';
+ DELETE FROM t1 WHERE a='d';
+ INSERT INTO t1 VALUES('f', 'F', 'FFF');
+}]
+
+
+set ::conflict_list [list]
+proc xConflict {args} {
+ lappend ::conflict_list $args
+ return "OMIT"
+}
+do_test $tn.1.2 {
+ sqlite3changeset_apply_v2 db2 $C xConflict
+ set ::conflict_list
+} [list {*}{
+ {UPDATE t1 DATA {t b {} {} t BBB} {{} {} {} {} t 123} {t b t B t 123}}
+ {INSERT t1 CONFLICT {t f t F t FFF} {t f t F t FFF}}
+ {DELETE t1 NOTFOUND {t d t D t DDD}}
+}]
+do_test $tn.1.3 {
+ set ::conflict_list [list]
+ sqlite3changeset_apply_v2 db2 $C xConflict
+ set ::conflict_list
+} [list {*}{
+ {UPDATE t1 DATA {t b {} {} t BBB} {{} {} {} {} t 123} {t b t B t 123}}
+ {INSERT t1 CONFLICT {t f t F t FFF} {t f t F t FFF}}
+ {DELETE t1 NOTFOUND {t d t D t DDD}}
+}]
+
+do_test $tn.1.4 {
+ set ::conflict_list [list]
+ sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
+ set ::conflict_list
+} {}
+
+do_execsql_test -db db2 1.5 {
+ UPDATE t1 SET b='G' WHERE a='f';
+ UPDATE t1 SET c='456' WHERE a='b';
+}
+
+do_test $tn.1.6 {
+ set ::conflict_list [list]
+ sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
+ set ::conflict_list
+} [list {*}{
+ {UPDATE t1 DATA {t b {} {} t BBB} {{} {} {} {} t 123} {t b t B t 456}}
+ {INSERT t1 CONFLICT {t f t F t FFF} {t f t G t FFF}}
+}]
+
+db2 close
+
+#--------------------------------------------------------------------------
+
+reset_db
+forcedelete test.db2
+sqlite3 db2 test.db2
+do_execsql_test $tn.2.0 {
+ CREATE TABLE t1(a PRIMARY KEY, b) %WO%;
+}
+do_execsql_test -db db2 $tn.2.1 {
+ CREATE TABLE t1(a PRIMARY KEY, b, c DEFAULT 'val') %WO%;
+}
+
+do_test $tn.2.2 {
+ do_then_apply_sql -ignorenoop {
+ INSERT INTO t1 VALUES(1, 2);
+ }
+ do_then_apply_sql -ignorenoop {
+ UPDATE t1 SET b=2 WHERE a=1
+ }
+} {}
+
+
+}]
+}
+
+db2 close
+
+#-------------------------------------------------------------------------
+reset_db
+forcedelete test.db2
+do_execsql_test 3.0 {
+ CREATE TABLE xyz(a, b, c, PRIMARY KEY(a, b), UNIQUE(c));
+ ANALYZE;
+ WITH s(i) AS (
+ VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<100
+ )
+ INSERT INTO xyz SELECT i, i, i FROM s;
+ VACUUM INTO 'test.db2';
+}
+
+set C [changeset_from_sql { ANALYZE }]
+sqlite3 db2 test.db2
+
+set ::conflict_list [list]
+proc xConflict {args} { lappend ::conflict_list $args ; return "OMIT" }
+do_test 3.1 {
+ sqlite3changeset_apply_v2 db2 $C xConflict
+ set ::conflict_list
+} {}
+
+do_test 3.2 {
+ sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
+ set ::conflict_list
+} {}
+
+do_test 3.3 {
+ sqlite3changeset_apply_v2 db2 $C xConflict
+ set ::conflict_list
+} [list {*}{
+ {INSERT sqlite_stat1 CONFLICT {t xyz t sqlite_autoindex_xyz_1 t {100 1 1}} {t xyz t sqlite_autoindex_xyz_1 t {100 1 1}}}
+ {INSERT sqlite_stat1 CONFLICT {t xyz t sqlite_autoindex_xyz_2 t {100 1}} {t xyz t sqlite_autoindex_xyz_2 t {100 1}}}
+}]
+
+do_execsql_test -db db2 3.4 {
+ UPDATE sqlite_stat1 SET stat='200 1 1' WHERE idx='sqlite_autoindex_xyz_1';
+}
+
+do_test 3.5 {
+ set ::conflict_list [list]
+ sqlite3changeset_apply_v2 -ignorenoop db2 $C xConflict
+ set ::conflict_list
+} [list {*}{
+ {INSERT sqlite_stat1 CONFLICT {t xyz t sqlite_autoindex_xyz_1 t {100 1 1}} {t xyz t sqlite_autoindex_xyz_1 t {200 1 1}}}
+}]
+
+
+
+finish_test
+