Additional test cases

FossilOrigin-Name: da16fe363e2b0f8e735405a03fd0cae0796333c37d41cb323863d3803ebfdc45

diff --git a/manifest b/manifest
index eb751f2c8fcdbe106052af1c99ad546d4c54b5b5..01be45cffb2cc5c07f26eef52c7d34e9de0f83c3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sa\swrite\swith\sREPLACE\sconflict\sresolution\son\san\sinteger\sprimary\skey\scolumn\sis\shandled\safter\sany\sIGNORE\sor\sFAIL\sconflicts,\seven\sif\sthere\sis\salso\san\sexplicit\s"ON\sCONFLICT"\sclause\sunrelated\sto\sthe\sIPK.\sForum\spost\s[forum:/info/2026-07-17T09:30:42Z\s|\s2026-07-17T09:30:42Z].
-D 2026-07-17T16:26:56.257
+C Additional\stest\scases
+D 2026-07-17T23:25:28.543
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1947,7 +1947,7 @@ F test/upfrom2.test 66f3ebf721b3cebd922faee5c386bf244f816d416b57c000753ff51af623
 F test/upfrom3.test 6130f24ebf97f5ea865e5d2a14a2d543fe5428a62e87cc60f62d875e45c1f5f0
 F test/upfrom4.test 78f742a6577c91a7a55c64edb8811004e7c6aa99b8d57b2320f70a918c357807
 F test/upfromfault.test 3a10075a0043f0c4fad6614b2c371f88a8ba5a4acab68b907438413865d6a8d6
-F test/upsert1.test cfaa6eab3c0d3e8512664a92570348482c61e71b02e0ec75837e4fb37fe4e430
+F test/upsert1.test d8f2c15752f906fac51eb1b55902a15c9c68046da156ee3b37ec9117c2e4d776
 F test/upsert2.test 720e94d09f7362a282bc69b3c6b83d51daeaaf0440eb4920a08b86518b8c7496
 F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3179c
 F test/upsert4.test 25d2a1da92f149331ae0c51ca6e3eee78189577585eab92de149900d62994fa5
@@ -2215,11 +2215,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 6924895d2cbc50971d8da1810423ad15c638dabc31b4f1083dd6076e20492ef4
-R 506e7819684ce1917475a4b1d4a399da
-T *branch * do-nothing-replace-bug
-T *sym-do-nothing-replace-bug *
-T -sym-trunk *
-U dan
-Z 975ed7664c025722600a0d0d2b0ab4aa
+P 1875249ab30fb110bc09963b592c8f48d2fb57066d770ad7e1da7e8bc8602977
+R 687540f056163295440455e10a8f2d83
+U drh
+Z 550171b5c0d55c96caac349090f33e1d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ec96f9a1e4fcb3161b94f25d145ab783be27b3e1..31275cfd8d057d9ce9f669c60a2df5411b282904 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1875249ab30fb110bc09963b592c8f48d2fb57066d770ad7e1da7e8bc8602977
+da16fe363e2b0f8e735405a03fd0cae0796333c37d41cb323863d3803ebfdc45

diff --git a/test/upsert1.test b/test/upsert1.test
index aecf1c8530ccd044af38196b46c078cae8f3b214..1cf7a4baec382c80a86cc9c13d5de7226b8b912a 100644 (file)
--- a/test/upsert1.test
+++ b/test/upsert1.test
@@ -353,6 +353,28 @@ do_execsql_test upsert1-1490 {
 do_execsql_test upsert1-1500 {
   SELECT * FROM t ORDER BY a;
 } {1 10 100 2 20 200}
+do_execsql_test upsert1-1510 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE ON CONFLICT FAIL, c UNIQUE);
+  INSERT INTO t1 VALUES(1, 1, 1);
+}
+do_catchsql_test upsert1-1520 {
+  -- Inserts 0 rows, because hitting the constraint on (b) does ABORT:
+  INSERT INTO t1 VALUES(3, 3, 3), (2, 1, 2) ON CONFLICT(c) DO NOTHING;
+} {1 {UNIQUE constraint failed: t1.b}}
+do_execsql_test upsert1-1530 {
+  SELECT * FROM t1 ORDER BY a;
+} {1 1 1 3 3 3}
+do_catchsql_test upsert1-1530 {
+  -- Inserts 1 row, because hitting the constraint on (b) does FAIL:
+  DELETE FROM t1 WHERE a=3;
+  INSERT INTO t1 VALUES(3, 3, 3), (2, 1, 2);
+} {1 {UNIQUE constraint failed: t1.b}}
+do_execsql_test upsert1-1540 {
+  SELECT * FROM t1 ORDER BY a;
+} {1 1 1 3 3 3}
+do_execsql_test upsert1-1550 {
+  PRAGMA integrity_check;
+} ok
 
-finish_test
 
+finish_test