Enhancements to new test cases, for improved readability.

FossilOrigin-Name: 053e0d1f011d9ff4d57a6e33adf8de9a7a5550a3c5f6a6d4c511f75b85a09a99

diff --git a/manifest b/manifest
index ba37008ce104a37ed7b0a466037ca2bd61615e62..15ec56e3295273a38e3c325662699980aea28f2f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sfrom\n[forum:/info/2026-07-18T03:35:48Z|Forum\sPost\s2026-07-18T03:35:48Z].\nNew\stest\scases\sare\scurrently\sfailing,\sas\snew\sor\salternative\sfixes\nare\sneeded\sfor\sthe\soriginal\sproblem.
-D 2026-07-18T08:46:36.172
+C Enhancements\sto\snew\stest\scases,\sfor\simproved\sreadability.
+D 2026-07-18T09:04:36.385
 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 4ce8abe35a5d8370fd069338c993bcca61ce5b7de5f8a80fe6a990ab805b8018
+F test/upsert1.test 107290c1f7c4d504fa8190e479841ad29403af529f1cefef5c1fd501a6a584e1
 F test/upsert2.test 720e94d09f7362a282bc69b3c6b83d51daeaaf0440eb4920a08b86518b8c7496
 F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3179c
 F test/upsert4.test 25d2a1da92f149331ae0c51ca6e3eee78189577585eab92de149900d62994fa5
@@ -2215,8 +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 da16fe363e2b0f8e735405a03fd0cae0796333c37d41cb323863d3803ebfdc45
-R a60971113a47d3e3d0eac3731dd75625
+P 49b67b7da6bceae3ee87153480e676f53a472b0f6e0ed8d1866ed819e8f64fa1
+R a1baa1ad016fb074a57c9a0c952a57d3
 U drh
-Z d42e81dbfc96d3389e59de448f813cc7
+Z a3259deb28c29afa079e0e7d4cb177b8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ad367302cda56d9f111313e18476c8a5c3df0565..6233bce6127086a6f96e20578e2b698d04d4741d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-49b67b7da6bceae3ee87153480e676f53a472b0f6e0ed8d1866ed819e8f64fa1
+053e0d1f011d9ff4d57a6e33adf8de9a7a5550a3c5f6a6d4c511f75b85a09a99

diff --git a/test/upsert1.test b/test/upsert1.test
index a464f7449de97248cee99eb9ce4ba507856c2dea..40b9d5d0f8ea3337a7d19c3c3fff81e6190eb382 100644 (file)
--- a/test/upsert1.test
+++ b/test/upsert1.test
@@ -301,8 +301,8 @@ reset_db
 do_execsql_test upsert1-1400 {
   CREATE TABLE t0(
     a INTEGER PRIMARY KEY ON CONFLICT REPLACE,
-    b INT UNIQUE ON CONFLICT FAIL,
-    c INT UNIQUE
+    b INT UNIQUE          ON CONFLICT FAIL,
+    c INT UNIQUE          ON CONFLICT ABORT
   );
   INSERT INTO t0 VALUES (1, 10, 100),(2, 20, 200);
 }
@@ -319,8 +319,8 @@ do_execsql_test upsert1-1404 {
   DROP TABLE t0;
   CREATE TABLE t0(
     a INTEGER PRIMARY KEY ON CONFLICT REPLACE,
-    b INT UNIQUE ON CONFLICT IGNORE,
-    c INT UNIQUE
+    b INT UNIQUE          ON CONFLICT IGNORE,
+    c INT UNIQUE          ON CONFLICT ABORT
   );
   INSERT INTO t0 VALUES (1, 10, 100),(2, 20, 200);
 }
@@ -337,8 +337,8 @@ do_execsql_test upsert1-1408 {
   DROP TABLE t0;
   CREATE TABLE t0(
     a INTEGER PRIMARY KEY ON CONFLICT REPLACE,
-    b INT UNIQUE ON CONFLICT FAIL,
-    c INT UNIQUE
+    b INT UNIQUE          ON CONFLICT FAIL,
+    c INT UNIQUE          ON CONFLICT ABORT
   );
   INSERT INTO t0 VALUES (1, 10, 100),(2, 20, 200);
 }
@@ -353,7 +353,11 @@ do_execsql_test upsert1-1410 {
 } {1 10 100 2 20 200}
 do_execsql_test upsert1-1411 {
   DROP TABLE t0;
-  CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE ON CONFLICT FAIL, c UNIQUE);
+  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-1412 {
@@ -381,23 +385,24 @@ do_execsql_test upsert1-1417 {
   PRAGMA recursive_triggers=ON;
   CREATE TABLE t2(
     a INTEGER PRIMARY KEY ON CONFLICT REPLACE,
-    b INT UNIQUE ON CONFLICT FAIL,
-    c INT UNIQUE
+    b INT UNIQUE          ON CONFLICT FAIL,
+    c INT UNIQUE          ON CONFLICT ABORT
   );
   CREATE TRIGGER t_ad AFTER DELETE ON t2 BEGIN
-    INSERT INTO t2 VALUES(99,20,999);
+    INSERT INTO t2 VALUES(99,30,999);
   END;
-  INSERT INTO t2 VALUES(1,10,100),(2,30,200);
+  INSERT INTO t2 VALUES(1,10,100),(2,20,200);
   SELECT * FROM t2 ORDER BY a;
-} {1 10 100 2 30 200}
+} {1 10 100 2 20 200}
 do_catchsql_test upsert1-1418 {
-  INSERT INTO t2 VALUES(1,20,300) ON CONFLICT(c) DO NOTHING;
+  INSERT INTO t2 VALUES(4,40,400),(1,30,300),(5,50,500)
+      ON CONFLICT(c) DO NOTHING;
 } {1 {UNIQUE constraint failed: t2.b}}
 do_execsql_test upsert1-1419 {
   PRAGMA integrity_check;
 } ok
 do_execsql_test upsert1-1420 {
   SELECT * FROM t2 ORDER BY a;
-} {2 30 200 99 20 999}
+} {2 20 200 4 40 400 99 30 999}
 
 finish_test