Changeset: 382531d22dd7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=382531d22dd7
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-triggers.stable.out
sql/test/Tests/create-or-replace-views.sql
sql/test/Tests/create-or-replace-views.stable.err
sql/test/Tests/create-or-replace-views.stable.out
sql/test/Tests/truncate-statements-extra.sql
sql/test/Tests/truncate-statements-extra.stable.err
sql/test/Tests/truncate-statements-extra.stable.out
Branch: sqlextra
Log Message:
Using different table names for different tests
diffs (truncated from 347 to 300 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
@@ -1,16 +1,16 @@
-CREATE TABLE testing (ab INT);
-CREATE TABLE testing2 (abc INT);
-
-CREATE TRIGGER nanani AFTER INSERT ON testing FOR EACH STATEMENT BEGIN ATOMIC
INSERT INTO testing2 VALUES (1); END;
-
-INSERT INTO testing values (1);
+CREATE TABLE testing7 (ab INT);
+CREATE TABLE testing8 (abc INT);
-SELECT abc FROM testing2; --should get a single row with value 1
-
-CREATE OR REPLACE TRIGGER nanani AFTER INSERT ON testing FOR EACH STATEMENT
BEGIN ATOMIC INSERT INTO testing2 VALUES (2); END;
+CREATE TRIGGER nanani AFTER INSERT ON testing7 FOR EACH STATEMENT BEGIN ATOMIC
INSERT INTO testing8 VALUES (1); END;
-INSERT INTO testing values (1);
+INSERT INTO testing7 values (1);
-SELECT abc FROM testing2; --the previous row plus 2
+SELECT abc FROM testing8; --should get a single row with value 1
-CREATE OR REPLACE TRIGGER failedtrigger AFTER INSERT ON testing3 FOR EACH
STATEMENT BEGIN ATOMIC INSERT INTO testing2 VALUES (3); END; --error
+CREATE OR REPLACE TRIGGER nanani AFTER INSERT ON testing7 FOR EACH STATEMENT
BEGIN ATOMIC INSERT INTO testing8 VALUES (2); END;
+
+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
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
@@ -28,8 +28,9 @@ stderr of test 'create-or-replace-trigge
# 09:43:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7671" "--port=35381"
# 09:43:33 >
-MAPI = (monetdb) /var/tmp/mtest-7671/.s.monetdb.35381
-QUERY = CREATE OR REPLACE TRIGGER failedtrigger AFTER INSERT ON testing3 FOR
EACH STATEMENT BEGIN ATOMIC INSERT INTO testing2 VALUES (3); END; --error
+MAPI = (monetdb) /var/tmp/mtest-15975/.s.monetdb.38017
+QUERY = CREATE OR REPLACE TRIGGER failedtrigger AFTER INSERT ON testing3 FOR
EACH STATEMENT BEGIN ATOMIC INSERT INTO testing8 VALUES (3); END; --error
+
# 09:43:34 >
diff --git a/sql/test/Tests/create-or-replace-triggers.stable.out
b/sql/test/Tests/create-or-replace-triggers.stable.out
--- a/sql/test/Tests/create-or-replace-triggers.stable.out
+++ b/sql/test/Tests/create-or-replace-triggers.stable.out
@@ -69,8 +69,8 @@ Ready.
#CREATE TRIGGER nanani AFTER INSERT ON testing FOR EACH STATEMENT BEGIN ATOMIC
INSERT INTO testing2 VALUES (1); END;
#INSERT INTO testing values (1);
[ 1 ]
-#SELECT abc FROM testing2; --should get a single row with value 1
-% sys.testing2 # table_name
+#SELECT abc FROM testing8; --should get a single row with value 1
+% sys.testing8 # table_name
% abc # name
% int # type
% 1 # length
@@ -78,8 +78,8 @@ Ready.
#CREATE OR REPLACE TRIGGER nanani AFTER INSERT ON testing FOR EACH STATEMENT
BEGIN ATOMIC INSERT INTO testing2 VALUES (2); END;
#INSERT INTO testing values (1);
[ 1 ]
-#SELECT abc FROM testing2; --the previous row plus 2
-% sys.testing2 # table_name
+#SELECT abc FROM testing8; --the previous row plus 2
+% sys.testing8 # table_name
% abc # name
% int # type
% 1 # length
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
@@ -1,13 +1,13 @@
-CREATE TABLE testing (a1 int, b2 text);
-
-CREATE VIEW viet AS SELECT a1, b2 FROM testing WHERE a1 = 1;
-
-INSERT INTO testing VALUES (1, 'one'), (2, 'two');
+CREATE TABLE testing9 (a1 int, b2 text);
-SELECT a1, b2 FROM viet;
+CREATE VIEW viewtest AS SELECT a1, b2 FROM testing9 WHERE a1 = 1;
-CREATE OR REPLACE VIEW viet AS SELECT a1, b2 FROM testing WHERE b2 = 'two';
+INSERT INTO testing9 VALUES (1, 'one'), (2, 'two');
-SELECT a1, b2 FROM viet;
+SELECT a1, b2 FROM viewtest;
-CREATE OR REPLACE VIEW failureview AS SELECT b2 FROM testing2 WHERE b2 =
'two'; --error
+CREATE OR REPLACE VIEW viewtest AS SELECT a1, b2 FROM testing9 WHERE b2 =
'two';
+
+SELECT a1, b2 FROM viewtest;
+
+CREATE OR REPLACE VIEW failureview AS SELECT b2 FROM testingnothing WHERE b2 =
'two'; --error
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
@@ -28,8 +28,9 @@ stderr of test 'create-or-replace-views`
# 09:44:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7857" "--port=30539"
# 09:44:20 >
-MAPI = (monetdb) /var/tmp/mtest-7857/.s.monetdb.30539
-QUERY = CREATE OR REPLACE VIEW failureview AS SELECT b2 FROM testing2 WHERE b2
= 'two'; --error
+MAPI = (monetdb) /var/tmp/mtest-15815/.s.monetdb.39325
+QUERY = CREATE OR REPLACE VIEW failureview AS SELECT b2 FROM testingnothing
WHERE b2 = 'two'; --error
+
# 09:44:21 >
diff --git a/sql/test/Tests/create-or-replace-views.stable.out
b/sql/test/Tests/create-or-replace-views.stable.out
--- a/sql/test/Tests/create-or-replace-views.stable.out
+++ b/sql/test/Tests/create-or-replace-views.stable.out
@@ -68,15 +68,15 @@ Ready.
#CREATE VIEW viet AS SELECT a1, b2 FROM testing WHERE a1 = 1;
#INSERT INTO testing VALUES (1, 'one'), (2, 'two');
[ 2 ]
-#SELECT a1, b2 FROM viet;
-% sys.viet, sys.viet # table_name
+#SELECT a1, b2 FROM viewtest;
+% sys.viewtest, sys.viewtest # table_name
% a1, b2 # name
% int, clob # type
% 1, 3 # length
[ 1, "one" ]
-#CREATE OR REPLACE VIEW viet AS SELECT a1, b2 FROM testing WHERE b2 = 'two';
-#SELECT a1, b2 FROM viet;
-% sys.viet, sys.viet # table_name
+#CREATE OR REPLACE VIEW viewtest AS SELECT a1, b2 FROM testing9 WHERE b2 =
'two';
+#SELECT a1, b2 FROM viewtest;
+% sys.viewtest, sys.viewtest # table_name
% a1, b2 # name
% int, clob # type
% 1, 3 # length
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
@@ -1,41 +1,41 @@
-CREATE TABLE testing (a INT PRIMARY KEY);
-CREATE TABLE testing2 (abc INT PRIMARY KEY);
-
-ALTER TABLE testing2 ADD CONSTRAINT "a_fkey" FOREIGN KEY ("abc") REFERENCES
testing ("a");
-
-INSERT INTO testing VALUES (1);
-INSERT INTO testing2 VALUES (1);
+CREATE TABLE testing4 (a INT PRIMARY KEY);
+CREATE TABLE testing5 (abc INT PRIMARY KEY);
-TRUNCATE testing; --error
-SELECT a FROM testing;
-SELECT abc FROM testing2;
+ALTER TABLE testing5 ADD CONSTRAINT "a_fkey" FOREIGN KEY ("abc") REFERENCES
testing4 ("a");
-TRUNCATE testing RESTRICT; --error
-SELECT a FROM testing;
-SELECT abc FROM testing2;
+INSERT INTO testing4 VALUES (1);
+INSERT INTO testing5 VALUES (1);
-TRUNCATE testing CASCADE;
-SELECT a FROM testing;
-SELECT abc FROM testing2;
+TRUNCATE testing4; --error
+SELECT a FROM testing4;
+SELECT abc FROM testing5;
+
+TRUNCATE testing4 RESTRICT; --error
+SELECT a FROM testing4;
+SELECT abc FROM testing5;
+
+TRUNCATE testing4 CASCADE;
+SELECT a FROM testing4;
+SELECT abc FROM testing5;
-- test sequences restarting
-CREATE TABLE testing3 (a INT AUTO_INCREMENT, b INT);
-
-INSERT INTO testing3 (b) VALUES (1);
-INSERT INTO testing3 (b) VALUES (1);
-SELECT a, b FROM testing3;
-TRUNCATE testing3;
+CREATE TABLE testing6 (a INT AUTO_INCREMENT, b INT);
-INSERT INTO testing3 (b) VALUES (3);
-INSERT INTO testing3 (b) VALUES (4);
-SELECT a, b FROM testing3;
-TRUNCATE testing3 CONTINUE IDENTITY;
+INSERT INTO testing6 (b) VALUES (1);
+INSERT INTO testing6 (b) VALUES (1);
+SELECT a, b FROM testing6;
+TRUNCATE testing6;
-INSERT INTO testing3 (b) VALUES (5);
-INSERT INTO testing3 (b) VALUES (6);
-SELECT a, b FROM testing3;
-TRUNCATE testing3 RESTART IDENTITY;
+INSERT INTO testing6 (b) VALUES (3);
+INSERT INTO testing6 (b) VALUES (4);
+SELECT a, b FROM testing6;
+TRUNCATE testing6 CONTINUE IDENTITY;
-INSERT INTO testing3 (b) VALUES (7);
-INSERT INTO testing3 (b) VALUES (8);
-SELECT a, b FROM testing3;
+INSERT INTO testing6 (b) VALUES (5);
+INSERT INTO testing6 (b) VALUES (6);
+SELECT a, b FROM testing6;
+TRUNCATE testing6 RESTART IDENTITY;
+
+INSERT INTO testing6 (b) VALUES (7);
+INSERT INTO testing6 (b) VALUES (8);
+SELECT a, b FROM 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
@@ -24,18 +24,19 @@ stderr of test 'truncate-statements-extr
# cmdline opt embedded_py = true
# cmdline opt gdk_debug = 536870922
-# 12:02:06 >
-# 12:02:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1155" "--port=31224"
-# 12:02:06 >
+# 12:15:59 >
+# 12:15:59 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16076" "--port=38199"
+# 12:15:59 >
-MAPI = (monetdb) /var/tmp/mtest-1155/.s.monetdb.31224
-QUERY = TRUNCATE testing; --error
+MAPI = (monetdb) /var/tmp/mtest-16076/.s.monetdb.38199
+QUERY = TRUNCATE testing4; --error
-MAPI = (monetdb) /var/tmp/mtest-1155/.s.monetdb.31224
-QUERY = TRUNCATE testing RESTRICT; --error
+MAPI = (monetdb) /var/tmp/mtest-16310/.s.monetdb.39206
+QUERY = TRUNCATE testing4 RESTRICT; --error
-# 12:02:07 >
-# 12:02:07 > "Done."
-# 12:02:07 >
+# 12:16:00 >
+# 12:16:00 > "Done."
+# 12:16:00 >
+
diff --git a/sql/test/Tests/truncate-statements-extra.stable.out
b/sql/test/Tests/truncate-statements-extra.stable.out
--- a/sql/test/Tests/truncate-statements-extra.stable.out
+++ b/sql/test/Tests/truncate-statements-extra.stable.out
@@ -71,39 +71,39 @@ Ready.
[ 1 ]
#INSERT INTO testing2 VALUES (1);
[ 1 ]
-#SELECT a FROM testing;
-% sys.testing # table_name
+#SELECT a FROM testing4;
+% sys.testing4 # table_name
% a # name
% int # type
% 1 # length
[ 1 ]
-#SELECT abc FROM testing2;
-% sys.testing2 # table_name
+#SELECT abc FROM testing5;
+% sys.testing5 # table_name
% abc # name
% int # type
% 1 # length
[ 1 ]
-#SELECT a FROM testing;
-% sys.testing # table_name
+#SELECT a FROM testing4;
+% sys.testing4 # table_name
% a # name
% int # type
% 1 # length
[ 1 ]
-#SELECT abc FROM testing2;
-% sys.testing2 # table_name
+#SELECT abc FROM testing5;
+% sys.testing5 # table_name
% abc # name
% int # type
% 1 # length
[ 1 ]
#TRUNCATE testing CASCADE;
[ 1 ]
-#SELECT a FROM testing;
-% sys.testing # table_name
+#SELECT a FROM testing4;
+% sys.testing4 # table_name
% a # name
% int # type
% 1 # length
-#SELECT abc FROM testing2;
-% sys.testing2 # table_name
+#SELECT abc FROM testing5;
+% sys.testing5 # table_name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
