diff options
| author | drh <drh@noemail.net> | 2004-02-14 23:05:52 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2004-02-14 23:05:52 +0000 |
| commit | 1d85d93158397be278cf2719324313bec46353f7 (patch) | |
| tree | 2a93306853f78ef2f79b380a3b4550206b68ef1a /src/trigger.c | |
| parent | 8a6ac0adbc159bc70548638ae5a7f62509882960 (diff) | |
| download | sqlite-1d85d93158397be278cf2719324313bec46353f7.tar.gz sqlite-1d85d93158397be278cf2719324313bec46353f7.zip | |
Eliminate the use of callbacks during schema initialization. (CVS 1242)
FossilOrigin-Name: af5c2be4aed1c50f69eb9634cf051a26263dcf51
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 82b679755..e727dcc0c 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -65,8 +65,8 @@ void sqliteBeginTrigger( */ if( sqlite_malloc_failed ) goto trigger_cleanup; assert( pTableName->nSrc==1 ); - if( pParse->initFlag - && sqliteFixInit(&sFix, pParse, pParse->iDb, "trigger", pName) + if( db->init.busy + && sqliteFixInit(&sFix, pParse, db->init.iDb, "trigger", pName) && sqliteFixSrcList(&sFix, pTableName) ){ goto trigger_cleanup; @@ -76,7 +76,7 @@ void sqliteBeginTrigger( goto trigger_cleanup; } iDb = isTemp ? 1 : tab->iDb; - if( iDb>=2 && !pParse->initFlag ){ + if( iDb>=2 && !db->init.busy ){ sqliteErrorMsg(pParse, "triggers may not be added to auxiliary " "database %s", db->aDb[tab->iDb].zName); goto trigger_cleanup; @@ -181,7 +181,7 @@ void sqliteFinishTrigger( /* if we are not initializing, and this trigger is not on a TEMP table, ** build the sqlite_master entry */ - if( !pParse->initFlag ){ + if( !db->init.busy ){ static VdbeOp insertTrig[] = { { OP_NewRecno, 0, 0, 0 }, { OP_String, 0, 0, "trigger" }, |