From: drh <> Date: Tue, 23 Dec 2025 17:24:10 +0000 (+0000) Subject: Additional changes to support the ".schema" command on builds that omit X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=337fce82f09ddeecb70d44f2c09b01ba49376f0c;p=thirdparty%2Fsqlite.git Additional changes to support the ".schema" command on builds that omit virtual tables. FossilOrigin-Name: 6b5c0374fa81cf069263bebf9b740573de4f82fde3c4e5796af80dcbe6a1a2e7 --- diff --git a/manifest b/manifest index e93f25415c..ab0c2f3c08 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\s".schema"\scommand\sin\sthe\sCLI\sso\sthat\sit\sworks\son\sbuilds\sthat\nomit\svirtual\stable\ssupport. -D 2025-12-23T16:51:49.770 +C Additional\schanges\sto\ssupport\sthe\s".schema"\scommand\son\sbuilds\sthat\somit\nvirtual\stables. +D 2025-12-23T17:24:10.162 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -737,7 +737,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 47aa7fdc9ec4c19b103ac5e79d7887d30119b5675309facf5eed1118391c868b F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 85852256d860f3ba5be4a9edc1238e68dbea082a0167f31b7345c821ae45775d -F src/shell.c.in 81e1ccd6f445ddd32a4ad7d72e0b657d08f542ea634719aec87fec9de703928b +F src/shell.c.in 8aa6b2bc490271bcbb39b650b120d28976c2de0c0ae80f356a64b2971ba85023 F src/sqlite.h.in b6599377f02ef9d545a8da48959213928b63291ad83ff65e5f3a72bf4fec595d F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998 @@ -2187,8 +2187,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 519877cdbde80071ac08f2e467ef8b9679816dc486cf6eb87ec2d9a38c819f88 -R d6d10df5aa4915c08cfd3fc35480cddc +P b4e3c8170a107b2018fe5374495dbec14c851ccbf7419cd382991b2fe68c45e4 +R bbf0f8a3b999b9219c1c633e81632132 U drh -Z 0c03e08a69f295b295d2d5729de460ac +Z c31ffc765328d25d9e743687ef375ec0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ab55318c07..cbdbbad290 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b4e3c8170a107b2018fe5374495dbec14c851ccbf7419cd382991b2fe68c45e4 +6b5c0374fa81cf069263bebf9b740573de4f82fde3c4e5796af80dcbe6a1a2e7 diff --git a/src/shell.c.in b/src/shell.c.in index 9904d4fb87..ce6026330a 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -10374,7 +10374,8 @@ static int do_meta_command(const char *zLine, ShellState *p){ sqlite3_str_appendf(pSql," FROM \"%w\".sqlite_schema", zDb); } sqlite3_finalize(pStmt); -#ifndef SQLITE_OMIT_INTROSPECTION_PRAGMAS +#if !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) \ + && !defined(SQLITE_OMIT_VIRTUALTABLE) if( zName ){ sqlite3_str_appendall(pSql, " UNION ALL SELECT shell_module_schema(name),"