Add support for TEMPORARY triggers. Such triggers can write temporary or

permanent tables. (CVS 926)

FossilOrigin-Name: 58ddd587b0f5d565ae3b0ba3a1fa5c20d459f3fc

5 files changed, 116 insertions, 81 deletions

diff --git a/src/build.c b/src/build.c
index b327ec1e9..730d78269 100644
--- a/src/build.c
+++ b/src/build.c
@@ -23,7 +23,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.147 2003/04/20 00:00:24 drh Exp $
+** $Id: build.c,v 1.148 2003/04/21 18:48:46 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -159,6 +159,10 @@ Table *sqliteLocateTable(Parse *pParse, const char *zName, const char *zDbase){
   if( p==0 ){
     if( zDbase ){
       sqliteErrorMsg(pParse, "no such table: %s.%s", zDbase, zName);
+    }else if( (pParse->useDb==0 || pParse->useDb>=2) 
+               && sqliteFindTable(db, zName, 0)!=0 ){
+      sqliteErrorMsg(pParse, "table \"%s\" is not in database \"%s\"",
+         zName, zUse);
     }else{
       sqliteErrorMsg(pParse, "no such table: %s", zName);
     }
diff --git a/src/parse.y b/src/parse.y
index c3e14fa68..dfb051013 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.95 2003/04/17 22:57:54 drh Exp $
+** @(#) $Id: parse.y,v 1.96 2003/04/21 18:48:46 drh Exp $
 */
 %token_prefix TK_
 %token_type {Token}
@@ -759,15 +759,18 @@ plus_opt ::= PLUS.
 plus_opt ::= .
 
 //////////////////////////// The CREATE TRIGGER command /////////////////////
-cmd ::= CREATE(A) TRIGGER nm(B) trigger_time(C) trigger_event(D) 
-                  ON nm(E) dbnm(DB)
-                  foreach_clause(F) when_clause(G)
-                  BEGIN trigger_cmd_list(S) END(Z). {
-  SrcList *pTab = sqliteSrcListAppend(0, &E, &DB);
+
+cmd ::= CREATE(A) trigger_decl BEGIN trigger_cmd_list(S) END(Z). {
   Token all;
   all.z = A.z;
   all.n = (Z.z - A.z) + Z.n;
-  sqliteCreateTrigger(pParse, &B, C, D.a, D.b, pTab, F, G, S, &all);
+  sqliteFinishTrigger(pParse, S, &all);
+}
+
+trigger_decl ::= temp(T) TRIGGER nm(B) trigger_time(C) trigger_event(D)
+                 ON nm(E) dbnm(DB) foreach_clause(F) when_clause(G). {
+  SrcList *pTab = sqliteSrcListAppend(0, &E, &DB);
+  sqliteBeginTrigger(pParse, &B, C, D.a, D.b, pTab, F, G, T);
 }
 
 %type trigger_time  {int}
@@ -793,6 +796,7 @@ when_clause(A) ::= .             { A = 0; }
 when_clause(A) ::= WHEN expr(X). { A = X; }
 
 %type trigger_cmd_list {TriggerStep *}
+%destructor trigger_cmd_list {sqliteDeleteTriggerStep($$);}
 trigger_cmd_list(A) ::= trigger_cmd(X) SEMI trigger_cmd_list(Y). {
   X->pNext = Y;
   A = X;
@@ -800,6 +804,7 @@ trigger_cmd_list(A) ::= trigger_cmd(X) SEMI trigger_cmd_list(Y). {
 trigger_cmd_list(A) ::= . { A = 0; }
 
 %type trigger_cmd {TriggerStep *}
+%destructor trigger_cmd {sqliteDeleteTriggerStep($$);}
 // UPDATE 
 trigger_cmd(A) ::= UPDATE orconf(R) nm(X) SET setlist(Y) where_opt(Z).  
                { A = sqliteTriggerUpdateStep(&X, Y, Z, R); }
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 5d128c7d0..135523ada 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.176 2003/04/20 00:00:24 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.177 2003/04/21 18:48:47 drh Exp $
 */
 #include "config.h"
 #include "sqlite.h"
@@ -832,7 +832,8 @@ struct Parse {
   int nSet;            /* Number of sets used so far */
   int nAgg;            /* Number of aggregate expressions */
   AggExpr *aAgg;       /* An array of aggregate expressions */
-  TriggerStack *trigStack;
+  Trigger *pNewTrigger;     /* Trigger under construct by a CREATE TRIGGER */
+  TriggerStack *trigStack;  /* Trigger actions being coded */
 };
 
 /*
@@ -853,9 +854,9 @@ struct Parse {
 struct Trigger {
   char *name;             /* The name of the trigger                        */
   char *table;            /* The table or view to which the trigger applies */
-  int iDb;                /* Database containing this trigger               */
-  int op;                 /* One of TK_DELETE, TK_UPDATE, TK_INSERT         */
-  int tr_tm;              /* One of TK_BEFORE, TK_AFTER */
+  u8 iDb;                 /* Database containing this trigger               */
+  u8 op;                  /* One of TK_DELETE, TK_UPDATE, TK_INSERT         */
+  u8 tr_tm;               /* One of TK_BEFORE, TK_AFTER */
   Expr *pWhen;            /* The WHEN clause of the expresion (may be NULL) */
   IdList *pColumns;       /* If this is an UPDATE OF <column-list> trigger,
                              the <column-list> is stored here */
@@ -1094,13 +1095,14 @@ int sqliteSafetyOn(sqlite*);
 int sqliteSafetyOff(sqlite*);
 int sqliteSafetyCheck(sqlite*);
 void sqliteChangeCookie(sqlite*, Vdbe*);
-void sqliteCreateTrigger(Parse*, Token*, int, int, IdList*, SrcList*, 
-                         int, Expr*, TriggerStep*, Token*);
+void sqliteBeginTrigger(Parse*, Token*,int,int,IdList*,SrcList*,int,Expr*,int);
+void sqliteFinishTrigger(Parse*, TriggerStep*, Token*);
 void sqliteDropTrigger(Parse*, SrcList*, int);
 int sqliteTriggersExist(Parse* , Trigger* , int , int , int, ExprList*);
 int sqliteCodeRowTrigger(Parse*, int, ExprList*, int, Table *, int, int, 
                          int, int);
 void sqliteViewTriggers(Parse*, Table*, Expr*, int, ExprList*);
+void sqliteDeleteTriggerStep(TriggerStep*);
 TriggerStep *sqliteTriggerSelectStep(Select*);
 TriggerStep *sqliteTriggerInsertStep(Token*, IdList*, ExprList*, Select*, int);
 TriggerStep *sqliteTriggerUpdateStep(Token*, ExprList*, Expr*, int);
diff --git a/src/tokenize.c b/src/tokenize.c
index 66b8829f1..290c84a2a 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.57 2003/04/16 02:17:36 drh Exp $
+** $Id: tokenize.c,v 1.58 2003/04/21 18:48:47 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -487,6 +487,10 @@ abort_parse:
     sqliteDeleteTable(pParse->db, pParse->pNewTable);
     pParse->pNewTable = 0;
   }
+  if( pParse->pNewTrigger ){
+    sqliteDeleteTrigger(pParse->pNewTrigger);
+    pParse->pNewTrigger = 0;
+  }
   if( nErr>0 && (pParse->rc==SQLITE_OK || pParse->rc==SQLITE_DONE) ){
     pParse->rc = SQLITE_ERROR;
   }
diff --git a/src/trigger.c b/src/trigger.c
index ca6dfa618..7124add96 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -15,7 +15,7 @@
 /*
 ** Delete a linked list of TriggerStep structures.
 */
-static void sqliteDeleteTriggerStep(TriggerStep *pTriggerStep){
+void sqliteDeleteTriggerStep(TriggerStep *pTriggerStep){
   while( pTriggerStep ){
     TriggerStep * pTmp = pTriggerStep;
     pTriggerStep = pTriggerStep->pNext;
@@ -31,11 +31,14 @@ static void sqliteDeleteTriggerStep(TriggerStep *pTriggerStep){
 }
 
 /*
-** This is called by the parser when it sees a CREATE TRIGGER statement. See
-** comments surrounding struct Trigger in sqliteInt.h for a description of 
-** how triggers are stored.
+** This is called by the parser when it sees a CREATE TRIGGER statement
+** up to the point of the BEGIN before the trigger actions.  A Trigger
+** structure is generated based on the information available and stored
+** in pParse->pNewTrigger.  After the trigger actions have been parsed, the
+** sqliteFinishTrigger() function is called to complete the trigger
+** construction process.
 */
-void sqliteCreateTrigger(
+void sqliteBeginTrigger(
   Parse *pParse,      /* The parse context of the CREATE TRIGGER statement */
   Token *pName,       /* The name of the trigger */
   int tr_tm,          /* One of TK_BEFORE, TK_AFTER , TK_INSTEAD */
@@ -44,17 +47,17 @@ void sqliteCreateTrigger(
   SrcList *pTableName,/* The name of the table/view the trigger applies to */
   int foreach,        /* One of TK_ROW or TK_STATEMENT */
   Expr *pWhen,        /* WHEN clause */
-  TriggerStep *pStepList, /* The triggered program */
-  Token *pAll             /* Token that describes the complete CREATE TRIGGER */
+  int isTemp          /* True if the TEMPORARY keyword is present */
 ){
   Trigger *nt;
   Table   *tab;
-  char *zName = 0;    /* Name of the trigger */
+  char *zName = 0;        /* Name of the trigger */
   sqlite *db = pParse->db;
+  int iDb;                /* When database to store the trigger in */
 
   /* Check that: 
   ** 1. the trigger name does not already exist.
-  ** 2. the table (or view) does exist.
+  ** 2. the table (or view) does exist in the same database as the trigger.
   ** 3. that we are not trying to create a trigger on the sqlite_master table
   ** 4. That we are not trying to create an INSTEAD OF trigger on a table.
   ** 5. That we are not trying to create a BEFORE or AFTER trigger on a view.
@@ -65,14 +68,15 @@ void sqliteCreateTrigger(
   if( !tab ){
     goto trigger_cleanup;
   }
-  if( tab->iDb>=2 && !pParse->initFlag ){
+  iDb = isTemp ? 1 : tab->iDb;
+  if( iDb>=2 && !pParse->initFlag ){
     sqliteErrorMsg(pParse, "triggers may not be added to auxiliary "
        "database %s", db->aDb[tab->iDb].zName);
     goto trigger_cleanup;
   }
 
   zName = sqliteStrNDup(pName->z, pName->n);
-  if( sqliteHashFind(&(db->aDb[tab->iDb].trigHash), zName,pName->n+1) ){
+  if( sqliteHashFind(&(db->aDb[iDb].trigHash), zName,pName->n+1) ){
     sqliteErrorMsg(pParse, "trigger %T already exists", pName);
     goto trigger_cleanup;
   }
@@ -94,7 +98,7 @@ void sqliteCreateTrigger(
 #ifndef SQLITE_OMIT_AUTHORIZATION
   {
     int code = SQLITE_CREATE_TRIGGER;
-    if( tab->iDb==1 ) code = SQLITE_CREATE_TEMP_TRIGGER;
+    if( tab->iDb==1 || isTemp ) code = SQLITE_CREATE_TEMP_TRIGGER;
     if( sqliteAuthCheck(pParse, code, zName, tab->zName) ){
       goto trigger_cleanup;
     }
@@ -115,20 +119,42 @@ void sqliteCreateTrigger(
   zName = 0;
   nt->table = sqliteStrDup(pTableName->a[0].zName);
   if( sqlite_malloc_failed ) goto trigger_cleanup;
-  nt->iDb = tab->iDb;
+  nt->iDb = iDb;
   nt->op = op;
   nt->tr_tm = tr_tm;
   nt->pWhen = sqliteExprDup(pWhen);
-  sqliteExprDelete(pWhen);
   nt->pColumns = sqliteIdListDup(pColumns);
-  sqliteIdListDelete(pColumns);
   nt->foreach = foreach;
+  assert( pParse->pNewTrigger==0 );
+  pParse->pNewTrigger = nt;
+
+trigger_cleanup:
+  sqliteFree(zName);
+  sqliteSrcListDelete(pTableName);
+  sqliteIdListDelete(pColumns);
+  sqliteExprDelete(pWhen);
+}
+
+/*
+** This routine is called after all of the trigger actions have been parsed
+** in order to complete the process of building the trigger.
+*/
+void sqliteFinishTrigger(
+  Parse *pParse,          /* Parser context */
+  TriggerStep *pStepList, /* The triggered program */
+  Token *pAll             /* Token that describes the complete CREATE TRIGGER */
+){
+  Trigger *nt;              /* The trigger whose construction is finishing up */
+  sqlite *db = pParse->db;  /* The database */
+
+  if( pParse->nErr || pParse->pNewTrigger==0 ) goto triggerfinish_cleanup;
+  nt = pParse->pNewTrigger;
+  pParse->pNewTrigger = 0;
   nt->step_list = pStepList;
   while( pStepList ){
     pStepList->pTrig = nt;
     pStepList = pStepList->pNext;
   }
-  pStepList = nt->step_list;
 
   /* if we are not initializing, and this trigger is not on a TEMP table, 
   ** build the sqlite_master entry
@@ -149,16 +175,14 @@ void sqliteCreateTrigger(
 
     /* Make an entry in the sqlite_master table */
     v = sqliteGetVdbe(pParse);
-    if( v==0 ) goto trigger_cleanup;
+    if( v==0 ) goto triggerfinish_cleanup;
     sqliteBeginWriteOperation(pParse, 0, 0);
-    sqliteOpenMasterTable(v, tab->iDb);
+    sqliteOpenMasterTable(v, nt->iDb==1);
     addr = sqliteVdbeAddOpList(v, ArraySize(insertTrig), insertTrig);
-    sqliteVdbeChangeP3(v, addr, tab->iDb ? TEMP_MASTER_NAME : MASTER_NAME,
-                       P3_STATIC);
     sqliteVdbeChangeP3(v, addr+2, nt->name, 0); 
     sqliteVdbeChangeP3(v, addr+3, nt->table, 0); 
     sqliteVdbeChangeP3(v, addr+5, pAll->z, pAll->n);
-    if( tab->iDb==0 ){
+    if( nt->iDb==0 ){
       sqliteChangeCookie(db, v);
     }
     sqliteVdbeAddOp(v, OP_Close, 0, 0);
@@ -166,26 +190,20 @@ void sqliteCreateTrigger(
   }
 
   if( !pParse->explain ){
-    /* Stick it in the hash-table */
-    sqliteHashInsert(&(db->aDb[nt->iDb].trigHash), nt->name, pName->n + 1, nt);
-
-    /* Attach it to the table object */
-    nt->pNext = tab->pTrigger;
-    tab->pTrigger = nt;
-    sqliteSrcListDelete(pTableName);
-    return;
+    Table *pTab;
+    sqliteHashInsert(&db->aDb[nt->iDb].trigHash, 
+                     nt->name, strlen(nt->name)+1, nt);
+    pTab = sqliteLocateTable(pParse, nt->table, 0);
+    assert( pTab!=0 );
+    nt->pNext = pTab->pTrigger;
+    pTab->pTrigger = nt;
   }else{
-    sqliteFree(nt->name);
-    sqliteFree(nt->table);
-    sqliteFree(nt);
+    sqliteDeleteTrigger(nt);
   }
 
-trigger_cleanup:
-
-  sqliteFree(zName);
-  sqliteSrcListDelete(pTableName);
-  sqliteIdListDelete(pColumns);
-  sqliteExprDelete(pWhen);
+triggerfinish_cleanup:
+  sqliteDeleteTrigger(pParse->pNewTrigger);
+  pParse->pNewTrigger = 0;
   sqliteDeleteTriggerStep(pStepList);
 }
 
@@ -322,6 +340,7 @@ TriggerStep *sqliteTriggerDeleteStep(Token *pTableName, Expr *pWhere){
 ** Recursively delete a Trigger structure
 */
 void sqliteDeleteTrigger(Trigger *pTrigger){
+  if( pTrigger==0 ) return;
   sqliteDeleteTriggerStep(pTrigger->step_list);
   sqliteFree(pTrigger->name);
   sqliteFree(pTrigger->table);
@@ -366,7 +385,7 @@ void sqliteDropTrigger(Parse *pParse, SrcList *pName, int nested){
     sqliteErrorMsg(pParse, "no such trigger: %S", pName, 0);
     goto drop_trigger_cleanup;
   }
-  assert( pTrigger->iDb>=0 && pTrigger->iDb<db->nDb );
+  assert( pTrigger->iDb<db->nDb );
   if( pTrigger->iDb>=2 ){
     sqliteErrorMsg(pParse, "triggers may not be removed from "
        "auxiliary database %s", db->aDb[pTrigger->iDb].zName);
@@ -374,39 +393,18 @@ void sqliteDropTrigger(Parse *pParse, SrcList *pName, int nested){
   }
   pTable = sqliteFindTable(db, pTrigger->table, db->aDb[pTrigger->iDb].zName);
   assert(pTable);
-  assert( pTable->iDb==pTrigger->iDb );
+  assert( pTable->iDb==pTrigger->iDb || pTrigger->iDb==1 );
 #ifndef SQLITE_OMIT_AUTHORIZATION
   {
     int code = SQLITE_DROP_TRIGGER;
-    if( pTable->iDb ) code = SQLITE_DROP_TEMP_TRIGGER;
+    if( pTrigger->iDb ) code = SQLITE_DROP_TEMP_TRIGGER;
     if( sqliteAuthCheck(pParse, code, pTrigger->name, pTable->zName) ||
-      sqliteAuthCheck(pParse, SQLITE_DELETE, SCHEMA_TABLE(pTable->iDb),0) ){
+      sqliteAuthCheck(pParse, SQLITE_DELETE, SCHEMA_TABLE(pTrigger->iDb),0) ){
       goto drop_trigger_cleanup;
     }
   }
 #endif
 
-  /*
-   * If this is not an "explain", then delete the trigger structure.
-   */
-  if( !pParse->explain ){
-    if( pTable->pTrigger == pTrigger ){
-      pTable->pTrigger = pTrigger->pNext;
-    }else{
-      Trigger *cc = pTable->pTrigger;
-      while( cc ){ 
-        if( cc->pNext == pTrigger ){
-          cc->pNext = cc->pNext->pNext;
-          break;
-        }
-        cc = cc->pNext;
-      }
-      assert(cc);
-    }
-    sqliteHashInsert(&(db->aDb[pTrigger->iDb].trigHash), zName, nName+1, 0);
-    sqliteDeleteTrigger(pTrigger);
-  }
-
   /* Generate code to destroy the database record of the trigger.
   */
   if( pTable!=0 && !nested && (v = sqliteGetVdbe(pParse))!=0 ){
@@ -423,16 +421,37 @@ void sqliteDropTrigger(Parse *pParse, SrcList *pName, int nested){
     };
 
     sqliteBeginWriteOperation(pParse, 0, 0);
-    sqliteOpenMasterTable(v, pTable->iDb);
+    sqliteOpenMasterTable(v, pTrigger->iDb);
     base = sqliteVdbeAddOpList(v,  ArraySize(dropTrigger), dropTrigger);
     sqliteVdbeChangeP3(v, base+1, zName, 0);
-    if( pTable->iDb==0 ){
+    if( pTrigger->iDb==0 ){
       sqliteChangeCookie(db, v);
     }
     sqliteVdbeAddOp(v, OP_Close, 0, 0);
     sqliteEndWriteOperation(pParse);
   }
 
+  /*
+   * If this is not an "explain", then delete the trigger structure.
+   */
+  if( !pParse->explain ){
+    if( pTable->pTrigger == pTrigger ){
+      pTable->pTrigger = pTrigger->pNext;
+    }else{
+      Trigger *cc = pTable->pTrigger;
+      while( cc ){ 
+        if( cc->pNext == pTrigger ){
+          cc->pNext = cc->pNext->pNext;
+          break;
+        }
+        cc = cc->pNext;
+      }
+      assert(cc);
+    }
+    sqliteHashInsert(&(db->aDb[pTrigger->iDb].trigHash), zName, nName+1, 0);
+    sqliteDeleteTrigger(pTrigger);
+  }
+
 drop_trigger_cleanup:
   sqliteSrcListDelete(pName);
 }
@@ -521,6 +540,7 @@ static int codeTriggerProgram(
     orconf = (orconfin == OE_Default)?pTriggerStep->orconf:orconfin;
     pParse->trigStack->orconf = orconf;
     pParse->useDb = pTriggerStep->pTrig->iDb;
+    if( pParse->useDb==1 ) pParse->useDb = -1;
     switch( pTriggerStep->op ){
       case TK_SELECT: {
 	Select * ss = sqliteSelectDup(pTriggerStep->pSelect);