From: dan <Dan Kennedy>
Date: Mon, 6 Jan 2025 17:01:35 +0000 (+0000)
Subject: Add test case for using both SQLITE_CHANGESETAPPLY_IGNORENOOP and SQLITE_CHANGESETAPP... 
X-Git-Tag: major-relase~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cee8b04d33e78b2227fdb6007b9991f998469a7d;p=thirdparty%2Fsqlite.git

Add test case for using both SQLITE_CHANGESETAPPLY_IGNORENOOP and SQLITE_CHANGESETAPPLY_FKNOACTION.

FossilOrigin-Name: b1cc53fa3fb2ac3abeadd3282d8751f4d533315754159f16ca7f7f300ccdd8c8
---

diff --git a/ext/session/sessionnoact.test b/ext/session/sessionnoact.test
index f605e6108e..e447bc8a16 100644
--- a/ext/session/sessionnoact.test
+++ b/ext/session/sessionnoact.test
@@ -149,5 +149,20 @@ do_execsql_test 2.5 {
   SELECT * FROM c1;
 } {two}
 
+db_restore_and_reopen
+db eval { PRAGMA foreign_keys = 1 }
+
+do_test 2.6 {
+  list [catch { 
+    sqlite3changeset_apply_v2 -ignorenoop -noaction db $C conflict 
+  } msg] $msg
+} {1 SQLITE_CONSTRAINT}
+do_execsql_test 2.7 {
+  SELECT * FROM p1;
+} {1 1 one 2 2 two}
+do_execsql_test 2.8 {
+  SELECT * FROM c1;
+} {two}
+
 finish_test
 
diff --git a/manifest b/manifest
index 73825f1a17..cedab9b504 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\srefactoring\sof\sthe\sTCL\sextension\stest\sprocedure\sdocument,\sfor\nimproved\sclarity\sand\susability.
-D 2025-01-05T19:58:30.967
+C Add\stest\scase\sfor\susing\sboth\sSQLITE_CHANGESETAPPLY_IGNORENOOP\sand\sSQLITE_CHANGESETAPPLY_FKNOACTION.
+D 2025-01-06T17:01:35.295
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -606,7 +606,7 @@ F ext/session/sessionfault2.test b0d6a7c1d7398a7e800d84657404909c7d385965ea8576d
 F ext/session/sessionfault3.test ce0b5d182133935c224d72507dbf1c5be1a1febf7e85d0b0fbd6d2f724b32b96
 F ext/session/sessioninvert.test 04075517a9497a80d39c495ba6b44f3982c7371129b89e2c52219819bc105a25
 F ext/session/sessionmem.test f2a735db84a3e9e19f571033b725b0b2daf847f3f28b1da55a0c1a4e74f1de09
-F ext/session/sessionnoact.test 1ea34324b7be2fa9d63870d44969e6bb5290a6d1603ddfd4151c51df73fad291
+F ext/session/sessionnoact.test 0f552bd318b764bbc5b2cd6f3518435254a1c830fdaa5aab9c688f507ebc301e
 F ext/session/sessionnoop.test a9366a36a95ef85f8a3687856ebef46983df399541174cb1ede2ee53b8011bc7
 F ext/session/sessionnoop2.test de4672dce88464396ec9f30ed08c6c01643a69c53ae540fadbbf6d30642d64e8
 F ext/session/sessionrebase.test 702378bdcb5062f1106e74457beca8797d09c113a81768734a58b197b5b334e2
@@ -2205,8 +2205,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 5281536327d244ba9507548f7ed607e86e59b98a003e63f6da767471411c8ffc
-R 789a42abc3bc046ab3689d41ea48cbbd
-U drh
-Z a57fb295edbde74d3aaadaf4afebbd36
+P bcdaef434142973a0805117495e561b2dcd1ec1465cacc9b944a3707291afc0d
+R 39da0f1150c2b7d20d41e16df982bdbc
+U dan
+Z 0e33be44116920d8dfb3948dc71a5c16
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1a4dca11c7..5d5632f5c9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bcdaef434142973a0805117495e561b2dcd1ec1465cacc9b944a3707291afc0d
+b1cc53fa3fb2ac3abeadd3282d8751f4d533315754159f16ca7f7f300ccdd8c8