Handle recovery of virtual tables by recovering each shadow table individually, then...

FossilOrigin-Name: 5f2d5ccd56c06c3468377126acfd4be39b79b05bb6fb09b674b2e185df143aa3

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 9afe43209f35b856bb172e7b87786b03fcc60198..5f1bb2b0feb28f3eeed1016477968ab581e5b53d 100644 (file)
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -67,6 +67,8 @@ proc do_recover_test {tn} {
 
   sqlite3 db2 test.db2
   execsql [join $::sqlhook ";"] db2
+  db2 close
+  sqlite3 db2 test.db2
   uplevel [list do_test $tn.4 [list compare_dbs db db2] {}]
   db2 close
 }
@@ -154,6 +156,17 @@ do_execsql_test 8.0 {
 
 do_recover_test 8
 
+#-------------------------------------------------------------------------
+reset_db
+ifcapable fts5 {
+  do_execsql_test 9.1 {
+    CREATE VIRTUAL TABLE ft5 USING fts5(a, b);
+    INSERT INTO ft5 VALUES('hello', 'world');
+  }
+  do_recover_test 9 
+}
+
+
 
 
 finish_test

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 3e797e4bb3a974d914aaf732341d3af2bf7898da..7d05ec2b3e38e900fc736916db6a882244164ce3 100644 (file)
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -672,9 +672,17 @@ static int recoverWriteSchema1(sqlite3_recover *p){
   sqlite3_stmt *pTblname = 0;
 
   pSelect = recoverPrepare(p, p->dbOut,
-      "SELECT rootpage, sql, type='table' FROM recovery.schema "
-      "  WHERE type='table' OR (type='index' AND sql LIKE '%unique%') "
-      "  ORDER BY type!='table', name!='sqlite_sequence'"
+      "WITH dbschema(rootpage, name, sql, tbl, isVirtual, isUnique) AS ("
+      "  SELECT rootpage, name, sql, "
+      "    type='table', "
+      "    sql LIKE 'create virtual%',"
+      "    (type='index' AND sql LIKE '%unique%')"
+      "  FROM recovery.schema"
+      ")"
+      "SELECT rootpage, tbl, isVirtual, name, sql"
+      " FROM dbschema "
+      "  WHERE tbl OR isUnique"
+      "  ORDER BY tbl DESC, name=='sqlite_sequence' DESC"
   );
 
   pTblname = recoverPrepare(p, p->dbOut,
@@ -685,13 +693,23 @@ static int recoverWriteSchema1(sqlite3_recover *p){
   if( pSelect ){
     while( sqlite3_step(pSelect)==SQLITE_ROW ){
       i64 iRoot = sqlite3_column_int64(pSelect, 0);
-      const char *zSql = (const char*)sqlite3_column_text(pSelect, 1);
-      int bTable = sqlite3_column_int(pSelect, 2);
-
-      int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
+      int bTable = sqlite3_column_int(pSelect, 1);
+      int bVirtual = sqlite3_column_int(pSelect, 2);
+      const char *zName = (const char*)sqlite3_column_text(pSelect, 3);
+      const char *zSql = (const char*)sqlite3_column_text(pSelect, 4);
+      char *zFree = 0;
+      int rc = SQLITE_OK;
+
+      if( bVirtual ){
+        zSql = (const char*)(zFree = recoverMPrintf(p,
+            "INSERT INTO sqlite_schema VALUES('table', %Q, %Q, 0, %Q)",
+            zName, zName, zSql
+        ));
+      }
+      rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
       if( rc==SQLITE_OK ){
         recoverSqlCallback(p, zSql);
-        if( bTable ){
+        if( bTable && !bVirtual ){
           if( SQLITE_ROW==sqlite3_step(pTblname) ){
             const char *zName = sqlite3_column_text(pTblname, 0);
             recoverAddTable(p, zName, iRoot);
@@ -701,6 +719,7 @@ static int recoverWriteSchema1(sqlite3_recover *p){
       }else if( rc!=SQLITE_ERROR ){
         recoverDbError(p, p->dbOut);
       }
+      sqlite3_free(zFree);
     }
   }
   recoverFinalize(p, pSelect);
@@ -1130,7 +1149,8 @@ static int recoverWriteData(sqlite3_recover *p){
   if( apVal==0 ) return p->errCode;
 
   pTbls = recoverPrepare(p, p->dbOut,
-      "SELECT rootpage FROM recovery.schema WHERE type='table'"
+      "SELECT rootpage FROM recovery.schema "
+      "  WHERE type='table' AND (sql NOT LIKE 'create virtual%')"
       "  ORDER BY (tbl_name='sqlite_sequence') ASC"
   );
 

diff --git a/main.mk b/main.mk
index 52635460420a547a5e9fa9de3c6f18d01405fd25..123c7ce757edc659732551e3bb42071e78557c69 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -763,6 +763,8 @@ SHELL_SRC = \
        $(TOP)/ext/misc/zipfile.c \
        $(TOP)/ext/misc/memtrace.c \
        $(TOP)/ext/misc/dbdata.c \
+       $(TOP)/ext/recover/sqlite3recover.c \
+       $(TOP)/ext/recover/sqlite3recover.h \
         $(TOP)/src/test_windirent.c
 
 shell.c:       $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl

diff --git a/manifest b/manifest
index f0dfaa0cd487a6839441eddd42e28ed316009d97..3da6b77b47efea165d5598474e3dadcb7cbe3d7f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\scomments\sin\ssqlite3recover.h.
-D 2022-09-08T21:43:18.230
+C Handle\srecovery\sof\svirtual\stables\sby\srecovering\seach\sshadow\stable\sindividually,\sthen\swriting\sthe\sCREATE\sVIRTUAL\sTABLE\sstatement\sdirectly\sinto\sthe\ssqlite_schema\stable.
+D 2022-09-09T16:25:19.064
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,12 +387,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test aa9f7f46b7209cae6d52321052d4440bc8f82b93991e693c4bad20a6f05a53e5
+F ext/recover/recover1.test 942016356f9098ca36933536b194b5878827a3a749e0bf41a83d83530c0d0ea8
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c aaab721cf1ade0703162e95f1d154b811eef962be42a861b59ef015514bc3b65
+F ext/recover/sqlite3recover.c 7ed9a573d081435a16982b972c6bb963d273a0a457ec69fa16b0918165991e9d
 F ext/recover/sqlite3recover.h 73648878cea3492427b9a8facebdad0464ed15b161ed1cd70f349a02456e8879
 F ext/recover/test_recover.c b973526785e145e7d9d7920ccde72112025ee5204e22b332db9d86796be73f00
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -517,7 +517,7 @@ F ext/wasm/testing2.js d37433c601f88ed275712c1cfc92d3fb36c7c22e1ed8c7396fb2359e4
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 8c9965c408aaa8b93d0dd52e83445894835e1a42dc360c77435393f80f8d8d1d
+F main.mk 3e2a50cc103bd3386bbac9c96bf3650f91174b26e092701164aa42875bff24c9
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -931,7 +931,7 @@ F test/e_totalchanges.test c927f7499dc3aa28b9b556b7d6d115a2f0fe41f012b128d16bf1f
 F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528
 F test/e_uri.test 86564382132d9c453845eeb5293c7e375487b625900ab56c181a0464908417d8
 F test/e_vacuum.test 89fc48e8beee2f9dfd6de1fbb2edea6542dae9121dc0fbe6313764169e742104
-F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
+F test/e_wal.test db7c33642711cf3c7959714b5f012aca08cacfa78da0382f95e849eb3ba66aa4
 F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
 F test/e_walckpt.test 28c371a6bb5e5fe7f31679c1df1763a19d19e8a0
 F test/e_walhook.test 01b494287ba9e60b70f6ebf3c6c62e0ffe01788e344a4846b08e5de0b344cb66
@@ -2007,8 +2007,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 ae832e77084eddd696c80cb926d070a5db9d45dce34156a02522b3140e8f5e8b
-R 260b6b87f29011e60d0280e7bdf9107f
+P 14164047c43e3ca43aa010c77ea00dfa85400e15645ee0f5b90a677898b6a836
+R e52e610730a5083b962d51491c2e90a5
 U dan
-Z c0005f6f4d932e314a4bcb73861ec3e0
+Z 0661ae93944ad96dd9dbcc27159d9d3c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e003488dbc588e06028cd57df9a0fd44c259202b..c6ebbcda0e0fcefa8e5b96466b5b3af4f7e3698a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14164047c43e3ca43aa010c77ea00dfa85400e15645ee0f5b90a677898b6a836
\ No newline at end of file
+5f2d5ccd56c06c3468377126acfd4be39b79b05bb6fb09b674b2e185df143aa3
\ No newline at end of file

diff --git a/test/e_wal.test b/test/e_wal.test
index 77ac83a0aef7470e460daca67408ce79bd87ba2a..c9c5e9643fcf8a2483f4a929b6d5fa66afb397ab 100644 (file)
--- a/test/e_wal.test
+++ b/test/e_wal.test
@@ -15,6 +15,7 @@ source $testdir/tester.tcl
 set testprefix e_wal
 
 db close
+forcedelete test.db-shm 
 testvfs oldvfs -iversion 1