Minor changes to test script upsert4.test.

FossilOrigin-Name: 0cb83c84d10b89ef7a5504862566a609307c63e7571dd711d8b9f995d29e5a8c

diff --git a/manifest b/manifest
index 222b8aacbbb9f1f4349c84b2bb70bf04b50aa093..f791b128ae0643e04128245a266576af3ab74c53 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\scase\sinside\sdistinct.test.
-D 2018-04-18T18:19:25.251
+C Minor\schanges\sto\stest\sscript\supsert4.test.
+D 2018-04-18T19:45:14.101
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -1510,7 +1510,7 @@ F test/update2.test 5e67667e1c54017d964e626db765cf8bedcf87483c184f4c575bdb8c1dd2
 F test/upsert1.test 3b4e8e5932516115bfffb2269a44c416c5c26d0d57cc7dd16954d0b77fbc4cd9
 F test/upsert2.test 82ed5cbd4a13ff74240ece8ec97b6afd07446eac554ad5e93c12b42197844e0b
 F test/upsert3.test 46ee74a7d7ee797ca0ab79d44e78572d6778b7520e4ebb8f8c1553765b4eae2c
-F test/upsert4.test 42b737568914a7bfb1135c641ae96bc75fbfd7b55785a4eaae279a067a373420
+F test/upsert4.test 83b37a92f315217c9319f320966c044ddccf8bc525501fa09e2ee47779e3920b
 F test/uri.test 3481026f00ade6dfe8adb7acb6e1e47b04369568
 F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7
 F test/userauth01.test e740a2697a7b40d7c5003a7d7edaee16acd349a9
@@ -1722,7 +1722,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 8f4376e52b6124986937a3837ad83a18863c3144ef3b438a0d5e9231bf6c8980
-R c56b2d1a55a66b243d28d724ba692c63
-U drh
-Z c48d320a1521f893c96f79a92bf02734
+P 61cb8a391a0c709340ac60ffd0c58f950567892a8404c2bec7b9b1f64b3cc5cf
+R 6c33138f3c02d47a81dcde27f15e792f
+U dan
+Z 1740208f0524dae2e22fe373b2efc4e7

diff --git a/manifest.uuid b/manifest.uuid
index 1319607d068b63697d6f11df11dc5dfbe07dfef7..b4c6aa04e4145f2f7aaf8ec2de6d4d9db8078366 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-61cb8a391a0c709340ac60ffd0c58f950567892a8404c2bec7b9b1f64b3cc5cf
\ No newline at end of file
+0cb83c84d10b89ef7a5504862566a609307c63e7571dd711d8b9f995d29e5a8c
\ No newline at end of file

diff --git a/test/upsert4.test b/test/upsert4.test
index 1f6b2d299145c9192d2c287942c10075c3267dbf..afc2aacf8d773cd8af4019d5f6b3e7526e627bef 100644 (file)
--- a/test/upsert4.test
+++ b/test/upsert4.test
@@ -115,6 +115,7 @@ foreach {tn sql} {
     5 "ON CONFLICT DO NOTHING"                            0
     6 "ON CONFLICT (b, c, d) WHERE a!=0 DO NOTHING"       0
     7 "ON CONFLICT (d, c, c) WHERE a!=0 DO NOTHING"       2
+    8 "ON CONFLICT (b COLLATE nocase, c COLLATE nocase, d) DO NOTHING"   2
   } {
 
     do_catchsql_test 2.$tn.2.$tn2 "
@@ -128,11 +129,11 @@ foreach {tn sql} {
 }
 
 foreach {tn sql} {
-  1 { 
+  1 {
     CREATE TABLE abc(a INTEGER PRIMARY KEY, x, y);
     CREATE UNIQUE INDEX abc1 ON abc(('x' || x) COLLATE nocase);
   }
-  2 { 
+  2 {
     CREATE TABLE abc(a INT PRIMARY KEY, x, y);
     CREATE UNIQUE INDEX abc1 ON abc(('x' || x) COLLATE nocase);
   }
@@ -165,6 +166,12 @@ foreach {tn sql} {
   } {1 one two}
 }
 
+do_catchsql_test 3.0 {
+  CREATE TABLE w1(a INT PRIMARY KEY, x, y);
+  CREATE UNIQUE INDEX w1expr ON w1(('x' || x));
+  INSERT INTO w1 VALUES(2, 'one', NULL)
+    ON CONFLICT (('x' || x) COLLATE nocase) DO NOTHING;
+} {1 {ON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint}}
 
 finish_test