Fix a bug preventing .recover from working on databases where the final page of the...

FossilOrigin-Name: 959bbd11e92cc789973daf20dfcb8a6d8dc724dd603b286cbdd59e5d1fdb2909

diff --git a/manifest b/manifest
index 039fa636853a7007c8840aa44a83d34f487f7ca9..270106866336a5adaad6a367997675cfc9b8cf41 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\sperformance\sof\sthe\s.recover\scommand.
-D 2019-04-24T20:48:55.802
+C Fix\sa\sbug\spreventing\s.recover\sfrom\sworking\son\sdatabases\swhere\sthe\sfinal\spage\sof\sthe\sdb\sis\scorrupt.
+D 2019-04-25T16:20:40.499
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -520,7 +520,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
-F src/shell.c.in 569ee1f79236f19b44fb4fcb8a0a2f0b2dce9a3d856d41a196aaaaa5f0d37704
+F src/shell.c.in 2e9b6b05fd202499bbe233632f9e5a913d2afcd645b59a114bfeb440c3e5cd38
 F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -1821,7 +1821,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f95f0f02ab6c6cf45f25b613c7ab57f68249689d0a9eddf4c9518ddf0edad365
-R 0e7ee563b8599ed64c48e30038f5f99f
+P a50768314d10d743a0cc013b434b516f0763e0a6c5b79655d8fefde7de53e869
+R 9da7af39576825c9e597192b24527e0d
 U dan
-Z f093e1d7a99537670d8620da5d0b299b
+Z 0de6a10b348dda1bb213a1119e4cc094

diff --git a/manifest.uuid b/manifest.uuid
index 3f613030655297302b7730b1097ab4ccd4608b34..e18c3e1cac95e94c180f1a98b78fc7faee802c54 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a50768314d10d743a0cc013b434b516f0763e0a6c5b79655d8fefde7de53e869
\ No newline at end of file
+959bbd11e92cc789973daf20dfcb8a6d8dc724dd603b286cbdd59e5d1fdb2909
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 05ce02d605d75f20e98c6be2cfb06c487441809b..73bf9dff979e0ce8115ac882cc4d05be4fa56e90 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -6369,7 +6369,7 @@ static RecoverTable *recoverNewTable(
 ** to construct a new database containing all recovered data is output
 ** on stream pState->out.
 */
-static int recoverDatabaseCmd(ShellState *pState){
+static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
   int rc = SQLITE_OK;
   sqlite3_stmt *pLoop = 0;        /* Loop through all root pages */
   sqlite3_stmt *pPages = 0;       /* Loop through all pages in a group */
@@ -6406,8 +6406,9 @@ static int recoverDatabaseCmd(ShellState *pState){
     ** database, the following adds all pages in such a loop to the map
     ** as individual root pages. This could be handled better.  */
     "WITH pages(i, maxlen) AS ("
-    "  SELECT page_count, max(field+1) "
-    "      FROM pragma_page_count, sqlite_dbdata WHERE pgno=page_count"
+    "  SELECT page_count, ("
+    "    SELECT max(field+1) FROM sqlite_dbdata WHERE pgno=page_count"
+    "  ) FROM pragma_page_count"
     "    UNION ALL"
     "  SELECT i-1, ("
     "    SELECT max(field+1) FROM sqlite_dbdata WHERE pgno=i-1"
@@ -6831,7 +6832,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 
   if( c=='r' && strncmp(azArg[0], "recover", n)==0 ){
     open_db(p, 0);
-    rc = recoverDatabaseCmd(p);
+    rc = recoverDatabaseCmd(p, nArg, azArg);
   }else
 
   if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){