Bug fix in the enhanced sqlite_dbpage for when truncating two or more

ATTACH-ed databases within the same transaction.

FossilOrigin-Name: 6aa9c8e79b440c6419e65990d9ceba8f00a6f975455138cf2aa82b113daec825

diff --git a/manifest b/manifest
index fc47d2846abc57cf24cdb8de0dffb3b9da7cc513..191df77f0663c62de8daad4c89fc33a88cc6ebad 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sability\sfor\ssqlite_dbpage\sto\struncate\sthe\sdatabase\sfile\sby\swriting\na\sNULL\spage.\s\sExperimental.
-D 2024-09-10T12:09:03.839
+C Bug\sfix\sin\sthe\senhanced\ssqlite_dbpage\sfor\swhen\struncating\stwo\sor\smore\nATTACH-ed\sdatabases\swithin\sthe\ssame\stransaction.
+D 2024-09-13T21:47:57.423
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -714,7 +714,7 @@ F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d49
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c b224d3db0f28c4a5f1407c50107a0a8133bd244ff3c7f6f8cedeb896a8cf1b64
 F src/date.c 89ce1ff20512a7fa5070ba6e7dd5c171148ca7d580955795bf97c79c2456144a
-F src/dbpage.c 3c437630c2933b9eefca915d191f8dea9da135195593bb17f553be58ffcd3634
+F src/dbpage.c 12e49515d67d4a59625d71f9aa42499556cfdc2e4f1ea49086e674a7f47f46e5
 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
 F src/delete.c 444c4d1eaac40103461e3b6f0881846dd3aafc1cec1dd169d3482fa331667da7
 F src/expr.c 6d5f2c38fe3ec06a7eac599dac822788b36064124e20112a844e9cd5156cb239
@@ -2212,11 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fe0d67e72d4228661c021f227bfc0d5ddb1b726db0f36c7221ead8dd8bd1dc73
-R fb6f94f4d85e2b2f81d969e85d52cc7e
-T *branch * dbpage
-T *sym-dbpage *
-T -sym-trunk *
+P eb3c89ee2e4c5425be75deaf46a06a9cd8b210c695b918dd63a78f930c6e6b63
+R c19f64698097fbdbb0ae983d8267bb4c
 U drh
-Z 44b34a478a24f6c5d7a75b5688f34391
+Z b211655571bcb6e66e7014318509d82f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 653a750d5223f76baeda19f93f9de604e21c5459..e4fde79e089ea100262d15dc69a7b59bbf503dad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eb3c89ee2e4c5425be75deaf46a06a9cd8b210c695b918dd63a78f930c6e6b63
+6aa9c8e79b440c6419e65990d9ceba8f00a6f975455138cf2aa82b113daec825

diff --git a/src/dbpage.c b/src/dbpage.c
index 4da81f8ca1b484de4145d33e8f5a5a1e84a1d001..42b24f9b8d8e04dea2fa7e8eff3cd086b1bbc29e 100644 (file)
--- a/src/dbpage.c
+++ b/src/dbpage.c
@@ -360,7 +360,7 @@ static int dbpageUpdate(
     iDb = 0;
   }else{
     const char *zSchema = (const char*)sqlite3_value_text(argv[4]);
-    iDb = zSchema ? sqlite3FindDbName(pTab->db, zSchema) : -1;
+    iDb = sqlite3FindDbName(pTab->db, zSchema);
     if( iDb<0 ){
       zErr = "no such schema";
       goto update_fail;
@@ -377,8 +377,11 @@ static int dbpageUpdate(
   ){
     if( sqlite3_value_type(argv[3])==SQLITE_NULL && isInsert ){
       if( iDb>=pTab->nTrunc ){
+        testcase( pTab->aTrunc!=0 );
         pTab->aTrunc = sqlite3_realloc(pTab->aTrunc, (iDb+1)*sizeof(Pgno));
         if( pTab->aTrunc ){
+          int j;
+          for(j=pTab->nTrunc; j<iDb; j++) pTab->aTrunc[j] = 0;
           pTab->nTrunc = iDb+1;
         }else{
           return SQLITE_NOMEM;