The ALTER TABLE fix of check-in [7e5ad8e0ab7ee91a] is no longer needed due

to the changes at check-in [4cf8721f5ceb1fda].  But, we keep the defense
in place as an assert() for extra safety.

FossilOrigin-Name: 230556e859536bbadf0daf8133a9a01ef4f03148b3296723e37bad66e3fc3d82

diff --git a/manifest b/manifest
index 9f7663d7fa354e66281f99a029e2d34b82461614..57765085e0fdcedea0462c9efb079573a2c8b09a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sdead\scode\sthat\swas\sadded\sduring\sinitial\sdevelopment\sof\sRENAME\sCOLUMN\nbut\snever\sactually\sserved\sa\spurpose.
-D 2020-04-07T00:54:09.100
+C The\sALTER\sTABLE\sfix\sof\scheck-in\s[7e5ad8e0ab7ee91a]\sis\sno\slonger\sneeded\sdue\nto\sthe\schanges\sat\scheck-in\s[4cf8721f5ceb1fda].\s\sBut,\swe\skeep\sthe\sdefense\nin\splace\sas\san\sassert()\sfor\sextra\ssafety.
+D 2020-04-07T01:18:23.360
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -465,7 +465,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c db353ed3123b05730c58744e52a71711779abd8d9081e31c981b69ec42a911cc
+F src/alter.c fa2c3be9b0ebecfafb7062072a0ae6eda126d3e5a9fd51b2eded5acd95dc783c
 F src/analyze.c 831bb090988477a00d3b4c000746e1b0454dcc93b10b793e6ebe1c47f25d193a
 F src/attach.c ff2daea0fe62080192e3f262670e4f61f5a86c1e7bea9cec34e960fe79852aa1
 F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
@@ -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 daac9c5a0a47a9b8115ee24ef2d0e8be5e74e1d932fc72677b2c239380c2e0e1
+F src/expr.c b292bdecd64cd695109ceaa3c810f8b41f202368c75adb9ea680a875df5b0308
 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 7e170e67f24c7cdef7e7ceac4e0b81a75382618e4abe9e604f3d7f6db9dc6396
-R 96b603cf5952b339ffd4e6938833516a
+P c95c4cda4640f05d61b13b4e60494dec07d4483734fc41ffcce73fb5163cbb0d
+R 8efe08123193d0ec7b4ac8c33faea4db
 U drh
-Z 5f8493cb155b275011c6713c52ec3f87
+Z 25c5bd97478bfa906937072a65ec4128

diff --git a/manifest.uuid b/manifest.uuid
index 1048e21996eea3f05c6fef8e57fd138649f91168..6bb0f559d10426735a5dfcebe9a8689aca97b8c9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c95c4cda4640f05d61b13b4e60494dec07d4483734fc41ffcce73fb5163cbb0d
\ No newline at end of file
+230556e859536bbadf0daf8133a9a01ef4f03148b3296723e37bad66e3fc3d82
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index b041291a255974a6df9fffba8efa5777a662203e..c357f220744fe7c303d0da0e077c1f3ab2fa99da 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -698,7 +698,7 @@ void *sqlite3RenameTokenMap(Parse *pParse, void *pPtr, Token *pToken){
   RenameToken *pNew;
   assert( pPtr || pParse->db->mallocFailed );
   renameTokenCheckAll(pParse, pPtr);
-  if( pParse->eParseMode!=PARSE_MODE_UNMAP ){
+  if( ALWAYS(pParse->eParseMode!=PARSE_MODE_UNMAP) ){
     pNew = sqlite3DbMallocZero(pParse->db, sizeof(RenameToken));
     if( pNew ){
       pNew->p = pPtr;

diff --git a/src/expr.c b/src/expr.c
index 0629f508aaec4344eedd18e50b1b28a6e4917253..7165e4fa142f85c7b0f5ed541e6022371f6543ab 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1787,6 +1787,7 @@ void sqlite3ExprListSetName(
   int dequote             /* True to cause the name to be dequoted */
 ){
   assert( pList!=0 || pParse->db->mallocFailed!=0 );
+  assert( pParse->eParseMode!=PARSE_MODE_UNMAP || dequote==0 );
   if( pList ){
     struct ExprList_item *pItem;
     assert( pList->nExpr>0 );