Make CLI .dump immune to pragma reverse_unordered_selects, as reported in [forum...

FossilOrigin-Name: 488caed24453fcef6fddcf40353e3b44cf37fb9d21e0ed743d39d60cbff020a7

diff --git a/manifest b/manifest
index 517067f28776f68a7a681215e85b84a99085184a..280e8dc3bd1daaa8e9ef8ca6130c3df135d6ce45 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\stypo\sin\sa\scomment.
-D 2024-01-21T21:20:33.306
+C Make\sCLI\s.dump\simmune\sto\spragma\sreverse_unordered_selects,\sas\sreported\sin\s[forum:/forumpost/c42be01880e961eb|Forum\sthread\s"Missing\sORDER\sBY\sin\s.dump?"]
+D 2024-01-22T01:11:24.847
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -739,7 +739,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c e25f51a473a5f30a0d978e4df2aaa98aeec84eac29ecae1ad4708a6c3e669345
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c f1a81ff4f8e9e76c224e2ab3a4baa799add0db22158c7fcede65d8cc4a6fa2da
-F src/shell.c.in d1ed426aae2d547932971e8019939cacb4dfda8258e45b8924b250e488e2d53d
+F src/shell.c.in 5ea8c6b0057bfe3bcdff31949fe72aa231ae429047c421ea1b168af6825a4890
 F src/sqlite.h.in 61a60b4ea04db8ead15e1579b20b64cb56e9f55d52c5f9f9694de630110593a3
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2159,8 +2159,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 298d6977285c71be917896bc875a8a26d985dcf0a74069b7c4d290e8ff0ac618
-R 6efa1c82cfa2e7d17b14637b7f3e1900
-U drh
-Z 096bcae3083b69021bc23dacf629858d
+P 382a8f94bffef3e5f715116e363a30e21e2c53cd42d4959dfbe90c4624143e6d
+R 0c3ae1bf61b2c5523c6e506b1fe8b74c
+U larrybr
+Z df2931d680c73052f2016399cfecfafe
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 91dcb94d920ad9d53b240e7b13eb1c021cf56489..d376c3e270fd3e94c70a33114776f7d9fa3751b2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-382a8f94bffef3e5f715116e363a30e21e2c53cd42d4959dfbe90c4624143e6d
\ No newline at end of file
+488caed24453fcef6fddcf40353e3b44cf37fb9d21e0ed743d39d60cbff020a7
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index da3b9f8706568e07049136394fb14550c29bd572..02850691d98c881dcd5e4a065ab6ec850b2de772 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8375,7 +8375,8 @@ static int do_meta_command(char *zLine, ShellState *p){
       zSql = sqlite3_mprintf(
         "SELECT sql FROM sqlite_schema AS o "
         "WHERE (%s) AND sql NOT NULL"
-        "  AND type IN ('index','trigger','view')",
+        "  AND type IN ('index','trigger','view') "
+        "ORDER BY type COLLATE NOCASE DESC",
         zLike
       );
       run_table_dump_query(p, zSql);