Fix a problem when renaming an IPK column that is also part of a child key.

FossilOrigin-Name: ad15486022209205c65fb5ffdbe30a7b99379170451e6aff4bab6e90b549d6c7

diff --git a/manifest b/manifest
index f7a1e356c7b26f5a3939ee655305ba1dfa07064b..c1ffa1b8270049715d0690584561812a6324d167 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\sALTER\sTABLE\sRENAME\sCOLUMN\son\sa\svirtual\stable.
-D 2018-08-14T20:38:18.441
+C Fix\sa\sproblem\swhen\srenaming\san\sIPK\scolumn\sthat\sis\salso\spart\sof\sa\schild\skey.
+D 2018-08-14T21:03:38.735
 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 b3f6b775437e34bec4d420fdcccf5ca0452d289ae73fd0d20008eac26032d66a
+F src/alter.c 35512b6c704721442f9a2b0856d139699742c85b87130c975d9dd802f327df3c
 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 65d15800d9f0dffc252927314e02bb572e17422a07e38b963db87bd16d80e469
+F test/altercol.test 8380bf54ea9eb849b783cb33eab988d4efd80c04f194485ff9f695ce3d643ac0
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
@@ -1756,7 +1756,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 37d11b8e8224a8b241ff57b9c4b9499db39dde4ddcb56ff8b03a3d08091a4c11
-R a97b8ef67d1e5217c49bfc573da7ed6f
-U drh
-Z 60f84be9f63ca1dd6e50246fd9de4eb5
+P f6d6b472713c21deace3fd52c0b0b6901d758af043c238f004fabe52b01f730c
+R 8e9298efe4cb9b189013f3e469b1ce50
+U dan
+Z 288fdb9114eb61b0445f1cd0f818929a

diff --git a/manifest.uuid b/manifest.uuid
index 3726a30bd4cf48c0ce308a4d2705919ecde24367..392e31bd4b7946fac9f7de45f0cfa30f93c2f3ae 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6d6b472713c21deace3fd52c0b0b6901d758af043c238f004fabe52b01f730c
\ No newline at end of file
+ad15486022209205c65fb5ffdbe30a7b99379170451e6aff4bab6e90b549d6c7
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index 12f57db18d3b9addee60225d9d7ca74d5409aa26..a07c248b3ba060941e6cee125645b397d5dfd2e2 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -1116,6 +1116,18 @@ static void renameColumnFunc(
   if( sParse.pNewTable ){
     int bFKOnly = sqlite3_stricmp(zTable, sParse.pNewTable->zName);
     FKey *pFKey;
+    for(pFKey=sParse.pNewTable->pFKey; pFKey; pFKey=pFKey->pNextFrom){
+      for(i=0; i<pFKey->nCol; i++){
+        if( bFKOnly==0 && pFKey->aCol[i].iFrom==sCtx.iCol ){
+          renameTokenFind(&sParse, &sCtx, (void*)&pFKey->aCol[i]);
+        }
+        if( 0==sqlite3_stricmp(pFKey->zTo, zTable)
+         && 0==sqlite3_stricmp(pFKey->aCol[i].zCol, zOld)
+        ){
+          renameTokenFind(&sParse, &sCtx, (void*)pFKey->aCol[i].zCol);
+        }
+      }
+    }
     if( bFKOnly==0 ){
       renameTokenFind(
           &sParse, &sCtx, (void*)sParse.pNewTable->aCol[sCtx.iCol].zName
@@ -1130,19 +1142,6 @@ static void renameColumnFunc(
         sqlite3WalkExprList(&sWalker, pIdx->aColExpr);
       }
     }
-
-    for(pFKey=sParse.pNewTable->pFKey; pFKey; pFKey=pFKey->pNextFrom){
-      for(i=0; i<pFKey->nCol; i++){
-        if( bFKOnly==0 && pFKey->aCol[i].iFrom==sCtx.iCol ){
-          renameTokenFind(&sParse, &sCtx, (void*)&pFKey->aCol[i]);
-        }
-        if( 0==sqlite3_stricmp(pFKey->zTo, zTable)
-         && 0==sqlite3_stricmp(pFKey->aCol[i].zCol, zOld)
-        ){
-          renameTokenFind(&sParse, &sCtx, (void*)pFKey->aCol[i].zCol);
-        }
-      }
-    }
   }else{
     sqlite3WalkExprList(&sWalker, sParse.pNewIndex->aColExpr);
     sqlite3WalkExpr(&sWalker, sParse.pNewIndex->pPartIdxWhere);

diff --git a/test/altercol.test b/test/altercol.test
index 434f23659ccc25ad176edc4098f9a2432816ae27..a82adeb03958c94db048665fafd185120a954bde 100644 (file)
--- a/test/altercol.test
+++ b/test/altercol.test
@@ -72,6 +72,9 @@ foreach {tn before after} {
  16 {CREATE TABLE t1(a INTEGER, b INTEGER PRIMARY KEY, c BLOB)}
     {CREATE TABLE t1(a INTEGER, d INTEGER PRIMARY KEY, c BLOB)}
 
+ 17  {CREATE TABLE t1(a INTEGER, b INTEGER PRIMARY KEY, c BLOB, FOREIGN KEY (b) REFERENCES t2)}
+     {CREATE TABLE t1(a INTEGER, d INTEGER PRIMARY KEY, c BLOB, FOREIGN KEY (d) REFERENCES t2)}
+
 } {
   reset_db
   do_execsql_test 1.$tn.0 $before