aboutsummaryrefslogtreecommitdiff
path: root/src/wherecode.c
diff options
context:
space:
mode:
authordrh <>2021-08-02 18:03:43 +0000
committerdrh <>2021-08-02 18:03:43 +0000
commitcf9d36d1b3a84fb68d2e13acb790c449bff51c15 (patch)
tree41739e173fe71a4dafba5ffee69002b82a83543a /src/wherecode.c
parentf38524d20db165c94dc94e06b62f0aad5942a03b (diff)
downloadsqlite-cf9d36d1b3a84fb68d2e13acb790c449bff51c15.tar.gz
sqlite-cf9d36d1b3a84fb68d2e13acb790c449bff51c15.zip
Refactor field names in the Column object, zCnName and zCnColl, to make them
unique and thus easier to find amid all the other code. FossilOrigin-Name: 8b781dcaf68e0cf12a844708c82eee00193e340195cbca915d077e4846983bf3
Diffstat (limited to 'src/wherecode.c')
-rw-r--r--src/wherecode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wherecode.c b/src/wherecode.c
index 84fa1a141..f3589bb0a 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -29,7 +29,7 @@ static const char *explainIndexColumnName(Index *pIdx, int i){
i = pIdx->aiColumn[i];
if( i==XN_EXPR ) return "<expr>";
if( i==XN_ROWID ) return "rowid";
- return pIdx->pTable->aCol[i].zName;
+ return pIdx->pTable->aCol[i].zCnName;
}
/*
@@ -1241,8 +1241,8 @@ static void whereIndexExprTrans(
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
}else if( iRef>=0
&& (pTab->aCol[iRef].colFlags & COLFLAG_VIRTUAL)!=0
- && (pTab->aCol[iRef].zColl==0
- || sqlite3StrICmp(pTab->aCol[iRef].zColl, sqlite3StrBINARY)==0)
+ && (pTab->aCol[iRef].zCnColl==0
+ || sqlite3StrICmp(pTab->aCol[iRef].zCnColl, sqlite3StrBINARY)==0)
){
/* Check to see if there are direct references to generated columns
** that are contained in the index. Pulling the generated column