Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19940

Modified Files:
      Tag: SQL_2-18
        sql_semantic.mx 
Log Message:
Remove the control for cascade triggers. The recursive triggers are user 
responsability and not ours.



Index: sql_semantic.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_semantic.mx,v
retrieving revision 1.167
retrieving revision 1.167.2.1
diff -u -d -r1.167 -r1.167.2.1
--- sql_semantic.mx     16 May 2007 20:49:16 -0000      1.167
+++ sql_semantic.mx     8 Jun 2007 11:56:32 -0000       1.167.2.1
@@ -1030,13 +1030,8 @@
 semantic(mvc *sql, scope *scp, symbol *s)
 {
        stmt *res = NULL;
-       int start = 0;
        if (!s)
                return NULL;
-       if( !sql->called_triggers) {
-               sql->called_triggers = list_create((fdestroy) GDKfree);
-               start = 1;
-       }
 
        switch (s->token) {
 
@@ -1127,25 +1122,16 @@
                        char *name = qname_table(dn->data.lval);
 
                        if (frame_find_var(sql, name)) {
-                               if (start) {
-                                       list_destroy(sql->called_triggers);
-                                       sql->called_triggers = NULL;
-                               }
                                return sql_error(sql, 01, "Variable '%s' 
allready declared", name);
                        }
                        st = semantic(sql, scp, sym);
                        if (!st) { 
-                               if (start) {
-                                       list_destroy(sql->called_triggers);
-                                       sql->called_triggers = NULL;
-                               }
                                return NULL;
                        }
                        stack_push_view(sql, name, st);
                }
-               st = semantic(sql, scp, select);
+               res = semantic(sql, scp, select);
                stack_pop_frame(sql);
-               res = st;
                break;
        }
 
@@ -1161,10 +1147,6 @@
 
                        if (!st) {
                                list_destroy(l);
-                               if (start) {
-                                       list_destroy(sql->called_triggers);
-                                       sql->called_triggers = NULL;
-                               }
                                return NULL;
                        }
                        list_append(l, st);
@@ -1176,12 +1158,6 @@
        default:
                res = sql_error(sql, 01, "sql_stmt symbol(%ld)->token = %s", 
(long) s, token2string(s->token));
        }
-
-       if (start) {
-               list_destroy(sql->called_triggers);
-               sql->called_triggers = NULL;
-       }
-
        return res;
 }
 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to