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
diff --git a/src/trigger.c b/src/trigger.c
index c0f0e6c..2b7d35a 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -61,8 +61,7 @@
*/
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 @@
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 ){