From: dan <Dan Kennedy>
Date: Mon, 22 Apr 2024 20:09:17 +0000 (+0000)
Subject: Add extra tests for aborting conflicts in the sessions module.
X-Git-Tag: version-3.46.0~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46435a04fd295e325f7d25839abd85be49d1d6d2;p=thirdparty%2Fsqlite.git

Add extra tests for aborting conflicts in the sessions module.

FossilOrigin-Name: b4a6d32662acacb7767cfb9b8e040e6eb1f99322cb7d0cd44e6265e9ac2fb2e8
---

diff --git a/ext/session/sessionconflict.test b/ext/session/sessionconflict.test
new file mode 100644
index 0000000000..c842a8aacb
--- /dev/null
+++ b/ext/session/sessionconflict.test
@@ -0,0 +1,75 @@
+# 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 sessionconflict
+
+sqlite3_shutdown
+test_sqlite3_log log
+proc log {code msg} { puts "LOG $code $msg" }
+sqlite3 db test.db
+
+forcedelete test.db2
+sqlite3 db2 test.db2
+
+do_test 1.0 {
+  do_common_sql {
+    CREATE TABLE t1(a PRIMARY KEY, b, c UNIQUE);
+    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 1.1 {
+  INSERT INTO t1 VALUES(6, 6, 6);
+}
+
+proc xConflict {args} {
+  return "ABORT"
+}
+
+
+do_test 1.2 {
+  set chng [changeset_from_sql {
+    UPDATE t1 SET b=10, c=10 WHERE a=1;
+    UPDATE t1 SET b=444 WHERE a=2;
+    INSERT INTO t1 VALUES(4, 4, 4);
+    INSERT INTO t1 VALUES(5, 5, 5);
+    INSERT INTO t1 VALUES(6, 6, 6);
+  }]
+
+  execsql BEGIN db2
+  set res [list [catch { sqlite3changeset_apply db2 $chng xConflict } msg] $msg]
+  execsql ROLLBACK db2
+  set res
+} {1 SQLITE_ABORT}
+
+do_execsql_test -db db2 1.3 {
+  SELECT * FROM t1;
+} {
+  1 1 1
+  2 2 2
+  3 3 3
+  6 6 6
+}
+
+
+
+finish_test
diff --git a/manifest b/manifest
index 4c968dedd4..f00e2d54f5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups\sto\s[8fbda563d2f5].
-D 2024-04-22T17:03:52.050
+C Add\sextra\stests\sfor\saborting\sconflicts\sin\sthe\ssessions\smodule.
+D 2024-04-22T20:09:17.153
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -566,6 +566,7 @@ F ext/session/session_speed_test.c dcf0ef58d76b70c8fbd9eab3be77cf9deb8bc1638fed8
 F ext/session/sessionalter.test 460bdac2832a550519f6bc32e5db2c0cee94f335870aaf25a3a403a81ab20e17
 F ext/session/sessionat.test 00c8badb35e43a2f12a716d2734a44d614ff62361979b6b85419035bc04b45ee
 F ext/session/sessionbig.test 47c381e7acfabeef17d98519a3080d69151723354d220afa2053852182ca7adf
+F ext/session/sessionconflict.test 28890457bb90457be772d3067cdb5f78db9b51d997e4f3d09f22cddc9be80a38
 F ext/session/sessiondiff.test ad13dd65664bae26744e1f18eb3cbd5588349b7e9118851d8f9364248d67bcec
 F ext/session/sessionfault.test 573bf027fb870d57bd4e7cf50822a3e4b17b2b923407438747aaa918dec57a09
 F ext/session/sessionfault2.test b0d6a7c1d7398a7e800d84657404909c7d385965ea8576dc79ed344c46fbf41c
@@ -2184,8 +2185,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8fbda563d2f56f8dd3f695a5711e4356de79035f332270db45d4b33ed52fdfd2
-R 0674b1f5ea56f016fc52480ad40ed87d
-U stephan
-Z 40a1a10b8d303ee230e900a2b2af4afd
+P 5ee2594b657b96aea9e482a175820dcbacfa9298da45b38cf17f39ad076d3f7f
+R 95bcc3fd0d6dba3139788e0776ab3daa
+U dan
+Z c4a19dd969db970154ebbee1de10bace
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 049eae30ae..89e87de37d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5ee2594b657b96aea9e482a175820dcbacfa9298da45b38cf17f39ad076d3f7f
\ No newline at end of file
+b4a6d32662acacb7767cfb9b8e040e6eb1f99322cb7d0cd44e6265e9ac2fb2e8
\ No newline at end of file