From: larrybr <larrybr@noemail.net>
Date: Fri, 14 Jan 2022 16:29:45 +0000 (+0000)
Subject: For .import schema, quote it as for other identifiers.
X-Git-Tag: version-3.38.0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce0b5e44b7e9dba7f5b5b23f0aae70857a5f7391;p=thirdparty%2Fsqlite.git

For .import schema, quote it as for other identifiers.

FossilOrigin-Name: bff9153ceedcc7be77f2daf5139fee29c2fab742ff1fce49877965423a7d4be3
---

diff --git a/manifest b/manifest
index 66a6286ee2..b4ad6e2287 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s--schema\sS\soption\sto\s.import
-D 2022-01-13T21:22:54.666
+C For\s.import\sschema,\squote\sit\sas\sfor\sother\sidentifiers.
+D 2022-01-14T16:29:45.154
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -552,7 +552,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 359bc0e445d427583d2ab6110433a5dc777f64a0ecdf8d24826d8b475233ead9
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c a4a23a70f0a24a1103ac9698f6be181a6ec7ff6c19e03e8899c43cb6d2af09d6
-F src/shell.c.in 851ce2b310888c68f3f66d876b7392cc822f0cb0e316b1a89997abb1d7ec67f0
+F src/shell.c.in 4690f216dc4da0c104a8fd9f9e12bec0483242e630324aa7a3ccd155922e346e
 F src/sqlite.h.in a5e0d6bd47e67aabf1475986d36bdcc7bfa9e06566790ebf8e3aa7fa551c9f99
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 01eb85e4f2759a5ee79c183f4b2877889d4ffdc49d27ae74529c9579e3c8c0ef
@@ -1938,8 +1938,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 9282bcde301cee2a5c3c068b5b0b7ce992c155ece894413a6a9a51a81e4133fd
-R 85600e55f5465c0d7b90f18f16da5617
+P 38d9dbca166078013a44214c88805fc7cca578976ceed9fc62f5159a38ec96a7
+R e7948e84541b04c653db4c07ea64a3d2
 U larrybr
-Z 49bd76acfcc3b273011e69ab0fa8281f
+Z de2e0419e48292104e905a3447c66b63
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f826775084..95e710345f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38d9dbca166078013a44214c88805fc7cca578976ceed9fc62f5159a38ec96a7
\ No newline at end of file
+bff9153ceedcc7be77f2daf5139fee29c2fab742ff1fce49877965423a7d4be3
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 430d9e1640..c15d2e54d4 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8534,7 +8534,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     while( (nSkip--)>0 ){
       while( xRead(&sCtx) && sCtx.cTerm==sCtx.cColSep ){}
     }
-    zSql = sqlite3_mprintf("SELECT * FROM %s.\"%w\"", zSchema, zTable);
+    zSql = sqlite3_mprintf("SELECT * FROM \"%w\".\"%w\"", zSchema, zTable);
     if( zSql==0 ){
       import_cleanup(&sCtx);
       shell_out_of_memory();
@@ -8543,7 +8543,8 @@ static int do_meta_command(char *zLine, ShellState *p){
     rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
     import_append_char(&sCtx, 0);    /* To ensure sCtx.z is allocated */
     if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(p->db))==0 ){
-      char *zCreate = sqlite3_mprintf("CREATE TABLE %s.\"%w\"", zSchema,zTable);
+      char *zCreate = sqlite3_mprintf("CREATE TABLE \"%w\".\"%w\"",
+                                      zSchema, zTable);
       char cSep = '(';
       while( xRead(&sCtx) ){
         zCreate = sqlite3_mprintf("%z%c\n  \"%w\" TEXT", zCreate, cSep, sCtx.z);
@@ -8562,14 +8563,14 @@ static int do_meta_command(char *zLine, ShellState *p){
         utf8_printf(p->out, "%s\n", zCreate);
       }
       rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
-      sqlite3_free(zCreate);
       if( rc ){
-        utf8_printf(stderr, "CREATE TABLE %s.\"%s\"(...) failed: %s\n",
-                    zSchema, zTable, sqlite3_errmsg(p->db));
+        utf8_printf(stderr, "%s failed:\n%s\n", zCreate, sqlite3_errmsg(p->db));
+        sqlite3_free(zCreate);
         import_cleanup(&sCtx);
         rc = 1;
         goto meta_command_exit;
       }
+      sqlite3_free(zCreate);
       rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
     }
     sqlite3_free(zSql);
@@ -8589,7 +8590,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       import_cleanup(&sCtx);
       shell_out_of_memory();
     }
-    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO %s.\"%w\" VALUES(?",
+    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\".\"%w\" VALUES(?",
                      zSchema, zTable);
     j = strlen30(zSql);
     for(i=1; i<nCol; i++){