In the shell, include the ".archive" command only if compiling with

SQLITE_HAVE_ZLIB.  Add ".archive" to the ".help" output.

FossilOrigin-Name: 366469f5603367fabcadfc9ffe8cd1e23c649fea49a560178ca0858a16a7e4d1

diff --git a/manifest b/manifest
index d08eceabe8e1ea57828298a71be31c76414f6c33..59f92e796cd19d02498baab6382e4f3ffd9e19cd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Better\swhitespace\sin\sthe\s"CREATE\sTABLE\ssqlar()"\sstatement\sfor\sthe\s".ar"\ncommand.
-D 2018-01-06T15:49:57.663
+C In\sthe\sshell,\sinclude\sthe\s".archive"\scommand\sonly\sif\scompiling\swith\nSQLITE_HAVE_ZLIB.\s\sAdd\s".archive"\sto\sthe\s".help"\soutput.
+D 2018-01-06T19:19:50.442
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 9536f61ce33172d4868707ecc10844a0abef9e2e775ad2434245a60406fd7e38
@@ -484,7 +484,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 8b22abe193e4d8243befa2038e4ae2405802fed1c446e5e502d11f652e09ba74
-F src/shell.c.in 1f1d02e83a4805db87d9405893e5375c9f7e6906166dead2a783d3f175cebcb0
+F src/shell.c.in 9f2ab2d0b4b07310950ec84492c067f9c65a2c934b2704f07bf3f7abd81b1326
 F src/sqlite.h.in 1f1a2da222ec57465794e8984d77f32d0bd0da80cdc136beadda461a0be9d80c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -1697,7 +1697,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 87da7efff07327278b1437f862ed8683c2d5d6ada7ea7461601a58f9762646b4
-R 1cf086413b922edba322b9602699139d
+P 252ee55a7fc0b068b707af27bd912e684c28320996e78f0675217046b8c2fb49
+R 1106ed2dd57a38999d04b0134db88743
 U drh
-Z a5d68d44f94deab667b4cbaa7e1747ee
+Z 0971e8c5cac3e7845d10877eae148e13

diff --git a/manifest.uuid b/manifest.uuid
index 24f4d757a4c58578089829449c3dbb6b7d81859c..289c74b7d11d3f33508dc06bef51e889be8ef88e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-252ee55a7fc0b068b707af27bd912e684c28320996e78f0675217046b8c2fb49
\ No newline at end of file
+366469f5603367fabcadfc9ffe8cd1e23c649fea49a560178ca0858a16a7e4d1
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 78c9124736099368257756991b4966525737cdf8..bff3684321faa3c0996a62d1d683a5497feac3d9 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2895,6 +2895,9 @@ static int run_schema_dump_query(
 ** Text of a help message
 */
 static char zHelp[] =
+#if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE)
+  ".archive ...           Manage SQL archives: \".archive --help\" for details\n"
+#endif
 #ifndef SQLITE_OMIT_AUTHORIZATION
   ".auth ON|OFF           Show authorizer callbacks\n"
 #endif
@@ -4296,6 +4299,10 @@ static int lintDotCommand(
   return SQLITE_ERROR;
 }
 
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
+/*********************************************************************************
+** The ".archive" or ".ar" command.
+*/
 static void shellPrepare(
   sqlite3 *db, 
   int *pRc, 
@@ -4365,8 +4372,7 @@ static void shellReset(
     *pRc = rc;
   }
 }
-
-/* 
+/*
 ** Structure representing a single ".ar" command.
 */
 typedef struct ArCommand ArCommand;
@@ -5034,6 +5040,9 @@ static int arDotCommand(
 
   return rc;
 }
+/* End of the ".archive" or ".ar" command logic
+**********************************************************************************/
+#endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) */
 
 /*
 ** Implementation of ".expert" dot command.
@@ -5156,8 +5165,8 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif
 
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  if( c=='a' && strncmp(azArg[0], "ar", n)==0 ){
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
+  if( c=='a' && strncmp(azArg[0], "archive", n)==0 ){
     open_db(p, 0);
     rc = arDotCommand(p, azArg, nArg);
   }else