Fix a bug causing ALTER TABLE RENAME COLUMN to fail when renaming an IPK

column that is used in a CHECK constraint.

FossilOrigin-Name: 6595c8811f13719d0aed8041abc7e1cade41c57427bcbf3503e2e42408eaa03b

diff --git a/manifest b/manifest
index 4619fc2238d2d672d1e138632f4a4fa8077663c9..740b31b0cc2d670ee2bd71f2271dcf80c085c07e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\scausing\sall\sALTER\sTABLE\sRENAME\sCOLUMN\scommands\sto\sfail\sif\sANALYZE\nhad\sbeen\srun\son\sthe\sdatabase.\sAlso\sprevent\sthe\suser\sfrom\srenaming\sthe\scolumns\nof\ssystem\stables.
-D 2018-08-11T17:34:38.795
+C Fix\sa\sbug\scausing\sALTER\sTABLE\sRENAME\sCOLUMN\sto\sfail\swhen\srenaming\san\sIPK\ncolumn\sthat\sis\sused\sin\sa\sCHECK\sconstraint.
+D 2018-08-11T17:49:23.862
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -432,7 +432,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 26ddd5989ed4af89d49f6b6b8e9456b8a9c73af11f0212321873800fe70fdaae
+F src/alter.c 8c3ce11294672a328514ecd645e73a835a1dcb263f96f5a03c8f51788b259432
 F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
 F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
 F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
@@ -599,7 +599,7 @@ F test/alter.test b820ab9dcf85f8e3a65bc8326accb2f0c7be64ef
 F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
 F test/alter3.test 4d79934d812eaeacc6f22781a080f8cfe012fdc3
 F test/alter4.test b6d7b86860111864f6cddb54af313f5862dda23b
-F test/altercol.test 4ff44e94b1eb385f14d1e9b8783232fbcb3ca283aed677834e415e148505bc21
+F test/altercol.test 753fe5cf75769a0962b8bc4e8086f0461523389ada5e0781e4aaf3becf7ee883
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
@@ -1755,7 +1755,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 f4497b0136e9fcb1121a834c86f84eeaf8f1e7d3157d409484e086bcef3487f1
-R b87d244c1780c981f7a5147b861524e9
+P ca644a2877c26561f8fb3b3feb74a070cd46621acb105577f04bc936c9b72a95
+R fd8528d5126f30260be362a88507cf3f
 U dan
-Z adde180225143b072a288c833a037d1c
+Z e52377e155b6be8271466863411cf88c

diff --git a/manifest.uuid b/manifest.uuid
index 7e4401b3a0c54dd4daf2d7c5bc49dfe0fdb99fef..321f34a360dae5abfe9df80fadc4e1761599371b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca644a2877c26561f8fb3b3feb74a070cd46621acb105577f04bc936c9b72a95
\ No newline at end of file
+6595c8811f13719d0aed8041abc7e1cade41c57427bcbf3503e2e42408eaa03b
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index 7cf47b38a69db7c44b04d0a363cfe415e1aece05..887da39ddd0c64e2e01324635c5a0846f18288b4 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -1023,6 +1023,10 @@ static void renameColumnFunc(
           &sParse, (void*)sParse.pNewTable->aCol[sCtx.iCol].zName
       );
       sCtx.nList = 1;
+      assert( sCtx.iCol>=0 );
+      if( sParse.pNewTable->iPKey==sCtx.iCol ){
+        sCtx.iCol = -1;
+      }
       sqlite3WalkExprList(&sWalker, sParse.pNewTable->pCheck);
       for(pIdx=sParse.pNewTable->pIndex; pIdx; pIdx=pIdx->pNext){
         sqlite3WalkExprList(&sWalker, pIdx->aColExpr);

diff --git a/test/altercol.test b/test/altercol.test
index 98b001a867cc658b28ceaf411ff8165ec42fe02c..c49bbccabcf4354432193c400c4439391aa49f9d 100644 (file)
--- a/test/altercol.test
+++ b/test/altercol.test
@@ -183,5 +183,22 @@ do_catchsql_test 6.1 {
   ALTER TABLE sqlite_stat1 RENAME tbl TO thetable;
 } {1 {table sqlite_stat1 may not be altered}}
 
+#-------------------------------------------------------------------------
+do_execsql_test 6.0 {
+  CREATE TABLE blob(
+    rid INTEGER PRIMARY KEY,
+    rcvid INTEGER,
+    size INTEGER,
+    uuid TEXT UNIQUE NOT NULL,
+    content BLOB,
+    CHECK( length(uuid)>=40 AND rid>0 )
+  );
+}
+
+breakpoint
+do_execsql_test 6.1 {
+  ALTER TABLE "blob" RENAME COLUMN "rid" TO "a1";
+}
+
 finish_test