commit b9bcf7ca600ab8a94018adc2eac4115441a09d89
author drh <drh@noemail.net> Sat Oct 19 13:29:10 2019 +0000
committer drh <drh@noemail.net> Sat Oct 19 13:29:10 2019 +0000
tree 320096c64bdaaa2b5d9b1ca19ff3db9413b7adfe
parent f95909c7648942e7157722c33b5e5f9293bf3436

Refactor names of column index transformation functions, for clarity.
Get generated columns working with ALTER TABLE RENAME COLUMN.

FossilOrigin-Name: 27ab41c9102e7801ff829488fc123a8040da008bef373d6704efbe2f93e1da90

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 41ffe71..c57a000 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3410,10 +3410,10 @@
       return;
 #endif
     }else if( !HasRowid(pTab) ){
-      x = sqlite3ColumnOfIndex(sqlite3PrimaryKeyIndex(pTab), iCol);
+      x = sqlite3TableColumnToIndex(sqlite3PrimaryKeyIndex(pTab), iCol);
       op = OP_Column;
     }else{
-      x = sqlite3ColumnOfTable(pTab,iCol);
+      x = sqlite3TableColumnToStorage(pTab,iCol);
       op = OP_Column;
     }
     sqlite3VdbeAddOp3(v, op, iTabCur, x, regOut);
@@ -3591,7 +3591,8 @@
             return -1-pParse->iSelfTab;
           }
           pCol = pTab->aCol + pExpr->iColumn;
-          iSrc = sqlite3ColumnOfTable(pTab, pExpr->iColumn) - pParse->iSelfTab;
+          iSrc = sqlite3TableColumnToStorage(pTab, pExpr->iColumn)
+                      - pParse->iSelfTab;
 #ifndef SQLITE_OMIT_GENERATED_COLUMNS
           if( pCol->colFlags & COLFLAG_GENERATED ){
             if( pCol->colFlags & COLFLAG_BUSY ){
@@ -5320,7 +5321,7 @@
 static int exprIdxCover(Walker *pWalker, Expr *pExpr){
   if( pExpr->op==TK_COLUMN
    && pExpr->iTable==pWalker->u.pIdxCover->iCur
-   && sqlite3ColumnOfIndex(pWalker->u.pIdxCover->pIdx, pExpr->iColumn)<0
+   && sqlite3TableColumnToIndex(pWalker->u.pIdxCover->pIdx, pExpr->iColumn)<0
   ){
     pWalker->eCode = 1;
     return WRC_Abort;