From: dan <dan@noemail.net>
Date: Mon, 22 Aug 2016 21:01:39 +0000 (+0000)
Subject: Add a couple of extra tests to changebatch1.test.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7d16a5cd1fa45e1a57d83d7fd46efa7a0f00621;p=thirdparty%2Fsqlite.git

Add a couple of extra tests to changebatch1.test.

FossilOrigin-Name: 207d970b7956c38af42c389b91a741a68b2c4eec
---

diff --git a/ext/session/changebatch1.test b/ext/session/changebatch1.test
index 6e9d1a9074..056512aca3 100644
--- a/ext/session/changebatch1.test
+++ b/ext/session/changebatch1.test
@@ -52,4 +52,39 @@ do_changebatch_test 1.1 {
   DELETE FROM t1 WHERE a=1;
 }
 
+do_execsql_test 1.2.0 {
+  INSERT INTO t1 VALUES(1, 1);
+  INSERT INTO t1 VALUES(2, 2);
+  INSERT INTO t1 VALUES(3, 3);
+}
+do_changebatch_test 1.2.1 {
+  DELETE FROM t1 WHERE a=2;
+} {
+  INSERT INTO t1 VALUES(2, 2);
+}
+
+#-------------------------------------------------------------------------
+do_execsql_test 2.0 {
+  CREATE TABLE x1(a, b PRIMARY KEY, c UNIQUE);
+  CREATE TABLE x2(a PRIMARY KEY, b UNIQUE, c UNIQUE);
+
+  INSERT INTO x1 VALUES(1, 1, 'a');
+  INSERT INTO x1 VALUES(1, 2, 'b');
+  INSERT INTO x1 VALUES(1, 3, 'c');
+}
+
+do_changebatch_test 2.1 {
+  DELETE FROM x1 WHERE b=2;
+} {
+  UPDATE x1 SET c='b' WHERE b=3;
+}
+
+do_changebatch_test 2.2 {
+  DELETE FROM x1 WHERE b=1;
+} {
+  INSERT INTO x1 VALUES(1, 5, 'a');
+}
+
 finish_test
+
+
diff --git a/manifest b/manifest
index 698acd2427..d16bdf85a5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sexperimental\smodule\sto\sdetect\sconflicts\sbetween\ssessions\schangesets.
-D 2016-08-22T20:49:06.286
+C Add\sa\scouple\sof\sextra\stests\sto\schangebatch1.test.
+D 2016-08-22T21:01:39.413
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -281,7 +281,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F ext/session/changebatch1.test 5a69388b91ad02544ef2d9ae27771dbf0f9cea58
+F ext/session/changebatch1.test b2d1a8c8b8f86881f50b481eae233f8abfb61436
 F ext/session/changeset.c 4ccbaa4531944c24584bf6a61ba3a39c62b6267a
 F ext/session/session1.test 98f384736e2bc21ccf5ed81bdadcff4ad863393b
 F ext/session/session2.test 284de45abae4cc1082bc52012ee81521d5ac58e0
@@ -1514,10 +1514,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 083f9e6270fa4faa402b91231271da4f3915c79f
-R c89955dc116a299d44f6360524b79a8a
-T *branch * changebatch
-T *sym-changebatch *
-T -sym-trunk *
+P 0c9fd6b723041955b5182caa430312e5124fdc83
+R 0bf0e85497e377afe1f85fb7abd8225d
 U dan
-Z f9a59b56ef4c3ca7ba5584bf19e5e811
+Z cf85cb19b321088cfc5e96ee875ee34c
diff --git a/manifest.uuid b/manifest.uuid
index 7935283ab4..f8bc749f9d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0c9fd6b723041955b5182caa430312e5124fdc83
\ No newline at end of file
+207d970b7956c38af42c389b91a741a68b2c4eec
\ No newline at end of file