From: larrybr <larrybr@noemail.net>
Date: Mon, 26 Jun 2023 17:08:08 +0000 (+0000)
Subject: Fix CLI .sha3sum error message for keyword identifiers, reported in [forum:/forumpost... 
X-Git-Tag: version-3.43.0~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=502c618f011974c8c9ade8d788c8e3a510c4dcb8;p=thirdparty%2Fsqlite.git

Fix CLI .sha3sum error message for keyword identifiers, reported in [forum:/forumpost/7cbe081746dd|forum post 7cbe081746dd].

FossilOrigin-Name: 9d7813ddcf67f1256e7331c5f390cb122b3f7e35cf46e0b33b610216a5396a00
---

diff --git a/manifest b/manifest
index 6d9ea163d2..4b3f698179 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\ssome\sJS\s'self'\sreferences\swith\s'globalThis',\sas\sreported\svia\sthe\snpm\ssubproject.
-D 2023-06-26T07:05:05.347
+C Fix\sCLI\s.sha3sum\serror\smessage\sfor\skeyword\sidentifiers,\sreported\sin\s[forum:/forumpost/7cbe081746dd|forum\spost\s7cbe081746dd].
+D 2023-06-26T17:08:08.442
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -638,7 +638,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 383b9dba12493c365ee2036bcadd73013b7c0f7d2afcda0c378317c335d60ac2
-F src/shell.c.in bdd1fdfc77a67651cdc5a158bc9107cf3c2cf3ddb62d7a4da06c6eaaa5e72037
+F src/shell.c.in 5f07ea7ca4262872fcf07ce623a0be7c003f11834b80501874f039319aaf61b6
 F src/sqlite.h.in 3076d78836b6dac53b3ab0875fc8fd15bca8077aad4d33c85336e05af6aef8c7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -1469,7 +1469,7 @@ F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8e
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
 F test/shell1.test 300b77328aaafb9f3e7a53a26e4162fbf92181d92251d259ff105a2275ff998d
-F test/shell2.test 09a202f57e7cd99788537f763e0845796a173fcea06a0d199a08d69446fe1daf
+F test/shell2.test 35226c070a8c7f64fd016dfac2a0db2a40f709b3131f61daacd9dad61536c9cb
 F test/shell3.test 91febeac0412812bf6370abb8ed72700e32bf8f9878849414518f662dfd55e8a
 F test/shell4.test 9abd0c12a7e20a4c49e84d5be208d2124fa6c09e728f56f1f4bee0f02853935f
 F test/shell5.test c8b6c54f26ec537f8558273d7ed293ca3725ef42e6b12b8f151718628bd1473b
@@ -2041,8 +2041,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 6d435d1dace1be52bdb920168e629412b9adf55dbe59cf3db8f169c26f6e6b81
-R fad6594133ee06df5657ec838c87bb99
-U stephan
-Z 4d28c7204684da4ba4d91e62d6c46a18
+P d4e66dfc2e87112fa73a9c64db358429d88fb2ab3a08908b0eb655f6ed42f94b
+R 0390daf8d0a458de7e53173bbe3626cd
+U larrybr
+Z 444f1861e33b5e178835f8d9ea3e3c0a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index be27cbd066..3961b8c6d5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d4e66dfc2e87112fa73a9c64db358429d88fb2ab3a08908b0eb655f6ed42f94b
\ No newline at end of file
+9d7813ddcf67f1256e7331c5f390cb122b3f7e35cf46e0b33b610216a5396a00
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 5af5b1cfa5..dfc09a28a1 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10532,7 +10532,8 @@ static int do_meta_command(char *zLine, ShellState *p){
           "with tabcols as materialized(\n"
           "select tname, cname\n"
           "from ("
-          " select ss.tname as tname, ti.name as cname\n"
+          " select printf('\"%%w\"',ss.tname) as tname,"
+          " printf('\"%%w\"',ti.name) as cname\n"
           " from (%z) ss\n inner join pragma_table_info(tname) ti))\n"
           "select 'SELECT total(bad_text_count) AS bad_text_count\n"
           "FROM ('||group_concat(query, ' UNION ALL ')||')' as btc_query\n"
diff --git a/test/shell2.test b/test/shell2.test
index 3fad4bd665..16ed33c442 100644
--- a/test/shell2.test
+++ b/test/shell2.test
@@ -262,5 +262,14 @@ do_test shell2-1.4.11 {
  SELECT count(*) FROM t;}]]
 } {0 1}
 
+# Bug from forum post 7cbe081746dd3803
+# Keywords as column names were producing an error message.
+do_test shell2-1.4.12 {
+  set res [catchcmd :memory: [string trim {
+ CREATE TABLE "group"("order" text);
+ INSERT INTO "group" VALUES ('ABC');
+.sha3sum}]]
+} {0 ca08bc02b7e95c7df431a3a4b1cc0f8d8743914793473f55b5558e03}
+
 
 finish_test