Fix CLI mishandling of SQL "execute" tokens, go and /

FossilOrigin-Name: 1a117b0388d61f72d1f5947c9092ab5b6fffda32c438baadaef3187dc52bd7ca

diff --git a/manifest b/manifest
index cbca61dd058147dd5ca2d2adfc0c57ca3fdee996..b53a02671c5a5010a2e5c663fd896df0362e8d38 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smis-renditions\sof\shelp\stext.
-D 2022-04-11T18:42:15.073
+C Fix\sCLI\smishandling\sof\sSQL\s"execute"\stokens,\sgo\sand\s/
+D 2022-04-11T23:01:18.809
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -557,7 +557,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 18d99e7146852d6064559561769fcca0743eb32b14a97da6dbed373a30ee0e76
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 7c106b3f36d483242b0a9c696614cd53d6f29e1ac81da6a3f0e9ea92f4211cc3
-F src/shell.c.in 9ff03d0ac2199d97b67bdf899879c35ffb9aa7d48f7b43348bf211487e663d35
+F src/shell.c.in 7b5eab1401536e6df969664ba85bbeb8f757a586839dfd52b5ef903e1798f1fc
 F src/shext_linkage.h 4f58ea112273f3e6769221739b7160852cf0d7cdd4ee757f6c696e90fb7ffcb9
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1398,7 +1398,7 @@ F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
 F test/shell1.test 9401659c4f7319586ddd36aac15aaadff0092caa786589fc20ad069fc2cb1c74
 F test/shell2.test fc6bb55f5ceaaffa284cb994aa00fd56f7ead09949c9db01c3846d65a76a7748
-F test/shell3.test 4ddea2bd182e7e03249911b23ae249e7cb8a91cdc86e695198725affabe8ecd3
+F test/shell3.test e12fb76031b1d6dec6e778b098ab8720987cb447120abe0dd234fbae1fc05c2c
 F test/shell4.test b232688061cce531f42ec067f3b5760e31d12409e566e2ae230951036dd156f1
 F test/shell5.test 39d2cffb3c1c67456b2c42eb5e46bec1e3780c68a6d71bb156e012d3f53733c5
 F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3
@@ -1953,8 +1953,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 33591833326e98882e0fa6225a7a55a7e915063a36bf24bb3c17c35e693d972e
-R 06acb2785a29d19ea9019a96853b9c1c
+P 1a7a6b6f48327fffeff1173a8e437c9989f761ce236c99478f088087a386b155
+R 3a80e1717bece816268134435893e429
 U larrybr
-Z 87422813bd25290d430cff6780d4246f
+Z 0d899f46c2b90edd51d4c3e4e9d0c63c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f878b2e4f10421ab0ff9536248be6800bff5bf29..6efd3cb5a79cfe49527e7bf64668395d8f37c7c1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a7a6b6f48327fffeff1173a8e437c9989f761ce236c99478f088087a386b155
\ No newline at end of file
+1a117b0388d61f72d1f5947c9092ab5b6fffda32c438baadaef3187dc52bd7ca
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 362e675bd4d288b546cfa4001f4cd46b0fdd3d4b..a090b89f6307bef5e88d2115623e07629e0aaf5c 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -14351,7 +14351,7 @@ typedef enum {
 ** The scan is resumable for subsequent lines when prior
 ** return values are passed as the 2nd argument.
 */
-static void sql_prescan(char *zLine, SqlScanState *pSSS){
+static void sql_prescan(const char *zLine, SqlScanState *pSSS){
   SqlScanState sss = *pSSS;
   char cin;
   char cWait = (char)sss; /* intentional narrowing loss */
@@ -14432,15 +14432,15 @@ static void sql_prescan(char *zLine, SqlScanState *pSSS){
 */
 static char *line_is_command_terminator(char *zLine){
   int iSkip = 0;
-  while( IsSpace(zLine[0]) ){ zLine++; };
-  if( zLine[0]=='/' )
-    zLine += 1; /* Oracle */
-  else if( ToLower(zLine[0])=='g' && ToLower(zLine[1])=='o' )
-    zLine += 2; /* SQL Server */
-  else if( iSkip>0 ){
+  const char *zDark = skipWhite(zLine);
+  if( zDark[0]=='/' )
+    iSkip = 1; /* Oracle */
+  else if( ToLower(zDark[0])=='g' && ToLower(zDark[1])=='o' )
+    iSkip = 2; /* SQL Server */
+  if( iSkip>0 ){
     SqlScanState sss = SSS_Start;
-    sql_prescan(zLine+iSkip,&sss);
-    if( sss==SSS_Start ) return zLine;
+    sql_prescan(zDark+iSkip,&sss);
+    if( sss==SSS_Start ) return (char *)zDark;
   }
   return 0;
 }

diff --git a/test/shell3.test b/test/shell3.test
index e0791fb29d11b16197a85bcc59137b34af284f18..2dd20d88b179b0a0a044df3a4d964f45ea31cf7e 100644 (file)
--- a/test/shell3.test
+++ b/test/shell3.test
@@ -19,6 +19,7 @@
 #   shell3-1.*: Basic tests for running SQL statments from command line.
 #   shell3-2.*: Basic tests for running SQL file from command line.
 #   shell3-3.*: Basic tests for processing odd SQL constructs.
+#   shell3-4.*: Basic tests for accept/reject SQL "execute" terminators.
 #
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -136,4 +137,44 @@ a["b"]
 .*/ x
 'y}} 1}
 
+#----------------------------------------------------------------------------
+#   shell3-4.*: Basic tests for accept/reject SQL "execute" terminators.
+#
+do_test shell3-4.1 {
+  catchcmd ":memory:" {
+select 1
+;
+select 2
+go
+select 3
+/
+}
+} {0 {1
+2
+3}}
+
+set incomplete {1 {Error: Input incomplete at line 4 of "<stdin>"}}
+
+do_test shell3-4.2 {
+  catchcmd ":memory:" {
+select 1
+; junk
+}
+} $incomplete
+
+do_test shell3-4.3 {
+  catchcmd ":memory:" {
+select 2
+go.
+}
+} $incomplete
+
+do_test shell3-4.4 {
+  catchcmd ":memory:" {
+select 3
+//
+}
+} $incomplete
+
+
 finish_test