From: dan <Dan Kennedy>
Date: Mon, 24 Mar 2025 19:58:13 +0000 (+0000)
Subject: Test that the sqlite3changeset_apply() function is properly appling indirect changes.
X-Git-Tag: major-release~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6e453def6fc09432a734c82c96f185ed0924bae;p=thirdparty%2Fsqlite.git

Test that the sqlite3changeset_apply() function is properly appling indirect changes.

FossilOrigin-Name: 1dadea3a79c3edd110b0b32b07287744300958fed31f2da11901a42b16f86669
---

diff --git a/ext/session/session1.test b/ext/session/session1.test
index 3262c9bc41..27ac0a194b 100644
--- a/ext/session/session1.test
+++ b/ext/session/session1.test
@@ -741,16 +741,64 @@ do_execsql_test $tn.15.0 {
   END;
 }
 
-do_iterator_test $tn.15.1 * {
+do_test $tn.15.1 {
+  set C [changeset_from_sql {
       INSERT INTO data_view (tbl, pk, value) VALUES
         ('data', '1', 'First'),
         ('data', '2', 'Second');
-} {
-  {INSERT changes 1 X..... {} {i 1 t data t 1 n {} n {} t First}}
-  {INSERT changes 1 X..... {} {i 2 t data t 2 n {} n {} t Second}}
-  {INSERT records 1 X... {} {i 1 t data t 1 t First}}
-  {INSERT records 1 X... {} {i 2 t data t 2 t Second}}
-}
+  }]
+  changeset_to_list $C
+} [list \
+  {INSERT changes 1 X..... {} {i 1 t data t 1 n {} n {} t First}}   \
+  {INSERT changes 1 X..... {} {i 2 t data t 2 n {} n {} t Second}}   \
+  {INSERT records 1 X... {} {i 1 t data t 1 t First}}   \
+  {INSERT records 1 X... {} {i 2 t data t 2 t Second}}   \
+]
+
+forcedelete test.db2
+sqlite3 db2 test.db2
+
+do_test $tn.15.2 {
+  db2 eval {
+    CREATE TABLE records(
+        idx INTEGER PRIMARY KEY AUTOINCREMENT,
+        tbl TEXT NOT NULL,
+        pk TEXT NOT NULL,
+        value TEXT,
+        UNIQUE(tbl, pk)
+    );
+    CREATE TABLE changes(
+        idx INTEGER PRIMARY KEY AUTOINCREMENT,
+        tbl TEXT NOT NULL,
+        pk TEXT NOT NULL,
+        op TEXT DEFAULT ('='),
+        path TEXT DEFAULT ('$'),
+        value TEXT,
+        UNIQUE(tbl, pk)
+    );
+
+    CREATE TRIGGER changes_after_insert
+      AFTER INSERT ON changes
+      FOR EACH ROW
+      BEGIN
+      INSERT INTO records(tbl, pk, value)
+      VALUES (NEW.tbl, NEW.pk, NEW.value)
+      ON CONFLICT(tbl, pk) DO UPDATE SET value = NEW.value;
+    END;
+  }
+
+  sqlite3changeset_apply db2 $C ""
+
+  db2 eval {
+    SELECT * FROM records;
+  }
+} [list 1 data 1 First 2 data 2 Second]
+
+do_test $tn.15.3 {
+  db2 eval {
+    SELECT * FROM changes;
+  }
+} {1 data 1 {} {} First 2 data 2 {} {} Second}
 
 }]
 }
diff --git a/manifest b/manifest
index 14172eb3e7..ccb8614c96 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sto\ssession1.test.
-D 2025-03-24T11:13:18.510
+C Test\sthat\sthe\ssqlite3changeset_apply()\sfunction\sis\sproperly\sappling\sindirect\schanges.
+D 2025-03-24T19:58:13.162
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -577,7 +577,7 @@ F ext/rtree/visual01.txt e9c2564083bcd30ec51b07f881bffbf0e12b50a3f6fced0c222c5c1
 F ext/session/changeset.c 7a1e6a14c7e92d36ca177e92e88b5281acd709f3b726298dc34ec0fb58869cb5
 F ext/session/changesetfuzz.c 227076ab0ae4447d742c01ee88a564da6478bbf26b65108bf8fac9cd8b0b24aa
 F ext/session/changesetfuzz1.test 15b629004e58d5ffcc852e6842a603775bb64b1ce51254831f3d12b113b616cd
-F ext/session/session1.test a9cf4280a01ccee85c9be3d5b76047a05bea2dfbb2891e7775acbec227d9c823
+F ext/session/session1.test 57cb77a816af7760bf4e321d315603ab517e46abd853e75620cfb07eb409c6f8
 F ext/session/session2.test ee83bb973b9ce17ccce4db931cdcdae65eb40bbb22089b2fe6aa4f6be3b9303f
 F ext/session/session3.test 2cc1629cfb880243aec1a7251145e07b78411d851b39b2aa1390704550db8e6a
 F ext/session/session4.test 823f6f018fcbb8dacf61e2960f8b3b848d492b094f8b495eae1d9407d9ab7219
@@ -2215,8 +2215,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 172f4e4772d90f4737eddb43d97a566a6e3b92702c61e23391e43134737cc838
-R a200b3e63d995804ba9cb2f6183e529f
+P dda9d7cf319e74de7703bda1eb77e3e7aa7459d6fa1508cc1d62cdfc7985c368
+R 59f8eb65053a8c37b81b1cc130461378
 U dan
-Z 9e23138503c61e5d6f72d80a5d70588a
+Z 3ffcb094ab9fb9973d19c727d478cf37
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b29703cd99..bebd8505b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dda9d7cf319e74de7703bda1eb77e3e7aa7459d6fa1508cc1d62cdfc7985c368
+1dadea3a79c3edd110b0b32b07287744300958fed31f2da11901a42b16f86669