From: drh <drh@noemail.net>
Date: Tue, 17 Dec 2019 12:03:30 +0000 (+0000)
Subject: Clean up the ExprList that holds the names of columns in a CTE before checking
X-Git-Tag: version-3.31.0~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=646975c521f3d857b449f441b5b586e7124b499c;p=thirdparty%2Fsqlite.git

Clean up the ExprList that holds the names of columns in a CTE before checking
for unused references in the ALTER TABLE implementation.

FossilOrigin-Name: 8223e79f987feda5c8e51ec52cec6798cca16d070b10558939e2888ca1a25b8e
---

diff --git a/manifest b/manifest
index c0a4bb6641..9be83f488b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sa\stable\sis\spart\sof\sa\sLEFT\sJOIN\sand\sshould\sbe\sa\scompletely\sNULL\srow\sdue\sto\nthe\ssemantics\sof\sa\sLEFT\sJOIN,\smake\ssure\sany\sgenerated\scolumns\son\sthat\srow\nevaluate\sto\sNULL.\s\sTicket\s[3b84b42943644d6f]
-D 2019-12-16T16:52:22.748
+C Clean\sup\sthe\sExprList\sthat\sholds\sthe\snames\sof\scolumns\sin\sa\sCTE\sbefore\schecking\nfor\sunused\sreferences\sin\sthe\sALTER\sTABLE\simplementation.
+D 2019-12-17T12:03:30.587
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -461,7 +461,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 9b3d6f8d3437f0bec3f9a4ebfa9fa4e7e3b34730631611b6d30f6ae1027bf3db
+F src/alter.c 14b5516be5b3815d30bf230b619978f6158e754a1d624f70a02cfe2178348b5c
 F src/analyze.c b3ceec3fc052df8a96ca8a8c858d455dc5029ba681b4be98bb5c5a9162cfa58c
 F src/attach.c b30c44333d55a68c0a12920b5b9d40b254cbd3d4509bda77417209eeed8b3d80
 F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
@@ -1852,7 +1852,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 1e3918ca2f2c1cfcfa44249b1d7b847d52cbb8d302a8d4a335c090cfdf22d7a1
-R df5ecffdc3336d06465700e45e68356b
+P 0271491438ad2a985aeff355173a8d0f1e5813954c82147bc68cb26cca5804c8
+R c68dc3ba4d5d231b86e4d84e0586fee0
 U drh
-Z 5f2c97f622c6cd887eeeafb84f2795e9
+Z 71205fed544fdcd4f0e940dde5d4548f
diff --git a/manifest.uuid b/manifest.uuid
index fed908ae8c..3e93c04a7a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0271491438ad2a985aeff355173a8d0f1e5813954c82147bc68cb26cca5804c8
\ No newline at end of file
+8223e79f987feda5c8e51ec52cec6798cca16d070b10558939e2888ca1a25b8e
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index 0fe41bd2f1..1cbdefc948 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -740,15 +740,17 @@ static int renameUnmapExprCb(Walker *pWalker, Expr *pExpr){
 ** to select statement pSelect.
 */
 static void renameWalkWith(Walker *pWalker, Select *pSelect){
-  if( pSelect->pWith ){
+  With *pWith = pSelect->pWith;
+  if( pWith ){
     int i;
-    for(i=0; i<pSelect->pWith->nCte; i++){
-      Select *p = pSelect->pWith->a[i].pSelect;
+    for(i=0; i<pWith->nCte; i++){
+      Select *p = pWith->a[i].pSelect;
       NameContext sNC;
       memset(&sNC, 0, sizeof(sNC));
       sNC.pParse = pWalker->pParse;
       sqlite3SelectPrep(sNC.pParse, p, &sNC);
       sqlite3WalkSelect(pWalker, p);
+      sqlite3RenameExprlistUnmap(pWalker->pParse, pWith->a[i].pCols);
     }
   }
 }