Changeset: 0e5f36ae5a0b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e5f36ae5a0b Modified Files: sql/test/Tests/create-or-replace-triggers.sql sql/test/Tests/create-or-replace-triggers.stable.err sql/test/Tests/create-or-replace-views.sql sql/test/Tests/create-or-replace-views.stable.err sql/test/Tests/truncate-statements-extra.sql sql/test/Tests/truncate-statements-extra.stable.err sql/test/Tests/truncate-statements.sql Branch: sqlextra Log Message:
Just drop the database objects at the end of the test diffs (107 lines): diff --git a/sql/test/Tests/create-or-replace-triggers.sql b/sql/test/Tests/create-or-replace-triggers.sql --- a/sql/test/Tests/create-or-replace-triggers.sql +++ b/sql/test/Tests/create-or-replace-triggers.sql @@ -14,3 +14,7 @@ INSERT INTO testing7 values (1); SELECT abc FROM testing8; --the previous row plus 2 CREATE OR REPLACE TRIGGER failedtrigger AFTER INSERT ON testing3 FOR EACH STATEMENT BEGIN ATOMIC INSERT INTO testing8 VALUES (3); END; --error + +DROP TRIGGER nanani; +DROP TABLE testing7; +DROP TABLE testing8; diff --git a/sql/test/Tests/create-or-replace-triggers.stable.err b/sql/test/Tests/create-or-replace-triggers.stable.err --- a/sql/test/Tests/create-or-replace-triggers.stable.err +++ b/sql/test/Tests/create-or-replace-triggers.stable.err @@ -32,8 +32,7 @@ MAPI = (monetdb) /var/tmp/mtest-15975/. QUERY = CREATE OR REPLACE TRIGGER failedtrigger AFTER INSERT ON testing3 FOR EACH STATEMENT BEGIN ATOMIC INSERT INTO testing8 VALUES (3); END; --error +# 12:24:46 > +# 12:24:46 > "Done." +# 12:24:46 > -# 09:43:34 > -# 09:43:34 > "Done." -# 09:43:34 > - diff --git a/sql/test/Tests/create-or-replace-views.sql b/sql/test/Tests/create-or-replace-views.sql --- a/sql/test/Tests/create-or-replace-views.sql +++ b/sql/test/Tests/create-or-replace-views.sql @@ -11,3 +11,6 @@ CREATE OR REPLACE VIEW viewtest AS SELEC SELECT a1, b2 FROM viewtest; CREATE OR REPLACE VIEW failureview AS SELECT b2 FROM testingnothing WHERE b2 = 'two'; --error + +DROP VIEW viewtest; +DROP TABLE testing9; diff --git a/sql/test/Tests/create-or-replace-views.stable.err b/sql/test/Tests/create-or-replace-views.stable.err --- a/sql/test/Tests/create-or-replace-views.stable.err +++ b/sql/test/Tests/create-or-replace-views.stable.err @@ -33,6 +33,8 @@ QUERY = CREATE OR REPLACE VIEW failurevi + + # 09:44:21 > # 09:44:21 > "Done." # 09:44:21 > diff --git a/sql/test/Tests/truncate-statements-extra.sql b/sql/test/Tests/truncate-statements-extra.sql --- a/sql/test/Tests/truncate-statements-extra.sql +++ b/sql/test/Tests/truncate-statements-extra.sql @@ -39,3 +39,7 @@ TRUNCATE testing6 RESTART IDENTITY; INSERT INTO testing6 (b) VALUES (7); INSERT INTO testing6 (b) VALUES (8); SELECT a, b FROM testing6; + +DROP TABLE testing5; +DROP TABLE testing4; +DROP TABLE testing6; diff --git a/sql/test/Tests/truncate-statements-extra.stable.err b/sql/test/Tests/truncate-statements-extra.stable.err --- a/sql/test/Tests/truncate-statements-extra.stable.err +++ b/sql/test/Tests/truncate-statements-extra.stable.err @@ -31,11 +31,12 @@ stderr of test 'truncate-statements-extr MAPI = (monetdb) /var/tmp/mtest-16076/.s.monetdb.38199 QUERY = TRUNCATE testing4; --error -MAPI = (monetdb) /var/tmp/mtest-16310/.s.monetdb.39206 +MAPI = (monetdb) /var/tmp/mtest-16638/.s.monetdb.32365 QUERY = TRUNCATE testing4 RESTRICT; --error + # 12:16:00 > # 12:16:00 > "Done." # 12:16:00 > diff --git a/sql/test/Tests/truncate-statements.sql b/sql/test/Tests/truncate-statements.sql --- a/sql/test/Tests/truncate-statements.sql +++ b/sql/test/Tests/truncate-statements.sql @@ -4,16 +4,16 @@ TRUNCATE testing; CREATE TABLE testing2 (abc INT); -CREATE TRIGGER nanani AFTER TRUNCATE ON testing FOR EACH STATEMENT BEGIN ATOMIC INSERT INTO testing2 VALUES (1); END; +CREATE TRIGGER nanani2 AFTER TRUNCATE ON testing FOR EACH STATEMENT BEGIN ATOMIC INSERT INTO testing2 VALUES (1); END; INSERT INTO testing VALUES (2), (3); TRUNCATE testing; SELECT COUNT(*) FROM testing2; --there should be 1 row -DROP TRIGGER nanani; +DROP TRIGGER nanani2; TRUNCATE testing2; -CREATE TRIGGER nanani AFTER DELETE ON testing FOR EACH STATEMENT BEGIN ATOMIC INSERT INTO testing2 VALUES (2); END; +CREATE TRIGGER nanani2 AFTER DELETE ON testing FOR EACH STATEMENT BEGIN ATOMIC INSERT INTO testing2 VALUES (2); END; INSERT INTO testing VALUES (4); TRUNCATE testing; @@ -21,3 +21,7 @@ INSERT INTO testing VALUES (5); DELETE FROM testing; SELECT COUNT(*) FROM testing2; --there should be 1 row + +DROP TRIGGER nanani2; +DROP TABLE testing; +DROP TABLE testing2; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
