When running ALTER TABLE, avoid adding some internally generated tokens to the token...

FossilOrigin-Name: 4cf8721f5ceb1fdaefdc355b3211f75c53c4cdf9d2582ca70fc96777a9b057c2

diff --git a/manifest b/manifest
index 3cb4e79c3067fd9313ed54c491f5015800c1ecc2..ffc40648fe5e34a723dc7046ace322f19ea56ea6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sNEVER()\sthat\scould\sbe\strue\sin\ssqlite3MatchEName().
-D 2020-04-04T11:58:22.101
+C When\srunning\sALTER\sTABLE,\savoid\sadding\ssome\sinternally\sgenerated\stokens\sto\sthe\stoken\smap\sto\simprove\sperformance\son\sschemas\swith\snested\sviews.
+D 2020-04-06T16:37:05.016
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F src/date.c b29b349d277e3d579dcc295b24c0a2caed83fd8f090a9f7cbe6070c0fd662384
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 793deaf88a0904f88285d93d6713c636d55ede0ffd9f08d10f4ea825531d367f
 F src/delete.c 11000121c4281c0bce4e41db29addfaea0038eaa127ece02557c9207bc3e541d
-F src/expr.c 74973866b0fe8cd0bcaee7cec14541cb1a505d6103fde4922d82c867767c0d64
+F src/expr.c 29b4aedca855c6ef86786db894c6961605a9a1e70af23617db2976aea6c2c122
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 F src/func.c f3dcdc0e95509864767c1f0991b19360f969e44177f4e058fd51da9a6154f47e
@@ -1860,7 +1860,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 70c44811d12f540d4ec1c29dedbe999cf79b82e326a8712ae2fa0725d6bd8a65
-R 1d8ea1f97a3e77c156396942d00ee749
-U drh
-Z c92edccf4ade9cfa7ee39186e5aeb2c2
+P 921448f0e24a3753374b32be9d7bf36a9ca5d8522eff9f0b51dc243f08652419
+R 315e582db187b4e17ad03b8b387a78b4
+U dan
+Z 72d22b8c17363fe4c28ed6cd6151ab27

diff --git a/manifest.uuid b/manifest.uuid
index 255c1a4047554ffcdd3ac71cbf2b8964889d7f6b..01c155035482656aa59daf4a02f4f367e54fde34 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-921448f0e24a3753374b32be9d7bf36a9ca5d8522eff9f0b51dc243f08652419
\ No newline at end of file
+4cf8721f5ceb1fdaefdc355b3211f75c53c4cdf9d2582ca70fc96777a9b057c2
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index bcabc38b6e0d4d3349e87c837767159855fff037..b9b3b9ee6f5341ed2b901fa21ec2962f0928ca00 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1794,9 +1794,14 @@ void sqlite3ExprListSetName(
     assert( pItem->zEName==0 );
     assert( pItem->eEName==ENAME_NAME );
     pItem->zEName = sqlite3DbStrNDup(pParse->db, pName->z, pName->n);
-    if( dequote ) sqlite3Dequote(pItem->zEName);
-    if( IN_RENAME_OBJECT ){
-      sqlite3RenameTokenMap(pParse, (void*)pItem->zEName, pName);
+    if( dequote ){
+      /* If dequote==0, then pName->z does not point to part of a DDL
+      ** statement handled by the parser. And so no token need be added
+      ** to the token-map.  */
+      sqlite3Dequote(pItem->zEName);
+      if( IN_RENAME_OBJECT ){
+        sqlite3RenameTokenMap(pParse, (void*)pItem->zEName, pName);
+      }
     }
   }
 }