Add assert()s to the new code in the previous check-in.

FossilOrigin-Name: b12f23a5c484cab3654721299ea0f05230eef6b14012b557f3bf2592fac0f00e

diff --git a/manifest b/manifest
index 03f188a18eaad97e8bf228878b36c01d4f74296b..6fba15564716549fb8d4ee4bb2d69717ca927428 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C First\sproposed\sfix\sfor\sthe\sALTER\sTABLE\sproblem\sdescribed\sby\sticket\n[b41031ea2b5372378cb3d2d]
-D 2018-09-16T23:27:37.486
+C Add\sassert()s\sto\sthe\snew\scode\sin\sthe\sprevious\scheck-in.
+D 2018-09-17T00:15:21.614
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -500,7 +500,7 @@ F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
 F src/prepare.c f8e260d940a0e08494c0f30744521b2f832d7263eca9d02b050cea0ba144b097
 F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c c1bc3a26460721d2cba0797f59879fd53bd6c841afa00b8b31642c0dfd1fdf3c
+F src/resolve.c c32f4c9473207e0434489582161867e92548128492112e756d5b0dd248567bfe
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c ed6192ddd09a97169cb1c6d732b26c0f647b72d5fa8ca401c7ee1180fbbe521a
 F src/shell.c.in 6e0aad854be738a5d0368940459399be211e9ac43aebe92bb9ed46cfe38d0e1f
@@ -1766,10 +1766,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 2df2cf4f179dd88fb2530dfd338f344ac48dd052ef954dc95a136884523f7aee
-R fe632daa0f368e2d5f1d4be59c87d7ab
-T *branch * tkt-b41031ea
-T *sym-tkt-b41031ea *
-T -sym-trunk *
+P 05a9d129254e01a5f6b5e4033c105190eae386575a94b020ef3e0cbd30bbf056
+R 06efc1c5b094a00f26fafeb2dea6c95e
 U drh
-Z 491184a3fb91134029b6eaff416a99f5
+Z 392095af0ce931065bb28167458f689d

diff --git a/manifest.uuid b/manifest.uuid
index 4858388b5fc703963ed08d8ac095083aec4f6baf..0422c97fdefae7abeba57dca54cd1eb7be7950d0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05a9d129254e01a5f6b5e4033c105190eae386575a94b020ef3e0cbd30bbf056
\ No newline at end of file
+b12f23a5c484cab3654721299ea0f05230eef6b14012b557f3bf2592fac0f00e
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 017b026de384e0d392e10b8c3beb5132004941a9..b10843ca09503048db1faa9afeee0127064697f2 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -241,7 +241,10 @@ static int lookupName(
         pTab = pItem->pTab;
         assert( pTab!=0 && pTab->zName!=0 );
         if( pTab->nCol==0 ){
-          if( sqlite3ViewGetColumnNames(pNC->pParse, pTab) ) return WRC_Abort;
+          assert( pParse->eParseMode==PARSE_MODE_RENAME_COLUMN
+               || pParse->eParseMode==PARSE_MODE_RENAME_TABLE );
+          assert( pNC->pParse==pParse );
+          if( sqlite3ViewGetColumnNames(pParse, pTab) ) return WRC_Abort;
         }
         if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){
           int hit = 0;