aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/alter.c73
-rw-r--r--src/build.c6
-rw-r--r--src/parse.y4
-rw-r--r--src/sqliteInt.h2
-rw-r--r--src/tokenize.c4
-rw-r--r--src/trigger.c38
6 files changed, 81 insertions, 46 deletions
diff --git a/src/alter.c b/src/alter.c
index c19eb67a6..5dbd42a28 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -846,7 +846,7 @@ void sqlite3AlterRenameColumn(
"UPDATE \"%w\".%s SET "
"sql = sqlite_rename_column(sql, %d, %d, %Q, %Q, %Q) "
"WHERE name NOT LIKE 'sqlite_%%' AND ("
- " type = 'table' OR (type='index' AND tbl_name = %Q)"
+ " type = 'table' OR (type IN ('index', 'trigger') AND tbl_name = %Q)"
")",
zDb, MASTER_NAME, iCol, bQuote, zNew, pTab->zName, zOld, pTab->zName
);
@@ -891,10 +891,12 @@ struct RenameToken {
** The context of an ALTER TABLE RENAME COLUMN operation that gets passed
** down into the Walker.
*/
+typedef struct RenameCtx RenameCtx;
struct RenameCtx {
RenameToken *pList; /* List of tokens to overwrite */
int nList; /* Number of tokens in pList */
int iCol; /* Index of column being renamed */
+ const char *zOld; /* Old column name */
};
/*
@@ -940,33 +942,40 @@ static void renameTokenFree(sqlite3 *db, RenameToken *pToken){
}
}
-static RenameToken *renameTokenFind(Parse *pParse, void *pPtr){
+static void renameTokenFind(Parse *pParse, RenameCtx *pCtx, void *pPtr){
RenameToken **pp;
for(pp=&pParse->pRename; (*pp); pp=&(*pp)->pNext){
if( (*pp)->p==pPtr ){
RenameToken *pToken = *pp;
*pp = pToken->pNext;
- pToken->pNext = 0;
- return pToken;
+ pToken->pNext = pCtx->pList;
+ pCtx->pList = pToken;
+ pCtx->nList++;
+ break;
}
}
- return 0;
}
static int renameColumnExprCb(Walker *pWalker, Expr *pExpr){
- struct RenameCtx *p = pWalker->u.pRename;
- if( pExpr->op==TK_COLUMN && pExpr->iColumn==p->iCol ){
- RenameToken *pTok = renameTokenFind(pWalker->pParse, (void*)pExpr);
- if( pTok ){
- pTok->pNext = p->pList;
- p->pList = pTok;
- p->nList++;
+ RenameCtx *p = pWalker->u.pRename;
+ if( p->zOld && pExpr->op==TK_DOT ){
+ Expr *pLeft = pExpr->pLeft;
+ Expr *pRight = pExpr->pRight;
+ assert( pLeft->op==TK_ID && pRight->op==TK_ID );
+ if( 0==sqlite3_stricmp(pLeft->u.zToken, "old")
+ || 0==sqlite3_stricmp(pLeft->u.zToken, "new")
+ ){
+ if( 0==sqlite3_stricmp(pRight->u.zToken, p->zOld) ){
+ renameTokenFind(pWalker->pParse, p, (void*)pRight);
+ }
}
+ }else if( pExpr->op==TK_COLUMN && pExpr->iColumn==p->iCol ){
+ renameTokenFind(pWalker->pParse, p, (void*)pExpr);
}
return WRC_Continue;
}
-static RenameToken *renameColumnTokenNext(struct RenameCtx *pCtx){
+static RenameToken *renameColumnTokenNext(RenameCtx *pCtx){
RenameToken *pBest = pCtx->pList;
RenameToken *pToken;
RenameToken **pp;
@@ -989,7 +998,7 @@ static void renameColumnFunc(
sqlite3_value **argv
){
sqlite3 *db = sqlite3_context_db_handle(context);
- struct RenameCtx sCtx;
+ RenameCtx sCtx;
const char *zSql = (const char*)sqlite3_value_text(argv[0]);
int nSql = sqlite3_value_bytes(argv[0]);
int bQuote = sqlite3_value_int(argv[2]);
@@ -1019,7 +1028,9 @@ static void renameColumnFunc(
rc = sqlite3RunParser(&sParse, zSql, &zErr);
assert( sParse.pNewTable==0 || sParse.pNewIndex==0 );
if( db->mallocFailed ) rc = SQLITE_NOMEM;
- if( rc==SQLITE_OK && sParse.pNewTable==0 && sParse.pNewIndex==0 ){
+ if( rc==SQLITE_OK
+ && sParse.pNewTable==0 && sParse.pNewIndex==0 && sParse.pNewTrigger==0
+ ){
rc = SQLITE_CORRUPT_BKPT;
}
@@ -1067,10 +1078,9 @@ static void renameColumnFunc(
int bFKOnly = sqlite3_stricmp(zTable, sParse.pNewTable->zName);
FKey *pFKey;
if( bFKOnly==0 ){
- sCtx.pList = renameTokenFind(
- &sParse, (void*)sParse.pNewTable->aCol[sCtx.iCol].zName
+ renameTokenFind(
+ &sParse, &sCtx, (void*)sParse.pNewTable->aCol[sCtx.iCol].zName
);
- sCtx.nList = 1;
assert( sCtx.iCol>=0 );
if( sParse.pNewTable->iPKey==sCtx.iCol ){
sCtx.iCol = -1;
@@ -1083,28 +1093,30 @@ static void renameColumnFunc(
for(pFKey=sParse.pNewTable->pFKey; pFKey; pFKey=pFKey->pNextFrom){
for(i=0; i<pFKey->nCol; i++){
- RenameToken *pTok = 0;
if( bFKOnly==0 && pFKey->aCol[i].iFrom==sCtx.iCol ){
- pTok = renameTokenFind(&sParse, (void*)&pFKey->aCol[i]);
- if( pTok ){
- pTok->pNext = sCtx.pList;
- sCtx.pList = pTok;
- sCtx.nList++;
- }
+ renameTokenFind(&sParse, &sCtx, (void*)&pFKey->aCol[i]);
}
if( 0==sqlite3_stricmp(pFKey->zTo, zTable)
&& 0==sqlite3_stricmp(pFKey->aCol[i].zCol, zOld)
){
- pTok = renameTokenFind(&sParse, (void*)pFKey->aCol[i].zCol);
- pTok->pNext = sCtx.pList;
- sCtx.pList = pTok;
- sCtx.nList++;
+ 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( nQuot>=nNew );
@@ -1148,6 +1160,7 @@ renameColumnFunc_done:
}
sqlite3DeleteTable(db, sParse.pNewTable);
if( sParse.pNewIndex ) sqlite3FreeIndex(db, sParse.pNewIndex);
+ sqlite3DeleteTrigger(db, sParse.pNewTrigger);
renameTokenFree(db, sParse.pRename);
renameTokenFree(db, sCtx.pList);
sqlite3ParserReset(&sParse);
diff --git a/src/build.c b/src/build.c
index f7a91025b..66004294e 100644
--- a/src/build.c
+++ b/src/build.c
@@ -3686,7 +3686,8 @@ void *sqlite3ArrayAllocate(
**
** A new IdList is returned, or NULL if malloc() fails.
*/
-IdList *sqlite3IdListAppend(sqlite3 *db, IdList *pList, Token *pToken){
+IdList *sqlite3IdListAppend(Parse *pParse, IdList *pList, Token *pToken){
+ sqlite3 *db = pParse->db;
int i;
if( pList==0 ){
pList = sqlite3DbMallocZero(db, sizeof(IdList) );
@@ -3704,6 +3705,9 @@ IdList *sqlite3IdListAppend(sqlite3 *db, IdList *pList, Token *pToken){
return 0;
}
pList->a[i].zName = sqlite3NameFromToken(db, pToken);
+ if( IN_RENAME_COLUMN && pList->a[i].zName ){
+ sqlite3RenameToken(pParse, (void*)pList->a[i].zName, pToken);
+ }
return pList;
}
diff --git a/src/parse.y b/src/parse.y
index 47e73feb8..76e966a4d 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -908,9 +908,9 @@ insert_cmd(A) ::= REPLACE. {A = OE_Replace;}
idlist_opt(A) ::= . {A = 0;}
idlist_opt(A) ::= LP idlist(X) RP. {A = X;}
idlist(A) ::= idlist(A) COMMA nm(Y).
- {A = sqlite3IdListAppend(pParse->db,A,&Y);}
+ {A = sqlite3IdListAppend(pParse,A,&Y);}
idlist(A) ::= nm(Y).
- {A = sqlite3IdListAppend(pParse->db,0,&Y); /*A-overwrites-Y*/}
+ {A = sqlite3IdListAppend(pParse,0,&Y); /*A-overwrites-Y*/}
/////////////////////////// Expression Processing /////////////////////////////
//
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 7b01bb27f..1c7ae4ddd 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3881,7 +3881,7 @@ void sqlite3FreeIndex(sqlite3*, Index*);
#endif
void sqlite3Insert(Parse*, SrcList*, Select*, IdList*, int, Upsert*);
void *sqlite3ArrayAllocate(sqlite3*,void*,int,int*,int*);
-IdList *sqlite3IdListAppend(sqlite3*, IdList*, Token*);
+IdList *sqlite3IdListAppend(Parse*, IdList*, Token*);
int sqlite3IdListIndex(IdList*,const char*);
SrcList *sqlite3SrcListEnlarge(sqlite3*, SrcList*, int, int);
SrcList *sqlite3SrcListAppend(sqlite3*, SrcList*, Token*, Token*);
diff --git a/src/tokenize.c b/src/tokenize.c
index 685d10b25..02d21f1f5 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -697,9 +697,11 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
*/
sqlite3DeleteTable(db, pParse->pNewTable);
}
+ if( !IN_RENAME_COLUMN ){
+ sqlite3DeleteTrigger(db, pParse->pNewTrigger);
+ }
if( pParse->pWithToFree ) sqlite3WithDelete(db, pParse->pWithToFree);
- sqlite3DeleteTrigger(db, pParse->pNewTrigger);
sqlite3DbFree(db, pParse->pVList);
while( pParse->pAinc ){
AutoincInfo *p = pParse->pAinc;
diff --git a/src/trigger.c b/src/trigger.c
index 044f256ae..1df88fd80 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -181,14 +181,16 @@ void sqlite3BeginTrigger(
goto trigger_cleanup;
}
assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
- if( sqlite3HashFind(&(db->aDb[iDb].pSchema->trigHash),zName) ){
- if( !noErr ){
- sqlite3ErrorMsg(pParse, "trigger %T already exists", pName);
- }else{
- assert( !db->init.busy );
- sqlite3CodeVerifySchema(pParse, iDb);
+ if( !IN_RENAME_COLUMN ){
+ if( sqlite3HashFind(&(db->aDb[iDb].pSchema->trigHash),zName) ){
+ if( !noErr ){
+ sqlite3ErrorMsg(pParse, "trigger %T already exists", pName);
+ }else{
+ assert( !db->init.busy );
+ sqlite3CodeVerifySchema(pParse, iDb);
+ }
+ goto trigger_cleanup;
}
- goto trigger_cleanup;
}
/* Do not create a trigger on a system table */
@@ -212,7 +214,7 @@ void sqlite3BeginTrigger(
}
#ifndef SQLITE_OMIT_AUTHORIZATION
- {
+ if( !IN_RENAME_COLUMN ){
int iTabDb = sqlite3SchemaToIndex(db, pTab->pSchema);
int code = SQLITE_CREATE_TRIGGER;
const char *zDb = db->aDb[iTabDb].zDbSName;
@@ -246,8 +248,14 @@ void sqlite3BeginTrigger(
pTrigger->pTabSchema = pTab->pSchema;
pTrigger->op = (u8)op;
pTrigger->tr_tm = tr_tm==TK_BEFORE ? TRIGGER_BEFORE : TRIGGER_AFTER;
- pTrigger->pWhen = sqlite3ExprDup(db, pWhen, EXPRDUP_REDUCE);
- pTrigger->pColumns = sqlite3IdListDup(db, pColumns);
+ if( IN_RENAME_COLUMN ){
+ pTrigger->pWhen = pWhen;
+ pWhen = 0;
+ }else{
+ pTrigger->pWhen = sqlite3ExprDup(db, pWhen, EXPRDUP_REDUCE);
+ }
+ pTrigger->pColumns = pColumns;
+ pColumns = 0;
assert( pParse->pNewTrigger==0 );
pParse->pNewTrigger = pTrigger;
@@ -296,6 +304,14 @@ void sqlite3FinishTrigger(
goto triggerfinish_cleanup;
}
+#ifndef SQLITE_OMIT_ALTERTABLE
+ if( IN_RENAME_COLUMN ){
+ assert( !db->init.busy );
+ pParse->pNewTrigger = pTrig;
+ pTrig = 0;
+ }else
+#endif
+
/* if we are not initializing,
** build the sqlite_master entry
*/
@@ -337,7 +353,7 @@ void sqlite3FinishTrigger(
triggerfinish_cleanup:
sqlite3DeleteTrigger(db, pTrig);
- assert( !pParse->pNewTrigger );
+ assert( IN_RENAME_COLUMN || !pParse->pNewTrigger );
sqlite3DeleteTriggerStep(db, pStepList);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-18 16:40:16 +0000