Changeset: 169c25b4c6f4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=169c25b4c6f4 Modified Files: sql/test/Triggers/Tests/cascaded_triggers.stable.out sql/test/Triggers/Tests/recursive_triggers.stable.err sql/test/Triggers/Tests/referencing_clause_new.stable.out sql/test/Triggers/Tests/referencing_clause_old.stable.out sql/test/Triggers/Tests/trigger_action.stable.out sql/test/Triggers/Tests/trigger_activation.stable.out sql/test/Triggers/Tests/trigger_insert.stable.out sql/test/Triggers/Tests/trigger_owner.stable.err sql/test/Triggers/Tests/triggers_schema_operations.stable.err sql/test/Triggers/Tests/triggers_schema_operations.stable.out sql/test/Triggers/cascaded_triggers.sql sql/test/Triggers/recursive_triggers.sql sql/test/Triggers/referencing_clause_new.sql sql/test/Triggers/referencing_clause_old.sql sql/test/Triggers/trigger_action.sql sql/test/Triggers/trigger_activation.sql sql/test/Triggers/trigger_insert.sql sql/test/Triggers/trigger_owner.sql sql/test/Triggers/trigger_owner_create.sql sql/test/Triggers/trigger_owner_drop.sql sql/test/Triggers/triggers_schema_operations.sql sql/test/rdf/Tests/All Branch: Dec2011 Log Message:
Trigger tests: use unique identifiers to avoid undesired dependencies among tests diffs (truncated from 2273 to 300 lines): diff --git a/sql/test/Triggers/Tests/cascaded_triggers.stable.out b/sql/test/Triggers/Tests/cascaded_triggers.stable.out --- a/sql/test/Triggers/Tests/cascaded_triggers.stable.out +++ b/sql/test/Triggers/Tests/cascaded_triggers.stable.out @@ -25,36 +25,36 @@ Ready. # 14:51:08 > [ 1 ] -% sys.t1, sys.t1, sys.t1 # table_name +% sys.t_0_1, sys.t_0_1, sys.t_0_1 # table_name % id, name, age # name % int, varchar, int # type % 1, 2, 2 # length [ 1, "mo", 25 ] -% sys.t2, sys.t2 # table_name +% sys.t_0_2, sys.t_0_2 # table_name % id, age # name % int, int # type % 1, 2 # length [ 1, 25 ] [ 1 ] -% sys.t1, sys.t1, sys.t1 # table_name +% sys.t_0_1, sys.t_0_1, sys.t_0_1 # table_name % id, name, age # name % int, varchar, int # type % 1, 2, 2 # length [ 3, "mo", 27 ] -% sys.t2, sys.t2 # table_name +% sys.t_0_2, sys.t_0_2 # table_name % id, age # name % int, int # type % 1, 2 # length [ 1, 25 ] [ 3, 27 ] [ 0 ] -% sys.t1, sys.t1, sys.t1 # table_name +% sys.t_0_1, sys.t_0_1, sys.t_0_1 # table_name % id, name, age # name % int, varchar, int # type % 1, 2, 2 # length [ 3, "mo", 27 ] [ 1, "mo", 25 ] -% sys.t2, sys.t2 # table_name +% sys.t_0_2, sys.t_0_2 # table_name % id, age # name % int, int # type % 1, 2 # length diff --git a/sql/test/Triggers/Tests/recursive_triggers.stable.err b/sql/test/Triggers/Tests/recursive_triggers.stable.err --- a/sql/test/Triggers/Tests/recursive_triggers.stable.err +++ b/sql/test/Triggers/Tests/recursive_triggers.stable.err @@ -11,22 +11,22 @@ stderr of test 'recursive_triggers` in d # 15:06:05 > MAPI = monetdb@sofia:38256 -QUERY = create trigger test_0 after insert on t1 - insert into t1 values(3, 'mo', 27); +QUERY = create trigger test_0 after insert on t_1_1 + insert into t_1_1 values(3, 'mo', 27); ERROR = !SELECT: too many nested operators MAPI = monetdb@sofia:38256 QUERY = drop trigger test_0; ERROR = !DROP TRIGGER: unknown trigger test_0 MAPI = monetdb@sofia:38256 -QUERY = create trigger test_1 after insert on t2 - insert into t1 values(3, 'mo', 27); +QUERY = create trigger test_1 after insert on t_1_2 + insert into t_1_1 values(3, 'mo', 27); ERROR = !SELECT: too many nested operators MAPI = monetdb@sofia:38256 QUERY = drop trigger test_1; ERROR = !DROP TRIGGER: unknown trigger test_1 MAPI = monetdb@sofia:38256 -QUERY = create trigger test_2 after delete on t2 - insert into t1 values(3, 'mo', 27); +QUERY = create trigger test_2 after delete on t_1_2 + insert into t_1_1 values(3, 'mo', 27); ERROR = !SELECT: too many nested operators MAPI = monetdb@sofia:38256 QUERY = drop trigger test_2; diff --git a/sql/test/Triggers/Tests/referencing_clause_new.stable.out b/sql/test/Triggers/Tests/referencing_clause_new.stable.out --- a/sql/test/Triggers/Tests/referencing_clause_new.stable.out +++ b/sql/test/Triggers/Tests/referencing_clause_new.stable.out @@ -20,34 +20,34 @@ Ready. # 16:00:56 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=35011 < referencing_clause_new.sql # 16:00:56 > -#create table t1 (id int, name varchar(1024)); -#create table t2 (id int, name varchar(1024)); -#insert into t1 values(10, 'monetdb'); +#create table t_2_1 (id int, name varchar(1024)); +#create table t_2_2 (id int, name varchar(1024)); +#insert into t_2_1 values(10, 'monetdb'); [ 1 ] -#insert into t1 values(20, 'monet'); +#insert into t_2_1 values(20, 'monet'); [ 1 ] -#create trigger test1 -# after update on t1 referencing new row as new_row -# for each row insert into t2 values(0, 'update_new_row'); -#create trigger test2 -# after update on t1 referencing new row new_row -# for each row insert into t2 values(1, 'update_new_row'); -#create trigger test3 -# after update on t1 referencing new as new_row -# for each row insert into t2 values(2, 'update_new_row'); -#create trigger test4 -# after update on t1 referencing new new_row -# for each row insert into t2 values(3, 'update_new_row'); -#update t1 set name = 'mo' where id = 10; +#create trigger test_2_1 +# after update on t_2_1 referencing new row as new_row +# for each row insert into t_2_2 values(0, 'update_new_row'); +#create trigger test_2_2 +# after update on t_2_1 referencing new row new_row +# for each row insert into t_2_2 values(1, 'update_new_row'); +#create trigger test_2_3 +# after update on t_2_1 referencing new as new_row +# for each row insert into t_2_2 values(2, 'update_new_row'); +#create trigger test_2_4 +# after update on t_2_1 referencing new new_row +# for each row insert into t_2_2 values(3, 'update_new_row'); +#update t_2_1 set name = 'mo' where id = 10; [ 1 ] -#select * from t1; -% sys.t1, sys.t1 # table_name +#select * from t_2_1; +% sys.t_2_1, sys.t_2_1 # table_name % id, name # name % int, varchar # type % 2, 5 # length [ 10, "mo" ] [ 20, "monet" ] -% sys.t2, sys.t2 # table_name +% sys.t_2_2, sys.t_2_2 # table_name % id, name # name % int, varchar # type % 1, 14 # length @@ -57,33 +57,33 @@ Ready. [ 3, "update_new_row" ] [ 2 ] [ 4 ] -#drop trigger test1; -#drop trigger test2; -#drop trigger test3; -#drop trigger test4; -#insert into t1 values(10, 'monetdb'); +#drop trigger test_2_1; +#drop trigger test_2_2; +#drop trigger test_2_3; +#drop trigger test_2_4; +#insert into t_2_1 values(10, 'monetdb'); [ 1 ] -#insert into t1 values(20, 'monet'); +#insert into t_2_1 values(20, 'monet'); [ 1 ] -#create trigger test1 -# after delete on t1 referencing new row as new_row -# for each row insert into t2 values(0, 'delete_new_row'); -#create trigger test2 -# after delete on t1 referencing new row new_row -# for each row insert into t2 values(1, 'delete_new_row'); -#create trigger test3 -# after delete on t1 referencing new as new_row -# for each row insert into t2 values(2, 'delete_new_row'); -#create trigger test4 -# after delete on t1 referencing new new_row -# for each row insert into t2 values(3, 'delete_new_row'); -#delete from t1 where id >-1; +#create trigger test_2_1 +# after delete on t_2_1 referencing new row as new_row +# for each row insert into t_2_2 values(0, 'delete_new_row'); +#create trigger test_2_2 +# after delete on t_2_1 referencing new row new_row +# for each row insert into t_2_2 values(1, 'delete_new_row'); +#create trigger test_2_3 +# after delete on t_2_1 referencing new as new_row +# for each row insert into t_2_2 values(2, 'delete_new_row'); +#create trigger test_2_4 +# after delete on t_2_1 referencing new new_row +# for each row insert into t_2_2 values(3, 'delete_new_row'); +#delete from t_2_1 where id >-1; [ 2 ] -% sys.t1, sys.t1 # table_name +% sys.t_2_1, sys.t_2_1 # table_name % id, name # name % int, varchar # type % 1, 0 # length -% sys.t2, sys.t2 # table_name +% sys.t_2_2, sys.t_2_2 # table_name % id, name # name % int, varchar # type % 1, 14 # length @@ -94,13 +94,13 @@ Ready. [ 4 ] [ 1 ] [ 1 ] -% sys.t1, sys.t1 # table_name +% sys.t_2_1, sys.t_2_1 # table_name % id, name # name % int, varchar # type % 2, 7 # length [ 10, "monetdb" ] [ 20, "monet" ] -% sys.t2, sys.t2 # table_name +% sys.t_2_2, sys.t_2_2 # table_name % id, name # name % int, varchar # type % 1, 14 # length @@ -110,39 +110,39 @@ Ready. [ 3, "insert_new_row" ] [ 2 ] [ 4 ] -#drop trigger test1; -#drop trigger test2; -#drop trigger test3; -#drop trigger test4; -#insert into t1 values(10, 'monetdb'); +#drop trigger test_2_1; +#drop trigger test_2_2; +#drop trigger test_2_3; +#drop trigger test_2_4; +#insert into t_2_1 values(10, 'monetdb'); [ 1 ] -#insert into t1 values(20, 'monet'); +#insert into t_2_1 values(20, 'monet'); [ 1 ] -#create trigger test1 -# after update on t1 referencing new row as new_row new table as new_table -# for each row insert into t2 values(0, 'insert_new_row_table'); -#create trigger test2 -# after update on t1 referencing new row new_row new row as new_row -# for each row insert into t2 values(1, 'insert_new_new_row'); -#create trigger test3 -# after update on t1 referencing new table as new_table new table as new_table -# for each row insert into t2 values(2, 'insert_new__new_table'); -#create trigger test4 -# after update on t1 referencing new row as new_row new table as new_table -# for each row insert into t2 values(3, 'insert_new_row_new_table'); -#create trigger test5 -# after update on t1 referencing new table as new_table new row as new_row -# for each row insert into t2 values(4, 'insert_new_table_new_row'); -#update t1 set name = 'mo' where id = 10; +#create trigger test_2_1 +# after update on t_2_1 referencing new row as new_row new table as new_table +# for each row insert into t_2_2 values(0, 'insert_new_row_table'); +#create trigger test_2_2 +# after update on t_2_1 referencing new row new_row new row as new_row +# for each row insert into t_2_2 values(1, 'insert_new_new_row'); +#create trigger test_2_3 +# after update on t_2_1 referencing new table as new_table new table as new_table +# for each row insert into t_2_2 values(2, 'insert_new__new_table'); +#create trigger test_2_4 +# after update on t_2_1 referencing new row as new_row new table as new_table +# for each row insert into t_2_2 values(3, 'insert_new_row_new_table'); +#create trigger test_2_5 +# after update on t_2_1 referencing new table as new_table new row as new_row +# for each row insert into t_2_2 values(4, 'insert_new_table_new_row'); +#update t_2_1 set name = 'mo' where id = 10; [ 1 ] -#select * from t1; -% sys.t1, sys.t1 # table_name +#select * from t_2_1; +% sys.t_2_1, sys.t_2_1 # table_name % id, name # name % int, varchar # type % 2, 5 # length [ 10, "mo" ] [ 20, "monet" ] -% sys.t2, sys.t2 # table_name +% sys.t_2_2, sys.t_2_2 # table_name % id, name # name % int, varchar # type % 1, 24 # length @@ -153,51 +153,51 @@ Ready. [ 4, "insert_new_table_new_row" ] [ 2 ] [ 5 ] -#drop trigger test1; -#drop trigger test2; -#drop trigger test3; -#drop trigger test4; -#drop trigger test5; -#insert into t1 values(10, 'monetdb'); +#drop trigger test_2_1; +#drop trigger test_2_2; +#drop trigger test_2_3; +#drop trigger test_2_4; +#drop trigger test_2_5; +#insert into t_2_1 values(10, 'monetdb'); [ 1 ] -#create trigger test1 -# after update on t1 referencing new row as new_row new table as new_table -# for each row insert into t2 values(0, 'update_new_row_new_table'); -#create trigger test2 -# after insert on t1 referencing new row new_row new row as new_row -# for each row insert into t2 values(1, 'insert_new_new_row'); -#create trigger test3 -# after delete on t1 referencing new row new_row new row as new_row -# for each row insert into t2 values(2, 'delete_new_new_row'); -#create trigger test4 -# after delete on t1 referencing new row as new_row new table as new_table _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
