Fix a problem with renaming a non-temp table that has at least one temp

trigger and shares its name with a temp table.

FossilOrigin-Name: ceb60bd7e5f2a0a4247bff476fc6468227305467339ae0c24591be9d2b14bdde
This commit is contained in:
dan
2018-09-07 15:50:31 +00:00
parent 202a0274db
commit d5e6fef2a1
5 changed files with 45 additions and 18 deletions
+10 -9
View File
@@ -1031,29 +1031,30 @@ static int renameEditSql(
*/
static int renameResolveTrigger(Parse *pParse, const char *zDb){
sqlite3 *db = pParse->db;
Trigger *pNew = pParse->pNewTrigger;
TriggerStep *pStep;
NameContext sNC;
int rc = SQLITE_OK;
memset(&sNC, 0, sizeof(sNC));
sNC.pParse = pParse;
pParse->pTriggerTab = sqlite3FindTable(db, pParse->pNewTrigger->table, zDb);
pParse->eTriggerOp = pParse->pNewTrigger->op;
assert( pNew->pTabSchema );
pParse->pTriggerTab = sqlite3FindTable(db, pNew->table,
db->aDb[sqlite3SchemaToIndex(db, pNew->pTabSchema)].zDbSName
);
pParse->eTriggerOp = pNew->op;
/* Resolve symbols in WHEN clause */
if( pParse->pNewTrigger->pWhen ){
rc = sqlite3ResolveExprNames(&sNC, pParse->pNewTrigger->pWhen);
if( pNew->pWhen ){
rc = sqlite3ResolveExprNames(&sNC, pNew->pWhen);
}
for(pStep=pParse->pNewTrigger->step_list;
rc==SQLITE_OK && pStep;
pStep=pStep->pNext
){
for(pStep=pNew->step_list; rc==SQLITE_OK && pStep; pStep=pStep->pNext){
if( pStep->pSelect ){
sqlite3SelectPrep(pParse, pStep->pSelect, &sNC);
if( pParse->nErr ) rc = pParse->rc;
}
if( rc==SQLITE_OK && pStep->zTarget ){
if( rc==SQLITE_OK && pStep->zTarget ){
Table *pTarget = sqlite3LocateTable(pParse, 0, pStep->zTarget, zDb);
if( pTarget==0 ){
rc = SQLITE_ERROR;