MonetDB: default - fixed drop trigger code

[Niels Nes]

Changeset: 6bd5cf294d4e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bd5cf294d4e
Modified Files:
        sql/server/rel_psm.c
        sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
Branch: default
Log Message:

fixed drop trigger code


diffs (42 lines):

diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1080,6 +1080,10 @@ create_trigger(mvc *sql, dlist *qname, i
        
        if (!sname)
                sname = ss->base.name;
+
+       if (sname && !(ss = mvc_bind_schema(sql, sname)))
+               return sql_error(sql, 02, "3F000!CREATE TRIGGER: no such schema 
'%s'", sname);
+
        if (opt_ref) {
                dnode *dl = opt_ref->h;
                for ( ; dl; dl = dl->next) {
@@ -1173,9 +1177,16 @@ rel_drop_trigger(mvc *sql, const char *s
 static sql_rel *
 drop_trigger(mvc *sql, dlist *qname)
 {
+       const char *sname = qname_schema(qname);
        const char *tname = qname_table(qname);
        sql_schema *ss = cur_schema(sql);
 
+       if (!sname)
+               sname = ss->base.name;
+
+       if (sname && !(ss = mvc_bind_schema(sql, sname)))
+               return sql_error(sql, 02, "3F000!DROP TRIGGER: no such schema 
'%s'", sname);
+
        if (!mvc_schema_privs(sql, ss)) 
                return sql_error(sql, 02, "DROP TRIGGER: access denied for %s 
to schema ;'%s'", stack_get_string(sql, "current_user"), ss->base.name);
        return rel_drop_trigger(sql, ss->base.name, tname);
diff --git a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql 
b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
--- a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
+++ b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
@@ -6,6 +6,7 @@ BEGIN ATOMIC
 -- select * from marketdata.quotes limit 1;
 END;
 --syntax error, unexpected '.', expecting WHILE in: "create trigger 
marketdata.calc_sdate before insert on marketdata."
+drop trigger marketdata.calc_sdate;
 drop table marketdata.quotes;
 drop schema marketdata;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list