From: larrybr <larrybr@noemail.net>
Date: Sun, 5 Jun 2022 22:58:40 +0000 (+0000)
Subject: In CLI, drop .dbinfo command when build options prevent it from working.
X-Git-Tag: version-3.39.0~56^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3d6e8fd6e5ccfb899c075d8c3b1f57c57121d41;p=thirdparty%2Fsqlite.git

In CLI, drop .dbinfo command when build options prevent it from working.

FossilOrigin-Name: 2512d2f68dfff4d74c881a4102b63ca528e690ad93ab2b4eb1f03ce1d9ac155c
---

diff --git a/manifest b/manifest
index 84467d7d4b..89784a441e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Create\snew\sbranch\snamed\s"dbinfo-guard"
-D 2022-06-05T22:40:49.966
+C In\sCLI,\sdrop\s.dbinfo\scommand\swhen\sbuild\soptions\sprevent\sit\sfrom\sworking.
+D 2022-06-05T22:58:40.391
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 8b98d3e5511d2789880ea4a12a4637803f69db5df04c81e1e93a5aac75c89b2a
-F src/shell.c.in b76e681f9e441928d574f21f9473ef615158bbeab1ae49f05ecab9d81730a51d
+F src/shell.c.in 865218b56e28f5d5939b82ef98a11a692c30c773f6cd86e04939605ecf824adc
 F src/sqlite.h.in 172528c287399a34f188154017b7268bf82c6d5b780902e361958d2318c4e37c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -1975,11 +1975,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 d18818afc6021a32989499c26ab38fa442e5a55e662e39bb06e5c0daa9c65e25
-R 0e53c4e5af03302c956c74fa1c3798cf
-T *branch * dbinfo-guard
-T *sym-dbinfo-guard *
-T -sym-trunk *
+P 8d942ba72ea995d0e8d1f8694bb428e5f919fc75afd3e059a69547e27991d580
+R 2f96e1736565174c18982a8437387e70
 U larrybr
-Z 9bee3ff1aa6527701a04a3ee682adf6b
+Z 9287eafb5d9d14c387b8d48b6146606a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1350c19056..e853188810 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8d942ba72ea995d0e8d1f8694bb428e5f919fc75afd3e059a69547e27991d580
\ No newline at end of file
+2512d2f68dfff4d74c881a4102b63ca528e690ad93ab2b4eb1f03ce1d9ac155c
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index b03c96183d..5ac65bffe3 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4293,7 +4293,9 @@ static const char *(azHelp[]) = {
   ".connection [close] [#]  Open or close an auxiliary database connection",
   ".databases               List names and files of attached databases",
   ".dbconfig ?op? ?val?     List or change sqlite3_db_config() options",
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
   ".dbinfo ?DB?             Show status information about the database",
+#endif
   ".dump ?OBJECTS?          Render database content as SQL",
   "   Options:",
   "     --data-only            Output only INSERT statements",
@@ -5841,6 +5843,7 @@ static unsigned int get4byteInt(unsigned char *a){
   return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3];
 }
 
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
 /*
 ** Implementation of the ".dbinfo" command.
 **
@@ -5937,6 +5940,8 @@ static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
   utf8_printf(p->out, "%-20s %u\n", "data version", iDataVersion);
   return 0;
 }
+#endif /* !defined(SQLITE_OMIT_VIRTUALTABLE)
+          && defined(SQLITE_ENABLE_DBPAGE_VTAB) */
 
 /*
 ** Print the current sqlite3_errmsg() value to stderr and return 1.
@@ -8479,11 +8484,11 @@ static int do_meta_command(char *zLine, ShellState *p){
     }   
   }else
 
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
   if( c=='d' && n>=3 && strncmp(azArg[0], "dbinfo", n)==0 ){
     rc = shell_dbinfo_command(p, nArg, azArg);
   }else
 
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
   if( c=='r' && strncmp(azArg[0], "recover", n)==0 ){
     open_db(p, 0);
     rc = recoverDatabaseCmd(p, nArg, azArg);