From: dan <dan@noemail.net>
Date: Tue, 14 Aug 2018 21:05:35 +0000 (+0000)
Subject: Fix a problem when renaming an IPK column that is also part of a child key.
X-Git-Tag: version-3.25.0~39^2~32^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=356afab163540a40894a7bc8c3f4dc4c409968c9;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: 6e6a2bfdbbfd4ffc14be88962ff97bf3c626fef9d1a337715d2a4be1a657fb0d
---

356afab163540a40894a7bc8c3f4dc4c409968c9
diff --cc manifest
index c33a3a26a9,c1ffa1b827..0c22ccf95e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\sand\sALTER\sTABLE\serror\smessage\simprovements\sinto\sthis\nbranch.
- D 2018-08-14T20:40:25.392
+ C Fix\sa\sproblem\swhen\srenaming\san\sIPK\scolumn\sthat\sis\salso\spart\sof\sa\schild\skey.
 -D 2018-08-14T21:03:38.735
++D 2018-08-14T21:05:35.866
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@@ -432,7 -432,7 +432,7 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 03a90ab39849f7f7ba3c637cc8fa663e2e0464b7fcb30c689db594b0a0db694e
 -F src/alter.c 35512b6c704721442f9a2b0856d139699742c85b87130c975d9dd802f327df3c
++F src/alter.c e1f3a71924a5248fb105baba9b9099b2187c20ebf5af5cb0992cc271b22def46
  F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
  F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
  F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
@@@ -599,7 -599,7 +599,7 @@@ F test/alter.test b820ab9dcf85f8e3a65bc
  F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
  F test/alter3.test 4d79934d812eaeacc6f22781a080f8cfe012fdc3
  F test/alter4.test b6d7b86860111864f6cddb54af313f5862dda23b
- F test/altercol.test 0af8f5733e3ed8ff36d38cd50303e81b6315f05efa96b102f366eb7dec2cc332
 -F test/altercol.test 8380bf54ea9eb849b783cb33eab988d4efd80c04f194485ff9f695ce3d643ac0
++F test/altercol.test a0b57120e68c7aedad302fd9fd515d7c69c7d3547eccc95a846351dc55296981
  F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
  F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
  F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
@@@ -1756,7 -1756,7 +1756,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P db829dc1a2d7afa49798a2fd32d1f070185b23e513416e65d8144fda24f23b50 37d11b8e8224a8b241ff57b9c4b9499db39dde4ddcb56ff8b03a3d08091a4c11
- R d085a71165e2639a22aa30d6c7bda869
 -P f6d6b472713c21deace3fd52c0b0b6901d758af043c238f004fabe52b01f730c
 -R 8e9298efe4cb9b189013f3e469b1ce50
++P 7a45802dafaed3c058f59d1487fe8091e1f309cc5f0a5bcf2579f0bdd8e92d89 ad15486022209205c65fb5ffdbe30a7b99379170451e6aff4bab6e90b549d6c7
++R 1d8b409ed4f5c3f244c9277896b51070
  U dan
- Z 6e1649fe2ca020e20382ea7b5f164ec1
 -Z 288fdb9114eb61b0445f1cd0f818929a
++Z 642c2e3d8e8cc78036c1fba818a3d8b0
diff --cc manifest.uuid
index ea16d59650,392e31bd4b..0249abf0f9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7a45802dafaed3c058f59d1487fe8091e1f309cc5f0a5bcf2579f0bdd8e92d89
 -ad15486022209205c65fb5ffdbe30a7b99379170451e6aff4bab6e90b549d6c7
++6e6a2bfdbbfd4ffc14be88962ff97bf3c626fef9d1a337715d2a4be1a657fb0d
diff --cc src/alter.c
index 29ef9e602e,a07c248b3b..89be503fc1
--- a/src/alter.c
+++ b/src/alter.c
@@@ -1131,75 -1111,42 +1131,75 @@@ static void renameColumnFunc
    memset(&sWalker, 0, sizeof(Walker));
    sWalker.pParse = &sParse;
    sWalker.xExprCallback = renameColumnExprCb;
 +  sWalker.xSelectCallback = renameColumnSelectCb;
    sWalker.u.pRename = &sCtx;
  
 +  if( rc!=SQLITE_OK ) goto renameColumnFunc_done;
    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]);
 +    Select *pSelect = sParse.pNewTable->pSelect;
 +    if( pSelect ){
 +      sCtx.pTab = pTab;
 +      sParse.rc = SQLITE_OK;
 +      sqlite3SelectPrep(&sParse, sParse.pNewTable->pSelect, 0);
 +      rc = (db->mallocFailed ? SQLITE_NOMEM : sParse.rc);
 +      if( rc==SQLITE_OK ){
 +        sqlite3WalkSelect(&sWalker, pSelect);
 +      }else if( rc==SQLITE_ERROR ){
 +        /* Failed to resolve all symboles in the view. This is not an 
 +        ** error, but it will not be edited. */
 +        sqlite3DbFree(db, sParse.zErrMsg);
 +        sParse.zErrMsg = 0;
 +        rc = SQLITE_OK;
 +      }
 +      if( rc!=SQLITE_OK ) goto renameColumnFunc_done;
 +    }else{
 +      /* A regular table */
 +      int bFKOnly = sqlite3_stricmp(zTable, sParse.pNewTable->zName);
 +      FKey *pFKey;
 +      assert( sParse.pNewTable->pSelect==0 );
 +      if( bFKOnly==0 ){
 +        renameTokenFind(
 +            &sParse, &sCtx, (void*)sParse.pNewTable->aCol[iCol].zName
 +        );
 +        if( sCtx.iCol<0 ){
 +          renameTokenFind(&sParse, &sCtx, (void*)&sParse.pNewTable->iPKey);
          }
 -        if( 0==sqlite3_stricmp(pFKey->zTo, zTable)
 -         && 0==sqlite3_stricmp(pFKey->aCol[i].zCol, zOld)
 -        ){
 -          renameTokenFind(&sParse, &sCtx, (void*)pFKey->aCol[i].zCol);
 +        sqlite3WalkExprList(&sWalker, sParse.pNewTable->pCheck);
 +        for(pIdx=sParse.pNewTable->pIndex; pIdx; pIdx=pIdx->pNext){
 +          sqlite3WalkExprList(&sWalker, pIdx->aColExpr);
          }
        }
 -    }
 -    if( bFKOnly==0 ){
 -      renameTokenFind(
 -          &sParse, &sCtx, (void*)sParse.pNewTable->aCol[sCtx.iCol].zName
 -      );
 -      assert( sCtx.iCol>=0 );
 -      if( sParse.pNewTable->iPKey==sCtx.iCol ){
 -        renameTokenFind(&sParse, &sCtx, (void*)&sParse.pNewTable->iPKey);
 -        sCtx.iCol = -1;
 -      }
 -      sqlite3WalkExprList(&sWalker, sParse.pNewTable->pCheck);
 -      for(pIdx=sParse.pNewTable->pIndex; pIdx; pIdx=pIdx->pNext){
 -        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 ){
++          if( bFKOnly==0 && pFKey->aCol[i].iFrom==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{
 +  }else if( sParse.pNewIndex ){
      sqlite3WalkExprList(&sWalker, sParse.pNewIndex->aColExpr);
      sqlite3WalkExpr(&sWalker, sParse.pNewIndex->pPartIdxWhere);
 +  }else{
 +    sCtx.zOld = zOld;
 +    sqlite3WalkExpr(&sWalker, sParse.pNewTrigger->pWhen);
 +    if( sParse.pNewTrigger->pColumns ){
 +      for(i=0; i<sParse.pNewTrigger->pColumns->nId; i++){
 +        char *zName = sParse.pNewTrigger->pColumns->a[i].zName;
 +        if( 0==sqlite3_stricmp(zName, zOld) ){
 +          renameTokenFind(&sParse, &sCtx, (void*)zName);
 +        }
 +      }
 +    }
    }
  
 +  assert( rc==SQLITE_OK );
    assert( nQuot>=nNew );
    zOut = sqlite3DbMallocZero(db, nSql + sCtx.nList*nQuot + 1);
    if( zOut ){