Fix a bug in the ".fullschema" dot-command of the CLI brought to light by

check-in [a2ddb89b206c1387] - raising an error on at attempt to access the
rowid of a subquery or view.

FossilOrigin-Name: 36875827a416067e1b8ffba0ff0ff88313177f8d84dd8e5bc9c23ea3f2d587ba

diff --git a/manifest b/manifest
index a4343b2e893dae4ca84101607cb7e1dfe3af0c39..e06a4754201df7f898391baa40e8e00a84e0171b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Document\ssqlite3_wal_hook()\sreturn.
-D 2021-06-25T00:25:38.963
+C Fix\sa\sbug\sin\sthe\s".fullschema"\sdot-command\sof\sthe\sCLI\sbrought\sto\slight\sby\ncheck-in\s[a2ddb89b206c1387]\s-\sraising\san\serror\son\sat\sattempt\sto\saccess\sthe\nrowid\sof\sa\ssubquery\sor\sview.
+D 2021-06-25T11:14:10.652
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -545,7 +545,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 35630effd4d16d2373caa41bae40a3d71f853f3ad0cb4f572f2ed4b8c350c1e9
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 4fa607bab6bcc580f12dbaf9c800b2250a1e408f10321a1d3bcb1dd30c447e62
-F src/shell.c.in a41dd6ac58ed2edfb9967bbf774ae2418ef03e6e2a8ce9420dffd4d5681f3b6d
+F src/shell.c.in a51de4f1f9d3e8510e095f9099c701d914968a0f20950f304745c3e0f8cf1626
 F src/sqlite.h.in ecf5aa981da30c33da3e9f353bf3ebf055d3c380c80d6a4f954e58d18ccd6df1
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
@@ -1919,7 +1919,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 d091150ff80709a1e50e0431aa33021f036979e4a88e9769eeec431dfad6d5f5
-R 68a99ca98b293264fdcf19f9731a02ba
-U larrybr
-Z febec1d836abbd001f8ff04bf4b6b37f
+P 8acaf7964551b4524fcdbb8d01fae7b0911508ecf6dcf23c3e0f8d8c790b78d8
+R aebdda5224a0a63abb78bffc26330861
+U drh
+Z 8cef5f08df554ceda36b81b1c7575d49

diff --git a/manifest.uuid b/manifest.uuid
index 594f58e297cb3406e635cc600f50fcb8035a1f1b..068b9181d298148349db68f5ca4846771cb6b92b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8acaf7964551b4524fcdbb8d01fae7b0911508ecf6dcf23c3e0f8d8c790b78d8
\ No newline at end of file
+36875827a416067e1b8ffba0ff0ff88313177f8d84dd8e5bc9c23ea3f2d587ba
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 1f064fa96fe76dd5fc3102d9431d351f9ed449d3..a5b90ea4957b1999d32042414d4c374801dc40a9 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8060,7 +8060,7 @@ static int do_meta_command(char *zLine, ShellState *p){
        "     FROM sqlite_schema UNION ALL"
        "   SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_schema) "
        "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "
-       "ORDER BY rowid",
+       "ORDER BY x",
        callback, &data, 0
     );
     if( rc==SQLITE_OK ){