Add a NEVER() to the ALTER TABLE fix in check-in [1d2e53a39b87e364]

FossilOrigin-Name: c7309ed3c7588c7e51e09418bf5cfd4611539b44c39cef9ed4ae0e385bae7625

diff --git a/manifest b/manifest
index e8e37c2f379bb108c0520e1654e8c2a73123d623..d258de301c1e4bb7910566b1536bab507ea0ed49 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sprevious\scheck-in\swas\snot\squite\scorrect,\sand\sintroduced\sa\snew\sproblem\nwith\sthe\sUSING\sclause.\s\sUse\sthis\sversion\sinstead.
-D 2019-12-09T18:22:17.430
+C Add\sa\sNEVER()\sto\sthe\sALTER\sTABLE\sfix\sin\scheck-in\s[1d2e53a39b87e364]
+D 2019-12-09T19:29:10.291
 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 ef3519bcc3da6e1d8c0bda63233fb315c99f08e8cd74fe3afb9eeaa2b424bfd4
+F src/alter.c 9b3d6f8d3437f0bec3f9a4ebfa9fa4e7e3b34730631611b6d30f6ae1027bf3db
 F src/analyze.c b3ceec3fc052df8a96ca8a8c858d455dc5029ba681b4be98bb5c5a9162cfa58c
 F src/attach.c b30c44333d55a68c0a12920b5b9d40b254cbd3d4509bda77417209eeed8b3d80
 F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
@@ -637,7 +637,7 @@ F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74
 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
 F test/altertab.test 4d8b79b0b88b62b90b710390df14fe99e0a3578345526886eaa550e28e3065dc
 F test/altertab2.test 8883693952f6d7fb5f754dbf1d694ed780aa883027bef04cb1fb99a3b88c9272
-F test/altertab3.test 3faf56b3f5af0dd2c12d954db4746521fc96543222da5b6e2633ed417640ce83
+F test/altertab3.test 231881a8e9c4905a84213476c64c174a119e1ab75ce17d986dcbbacc07b2b544
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test 547bb700f903107b38611b014ca645d6b5bb819f5210d7bf39c40802aafeb7d7
 F test/analyze3.test 01f0b122e3e54ad2544f14f7cc7dcb4c2cb8753cad5e88c6b8d49615b3fd6a2b
@@ -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 1923efb283e8840fa7436eb20b9d2174ef7cace1690d3b97b572a0db2048b8e3
-R a96cd4b8228ca22846e956b515f7f936
+P ed28aaa4851202111a502f883ca06359d89b25bba4055c29d7bce2b501cfcc68
+R ba840c4297279356152ab032c954fe8c
 U drh
-Z be59f8e80c6d9c48ccfec27ec78b01a5
+Z 9bf11ac4c26576dca473cbff94f16995

diff --git a/manifest.uuid b/manifest.uuid
index 2c0b8b2983546a141d1b8559e301ae5ce8b03f32..9983641a848d039f086999846e24d838ab3ebac4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed28aaa4851202111a502f883ca06359d89b25bba4055c29d7bce2b501cfcc68
\ No newline at end of file
+c7309ed3c7588c7e51e09418bf5cfd4611539b44c39cef9ed4ae0e385bae7625
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index 48fa527562a9a6bd6949b9aa0bdaba39bad7ef0e..0fe41bd2f10792d0813a680684a581ceb3f11d1b 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -760,7 +760,7 @@ static int renameUnmapSelectCb(Walker *pWalker, Select *p){
   Parse *pParse = pWalker->pParse;
   int i;
   if( pParse->nErr ) return WRC_Abort;
-  if( p->selFlags & SF_View ) return WRC_Prune;
+  if( NEVER(p->selFlags & SF_View) ) return WRC_Prune;
   if( ALWAYS(p->pEList) ){
     ExprList *pList = p->pEList;
     for(i=0; i<pList->nExpr; i++){

diff --git a/test/altertab3.test b/test/altertab3.test
index 7103a810b59c0cae5c7ac749fc381ec6cd8ca3e7..88d882fcb4db689ac5c120f5cc9282b2e818cfd9 100644 (file)
--- a/test/altertab3.test
+++ b/test/altertab3.test
@@ -504,7 +504,6 @@ do_execsql_test 22.3 {
   CREATE VIEW v2(b) AS WITH t3 AS (SELECT b FROM v2) SELECT * FROM t3;
 }
 
-breakpoint
 do_catchsql_test 22.4 {
   ALTER TABLE t1 RENAME TO t4;
 } {1 {error in view v2: view v2 is circularly defined}}