diff options
| author | drh <drh@noemail.net> | 2003-03-27 13:50:00 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2003-03-27 13:50:00 +0000 |
| commit | 812d7a21dd30c9ed9aebdb063a3efedede092d63 (patch) | |
| tree | 40176d47b4cc2c517ba9dd0d0cef845861ae3cad /src/trigger.c | |
| parent | 0951d703f2dcd3f096f1cdec7a2c3c304956f5fe (diff) | |
| download | sqlite-812d7a21dd30c9ed9aebdb063a3efedede092d63.tar.gz sqlite-812d7a21dd30c9ed9aebdb063a3efedede092d63.zip | |
Regression tests now work - except for some changes in error message
text. The library is now safe to use for experimental work. (CVS 885)
FossilOrigin-Name: 8a593e9c2d57e758739a7ef54fa40ca6a0071a9a
Diffstat (limited to 'src/trigger.c')
| -rw-r--r-- | src/trigger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trigger.c b/src/trigger.c index c0f0e6c26..2b7d35a24 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -61,8 +61,7 @@ void sqliteCreateTrigger( */ if( sqlite_malloc_failed ) goto trigger_cleanup; assert( pTableName->nSrc==1 ); - tab = sqliteTableNameToTable(pParse, pTableName->a[0].zName, - pTableName->a[0].zDatabase); + tab = sqliteSrcListLookup(pParse, pTableName); if( !tab ){ goto trigger_cleanup; } @@ -356,8 +355,9 @@ void sqliteDropTrigger(Parse *pParse, SrcList *pName, int nested){ zName = pName->a[0].zName; nName = strlen(zName); for(i=0; i<db->nDb; i++){ - if( zDb && sqliteStrICmp(db->aDb[i].zName, zDb) ) continue; - pTrigger = sqliteHashFind(&(db->aDb[i].trigHash), zName, nName+1); + int j = (i<2) ? i^1 : i; /* Search TEMP before MAIN */ + if( zDb && sqliteStrICmp(db->aDb[j].zName, zDb) ) continue; + pTrigger = sqliteHashFind(&(db->aDb[j].trigHash), zName, nName+1); if( pTrigger ) break; } if( !pTrigger ){ |