From f8563c00b277ef39608148644660d697b7707f53 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Thu, 9 Mar 2017 18:13:52 +0000
Subject: [PATCH] Fix the ".dump" command to correctly extract tail data from
 corrupt WITHOUT ROWID tables.

FossilOrigin-Name: 6c627e50622d8bcd25ec7d5503f3fafd725673a8
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/shell.c   | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index c8aad6cfb1..bfcca0a0ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Begin\smoving\sseparate\sboolean\svariables\sin\sthe\sShellState\sobject\sof\sthe\sCLI\ninto\sthe\sshellFlgs\sbitmask.
-D 2017-03-09T13:50:49.349
+C Fix\sthe\s".dump"\scommand\sto\scorrectly\sextract\stail\sdata\sfrom\scorrupt\nWITHOUT\sROWID\stables.
+D 2017-03-09T18:13:52.322
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -400,7 +400,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
-F src/shell.c 397e51c3eeb3a9dc21667a0a384eb14403cc5eea
+F src/shell.c f4a7169ddfff73ba1ab2f06a4e97bd6d569cb984
 F src/sqlite.h.in 4d0c08f8640c586564a7032b259c5f69bf397850
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1564,7 +1564,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 2ea300fb8f7c497f3f092dc91f4305d8431c27d9
-R 193fb708e3eeb9be14d6692d9fad8ed4
+P 50eec5d9aa38fab1a85d788356ffdaf6c35d9ece
+R a2e2297f06f9d9483ad6626d70cfa2bc
 U drh
-Z 6ea8a21fbd5a369fc4273386c415b1f4
+Z 704977d7ee0085e38c9f718cc949a370
diff --git a/manifest.uuid b/manifest.uuid
index 2f86d48c03..53f69764d4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-50eec5d9aa38fab1a85d788356ffdaf6c35d9ece
\ No newline at end of file
+6c627e50622d8bcd25ec7d5503f3fafd725673a8
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 1de72f8997..adc57481b8 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -2850,6 +2850,23 @@ static char **tableColumnList(ShellState *p, const char *zTab){
   return azCol;
 }
 
+/*
+** Toggle the reverse_unordered_selects setting.
+*/
+static void toggleSelectOrder(sqlite3 *db){
+  sqlite3_stmt *pStmt = 0;
+  int iSetting = 0;
+  char zStmt[100];
+  sqlite3_prepare_v2(db, "PRAGMA reverse_unordered_selects", -1, &pStmt, 0);
+  if( sqlite3_step(pStmt)==SQLITE_ROW ){
+    iSetting = sqlite3_column_int(pStmt, 0);
+  }
+  sqlite3_finalize(pStmt);
+  sqlite3_snprintf(sizeof(zStmt), zStmt,
+       "PRAGMA reverse_unordered_selects(%d)", !iSetting);
+  sqlite3_exec(db, zStmt, 0, 0, 0);
+}
+
 /*
 ** This is a different callback routine used for dumping the database.
 ** Each row received by this callback consists of a table name,
@@ -2946,6 +2963,12 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
     p->zDestTable = sTable.z;
     p->mode = p->cMode = MODE_Insert;
     rc = shell_exec(p->db, sSelect.z, shell_callback, p, 0);
+    if( (rc&0xff)==SQLITE_CORRUPT ){
+      raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
+      toggleSelectOrder(p->db);
+      shell_exec(p->db, sSelect.z, shell_callback, p, 0);
+      toggleSelectOrder(p->db);
+    }
     p->zDestTable = savedDestTable;
     p->mode = savedMode;
     freeText(&sTable);