From: drh <drh@noemail.net>
Date: Sat, 25 Mar 2017 18:15:05 +0000 (+0000)
Subject: Disable the new --preserve-rowids option on the CLI ".dump" command if
X-Git-Tag: version-3.18.0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34ad36bf81d0eae64891cc57ba6aee669321eb58;p=thirdparty%2Fsqlite.git

Disable the new --preserve-rowids option on the CLI ".dump" command if
compiled with SQLITE_OMIT_VIRTUALTABLE.

FossilOrigin-Name: bd5bbe4eece9051cc8c27d834d22fb243d34f261641984555d02a27b7038d4f6
---

diff --git a/manifest b/manifest
index 67eade98ba..9626fae018 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sdefault\svalue\sfor\sSQLITE_DEFAULT_SYNCHRONOUS\sa\ssimple\sinteger\nliteral,\sso\sthat\sit\sdoes\snot\sshow\sup\sgoofy\sin\sthe\soutput\sof\n"PRAGMA\scompile_options;".
-D 2017-03-25T18:03:26.758
+C Disable\sthe\snew\s--preserve-rowids\soption\son\sthe\sCLI\s".dump"\scommand\sif\ncompiled\swith\sSQLITE_OMIT_VIRTUALTABLE.
+D 2017-03-25T18:15:05.701
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@ -402,7 +402,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 2496d0cc6368dabe7ad2e4c7f5ed3ad9aa3b4d11cd90f33fa1d1ef72493f43aa
-F src/shell.c 042b74d5ad2fd38a7f0c2c0d13f77740f25fba5d33468e75d4648f865ffed4a5
+F src/shell.c ceb2b2f1f958ea2c47a7f37972d0f715fbf9dcf6a34a5e98c886b85e3ce6a238
 F src/sqlite.h.in 723107d97f2345a7c103632169dc61366121c4ab65d75a7d83c6dc0e5bbe5ca4
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1569,7 +1569,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 32be9c3faaafd736da3f49d475dc9279af4e4ba38070b60033d898345080acf0
-R f2f2293b380c103d1313beba2f4189cc
+P 833ab3212addc340ca8004e8d6a06cc5e51bf256f43dc73d87fbe67518a4891b
+R 5b5c15828c2f2dcb9cc85dadb80ff440
 U drh
-Z 533fb94c090ecb58ff1b57331e8e6d3d
+Z add0f65c09d0d29a2f7424a8d8e55df8
diff --git a/manifest.uuid b/manifest.uuid
index b258a1fad8..598099fcb1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-833ab3212addc340ca8004e8d6a06cc5e51bf256f43dc73d87fbe67518a4891b
\ No newline at end of file
+bd5bbe4eece9051cc8c27d834d22fb243d34f261641984555d02a27b7038d4f6
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 456fde5fbe..1236b12a0e 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -4686,7 +4686,14 @@ static int do_meta_command(char *zLine, ShellState *p){
         const char *z = azArg[i]+1;
         if( z[0]=='-' ) z++;
         if( strcmp(z,"preserve-rowids")==0 ){
+#ifdef SQLITE_OMIT_VIRTUALTABLE
+          raw_printf(stderr, "The --preserve-rowids option is not compatible"
+                             " with SQLITE_OMIT_VIRTUALTABLE\n");
+          rc = 1;
+          goto meta_command_exit;
+#else
           ShellSetFlag(p, SHFLG_PreserveRowid);
+#endif
         }else
         {
           raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);