diff options
| author | drh <> | 2021-08-02 18:03:43 +0000 |
|---|---|---|
| committer | drh <> | 2021-08-02 18:03:43 +0000 |
| commit | cf9d36d1b3a84fb68d2e13acb790c449bff51c15 (patch) | |
| tree | 41739e173fe71a4dafba5ffee69002b82a83543a /src/update.c | |
| parent | f38524d20db165c94dc94e06b62f0aad5942a03b (diff) | |
| download | sqlite-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/update.c')
| -rw-r--r-- | src/update.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/update.c b/src/update.c index 6f503c32f..484bee47c 100644 --- a/src/update.c +++ b/src/update.c @@ -64,7 +64,7 @@ void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){ sqlite3_value *pValue = 0; u8 enc = ENC(sqlite3VdbeDb(v)); Column *pCol = &pTab->aCol[i]; - VdbeComment((v, "%s.%s", pTab->zName, pCol->zName)); + VdbeComment((v, "%s.%s", pTab->zName, pCol->zCnName)); assert( i<pTab->nCol ); sqlite3ValueFromExpr(sqlite3VdbeDb(v), sqlite3ColumnExpr(pTab,pCol), enc, @@ -451,13 +451,16 @@ void sqlite3Update( */ chngRowid = chngPk = 0; for(i=0; i<pChanges->nExpr; i++){ + u8 hCol = sqlite3StrIHash(pChanges->a[i].zEName); /* If this is an UPDATE with a FROM clause, do not resolve expressions ** here. The call to sqlite3Select() below will do that. */ if( nChangeFrom==0 && sqlite3ResolveExprNames(&sNC, pChanges->a[i].pExpr) ){ goto update_cleanup; } for(j=0; j<pTab->nCol; j++){ - if( sqlite3StrICmp(pTab->aCol[j].zName, pChanges->a[i].zEName)==0 ){ + if( pTab->aCol[j].hName==hCol + && sqlite3StrICmp(pTab->aCol[j].zCnName, pChanges->a[i].zEName)==0 + ){ if( j==pTab->iPKey ){ chngRowid = 1; pRowidExpr = pChanges->a[i].pExpr; @@ -471,7 +474,7 @@ void sqlite3Update( testcase( pTab->aCol[j].colFlags & COLFLAG_STORED ); sqlite3ErrorMsg(pParse, "cannot UPDATE generated column \"%s\"", - pTab->aCol[j].zName); + pTab->aCol[j].zCnName); goto update_cleanup; } #endif @@ -495,7 +498,7 @@ void sqlite3Update( { int rc; rc = sqlite3AuthCheck(pParse, SQLITE_UPDATE, pTab->zName, - j<0 ? "ROWID" : pTab->aCol[j].zName, + j<0 ? "ROWID" : pTab->aCol[j].zCnName, db->aDb[iDb].zDbSName); if( rc==SQLITE_DENY ){ goto update_cleanup; |