diff --git a/manifest b/manifest index c26cbce7e5..1fcfe4ef05 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C fiddle:\sreplaced\sthe\shuge\sfile\sselection\swidget\swith\sa\ssmaller\sproxy\sbutton. -D 2022-06-06T06:29:09.527 +C In\sCLI,\sdrop\s.dbinfo\scommand\swhen\sbuild\soptions\sprevent\sit\sfrom\sworking. +D 2022-06-06T15:22:11.742 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 0d5b571b82d846ad916739eaf5e7873677a477eb5a99ebecac904db1426199de +F src/shell.c.in 5d5f27f88c4661b2b6e6859890e9c7fe00eac9a628743a12c44632705fc38309 F src/sqlite.h.in 172528c287399a34f188154017b7268bf82c6d5b780902e361958d2318c4e37c F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d @@ -1975,8 +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 04b2e47784238008ce9057e2761ded91d895dc16d3bc8a3a3508df98a4769602 -R e01c1c9b103ff33839cb70c2516ed17e -U stephan -Z 067dacc5bce2e6f4343da4553ebaf315 +P f7c17449ea0685e322f50abe7a59b7afcde0f7e38e03645ec5b13753a6d0dcf3 268072f636b25c24ec47e34f2a8356f466ec200b80487b1041e89e0ae909c8bd +R 9207d306b462962d71351cad5c380553 +U larrybr +Z d9afd3ca8797e6fffb53fd8da4b761d1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 044360c003..df5448dbf7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f7c17449ea0685e322f50abe7a59b7afcde0f7e38e03645ec5b13753a6d0dcf3 \ No newline at end of file +4b50a55165f4603674a250df89cfc5ac1fef8aabaf433df8400df14d53bfbbe0 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index c789212a49..c9593f8b5e 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -4297,7 +4297,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", @@ -5845,6 +5847,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. ** @@ -5941,6 +5944,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. @@ -8483,11 +8488,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);