Changeset: fce09b61af65 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fce09b61af65
Modified Files:
sql/server/rel_dump.c
sql/server/rel_psm.c
sql/test/Triggers/Tests/All
sql/test/Triggers/Tests/trigger_action.stable.err
sql/test/Triggers/Tests/trigger_action.stable.out
Branch: linear-hashing
Log Message:
Merged with Nov2019
diffs (92 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -409,8 +409,12 @@ rel_print_(mvc *sql, stream *fout, sql_
if (rel->r)
exp_print(sql, fout, rel->r, depth, refs, 1, 0);
- if (rel->l)
- rel_print_(sql, fout, rel->l, depth+1, refs, decorate);
+ if (rel->l) {
+ if (rel->flag == 2)
+ mnstr_printf(fout, "rel_dump not yet
implemented for trigger input");
+ else
+ rel_print_(sql, fout, rel->l, depth+1, refs,
decorate);
+ }
if (rel->exps)
exps_print(sql, fout, rel->exps, depth, refs, 1, 0);
break;
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
@@ -1288,6 +1288,10 @@ create_trigger(sql_query *query, dlist *
rel = stack_find_rel_view(sql, new_name);
if (!rel && old_name)
rel = stack_find_rel_view(sql, old_name);
+ if (!rel)
+ rel = stack_find_rel_view(sql, "old");
+ if (!rel)
+ rel = stack_find_rel_view(sql, "new");
if (rel)
rel = rel_logical_exp(query, rel, condition, sql_where);
if (!rel) {
diff --git a/sql/test/Triggers/Tests/All b/sql/test/Triggers/Tests/All
--- a/sql/test/Triggers/Tests/All
+++ b/sql/test/Triggers/Tests/All
@@ -2,7 +2,7 @@ cascaded_triggers
recursive_triggers
referencing_clause_new
referencing_clause_old
-KNOWNFAIL?trigger_action
+trigger_action
trigger_activation
trigger_owner
triggers_schema_operations
diff --git a/sql/test/Triggers/Tests/trigger_action.stable.err
b/sql/test/Triggers/Tests/trigger_action.stable.err
--- a/sql/test/Triggers/Tests/trigger_action.stable.err
+++ b/sql/test/Triggers/Tests/trigger_action.stable.err
@@ -10,6 +10,10 @@ stderr of test 'trigger_action` in direc
# 21:20:08 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=37598 < trigger_action.sql
# 21:20:08 >
+MAPI = (monetdb) /var/tmp/mtest-358294/.s.monetdb.33867
+QUERY = update t_4_1 set "name" = 'mo' where "id" = 10;
+ERROR = !SELECT: identifier 'id' ambiguous
+CODE = 42000
# 21:20:08 >
# 21:20:08 > Done.
diff --git a/sql/test/Triggers/Tests/trigger_action.stable.out
b/sql/test/Triggers/Tests/trigger_action.stable.out
--- a/sql/test/Triggers/Tests/trigger_action.stable.out
+++ b/sql/test/Triggers/Tests/trigger_action.stable.out
@@ -55,24 +55,16 @@ stdout of test 'trigger_action` in direc
#create trigger test_4_8
# after update on t_4_1 referencing new row as new_row
# for each row
-# when new_row.id >1000 insert into t_4_1 values(7,
'update_when_row_false');
-#update t_4_1 set name = 'mo' where id = 10;
-[ 1 ]
+# when (new_row."id">1000) insert into t_4_1 values(7,
'update_when_row_false');
+#select * from t_4_1;
% sys.t_4_1, sys.t_4_1 # table_name
% id, name # name
% int, varchar # type
-% 2, 27 # length
-[ 10, "mo" ]
+% 2, 7 # length
+[ 10, "monetdb" ]
[ 20, "monet" ]
-[ 0, "update_old_row_statement" ]
-[ 1, "update_new_row_statement" ]
-[ 2, "update_statement" ]
-[ 3, "update_row" ]
-[ 4, "update_when_statement_true" ]
-[ 5, "update_when_row_true" ]
-[ 6, "update_when_statement_false" ]
-[ 7, "update_when_row_false" ]
-[ 10 ]
+#delete from t_4_1 where "id" >-1;
+[ 2 ]
#drop trigger test_4_1;
#drop trigger test_4_2;
#drop trigger test_4_3;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
