Changeset: c9adde2e1751 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c9adde2e1751 Added Files: sql/test/UserDump/Tests/create1.test sql/test/UserDump/Tests/create2.reqtests sql/test/UserDump/Tests/create2.test sql/test/UserDump/Tests/create3.reqtests sql/test/UserDump/Tests/create3.test sql/test/UserDump/Tests/create4.reqtests sql/test/UserDump/Tests/create4.test sql/test/UserDump/Tests/dump.reqtests Removed Files: sql/test/Dump/Tests/dump-empty.test sql/test/UserDump/Tests/create.SQL.py Modified Files: sql/test/Dump/Tests/All sql/test/Dump/Tests/dump-again.stable.out sql/test/Dump/Tests/dump.stable.out sql/test/UserDump/Tests/All sql/test/UserDump/Tests/dump.stable.out sql/test/UserDump/Tests/dump_with_test.stable.out sql/test/UserDump/Tests/dump_with_voc.stable.out Branch: Jan2022 Log Message:
Approved dump output after changes to msqldump. Also refactored the create test a little. diffs (truncated from 380 to 300 lines): diff --git a/sql/test/Dump/Tests/All b/sql/test/Dump/Tests/All --- a/sql/test/Dump/Tests/All +++ b/sql/test/Dump/Tests/All @@ -1,4 +1,3 @@ -dump-empty load dump dump-again diff --git a/sql/test/Dump/Tests/dump-again.stable.out b/sql/test/Dump/Tests/dump-again.stable.out --- a/sql/test/Dump/Tests/dump-again.stable.out +++ b/sql/test/Dump/Tests/dump-again.stable.out @@ -1,34 +1,9 @@ -stdout of test 'dump-again` in directory 'sql/test/Dump` itself: - - -# 22:27:57 > -# 22:27:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34099" "--set" "mapi_usock=/var/tmp/mtest-27453/.s.monetdb.34099" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump" "--set" "embedded_c=true" -# 22:27:57 > - -# MonetDB 5 server v11.29.4 (hg id: c717aa6c1f76) -# This is an unreleased version -# Serving database 'mTests_sql_test_Dump', using 4 threads -# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers -# Found 15.513 GiB available main-memory. -# Copyright (c) 1993 - July 2008 CWI. -# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved -# Visit https://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://meeuw.mullender.nl:34099/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27453/.s.monetdb.34099 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - - -# 22:27:57 > -# 22:27:57 > "/usr/bin/python" "dump-again.SQL.py" "dump-again" -# 22:27:57 > - START TRANSACTION; CREATE SEQUENCE "sys"."test_seq" AS INTEGER; SET SCHEMA "sys"; CREATE TABLE "sys"."test" ( "id" INTEGER, - "i" SMALLINT DEFAULT next value for "sys"."test_seq" + "i" SMALLINT ); INSERT INTO "sys"."test" VALUES (0, 7); INSERT INTO "sys"."test" VALUES (1, 10); @@ -100,11 +75,7 @@ CREATE TABLE "sys"."keytest2" ( ); INSERT INTO "sys"."keytest2" VALUES (0, 0); INSERT INTO "sys"."keytest2" VALUES (0, 1); +ALTER TABLE "sys"."test" ALTER COLUMN "i" SET DEFAULT next value for "sys"."test_seq"; ALTER TABLE "sys"."keytest2" ADD CONSTRAINT "keytest2_key1_key2_fkey" FOREIGN KEY ("key1", "key2") REFERENCES "sys"."keytest1" ("key1", "key2"); ALTER SEQUENCE "sys"."test_seq" RESTART WITH 8 INCREMENT BY 3 MINVALUE 5 MAXVALUE 10 CYCLE; COMMIT; - -# 22:27:57 > -# 22:27:57 > "Done." -# 22:27:57 > - diff --git a/sql/test/Dump/Tests/dump-empty.test b/sql/test/Dump/Tests/dump-empty.test deleted file mode 100644 diff --git a/sql/test/Dump/Tests/dump.stable.out b/sql/test/Dump/Tests/dump.stable.out --- a/sql/test/Dump/Tests/dump.stable.out +++ b/sql/test/Dump/Tests/dump.stable.out @@ -1,34 +1,9 @@ -stdout of test 'dump` in directory 'sql/test/Dump` itself: - - -# 17:06:37 > -# 17:06:37 > mserver5 "--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin" --set "gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=31369 --set xrpc_port=41351 --set monet_prompt= --trace "--dbname=mTests_src_test_Dump" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 17:06:37 > - -# MonetDB server v5.12.3, based on kernel v1.30.3 -# Serving database 'mTests_src_test_Dump', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:31369/ -# MonetDB/SQL module v2.30.3 loaded - -#function user.main():void; -# clients.quit(); -#end main; - - -# 17:06:37 > -# 17:06:37 > /usr/bin/python dump.SQL.py dump -# 17:06:37 > - START TRANSACTION; CREATE SEQUENCE "sys"."test_seq" AS INTEGER; SET SCHEMA "sys"; CREATE TABLE "sys"."test" ( "id" INTEGER, - "i" SMALLINT DEFAULT next value for "sys"."test_seq" + "i" SMALLINT ); COPY 5 RECORDS INTO "sys"."test" FROM stdin USING DELIMITERS E'\t',E'\n','"'; 0 7 @@ -104,11 +79,7 @@ CREATE TABLE "sys"."keytest2" ( COPY 2 RECORDS INTO "sys"."keytest2" FROM stdin USING DELIMITERS E'\t',E'\n','"'; 0 0 0 1 +ALTER TABLE "sys"."test" ALTER COLUMN "i" SET DEFAULT next value for "sys"."test_seq"; ALTER TABLE "sys"."keytest2" ADD CONSTRAINT "keytest2_key1_key2_fkey" FOREIGN KEY ("key1", "key2") REFERENCES "sys"."keytest1" ("key1", "key2"); ALTER SEQUENCE "sys"."test_seq" RESTART WITH 8 INCREMENT BY 3 MINVALUE 5 MAXVALUE 10 CYCLE; COMMIT; - -# 17:06:38 > -# 17:06:38 > Done. -# 17:06:38 > - diff --git a/sql/test/UserDump/Tests/All b/sql/test/UserDump/Tests/All --- a/sql/test/UserDump/Tests/All +++ b/sql/test/UserDump/Tests/All @@ -1,4 +1,7 @@ -create +create1 +USER=voc&PASSWD=voc?create2 +create3 +USER=test&PASSWD=test?create4 dump dump_with_voc dump_with_test diff --git a/sql/test/UserDump/Tests/create.SQL.py b/sql/test/UserDump/Tests/create.SQL.py deleted file mode 100644 --- a/sql/test/UserDump/Tests/create.SQL.py +++ /dev/null @@ -1,46 +0,0 @@ -from MonetDBtesting.sqltest import SQLTestCase - -with SQLTestCase() as tc: - # optional or default connection - tc.connect() - tc.execute(""" - create user voc with password 'voc' name 'VOC Explorer' schema sys; - create schema voc authorization voc; - alter user voc set schema voc; - """, client="mclient").assertSucceeded() - tc.connect(username='voc', password='voc') - tc.execute(""" - create table foo ( - id int, - v int, - primary key (id) - ); - create view bar as select * from foo; - create function b(i int) returns int begin return select v from bar where id = i; end; - create table a ( - id int - ); - create trigger a after insert on foo insert into a values (1); - """, client="mclient").assertSucceeded() - tc.connect(username='monetdb', password='monetdb') - tc.execute(""" - create user test with password 'test' name 'Test User' schema sys; - create schema test authorization test; - alter user test set schema test; - """, client="mclient").assertSucceeded() - tc.connect(username='test', password='test') - tc.execute(""" - create table foo ( - id int, - v int, - primary key (id) - ); - create view bar as select * from foo; - create function b(i int) returns int begin return select v from bar where id = i; end; - create table a ( - id int - ); - create trigger a after insert on foo insert into a values (1); - create trigger x after insert on foo insert into a values (1); - create trigger "z" after insert on "foo" insert into a values (1); - """, client="mclient").assertSucceeded() diff --git a/sql/test/UserDump/Tests/create1.test b/sql/test/UserDump/Tests/create1.test new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/create1.test @@ -0,0 +1,9 @@ +statement ok +create user voc with password 'voc' name 'VOC Explorer' schema sys + +statement ok +create schema voc authorization voc + +statement ok +alter user voc set schema voc + diff --git a/sql/test/UserDump/Tests/create2.reqtests b/sql/test/UserDump/Tests/create2.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/create2.reqtests @@ -0,0 +1,1 @@ +create1 diff --git a/sql/test/UserDump/Tests/create2.test b/sql/test/UserDump/Tests/create2.test new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/create2.test @@ -0,0 +1,21 @@ +statement ok +create table foo ( + id int, + v int, + primary key (id) +) + +statement ok +create view bar as select * from foo + +statement ok +create function b(i int) returns int begin return select v from bar where id = i; end + +statement ok +create table a ( + id int +) + +statement ok +create trigger a after insert on foo insert into a values (1) + diff --git a/sql/test/UserDump/Tests/create3.reqtests b/sql/test/UserDump/Tests/create3.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/create3.reqtests @@ -0,0 +1,1 @@ +create2 diff --git a/sql/test/UserDump/Tests/create3.test b/sql/test/UserDump/Tests/create3.test new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/create3.test @@ -0,0 +1,9 @@ +statement ok +create user test with password 'test' name 'Test User' schema sys + +statement ok +create schema test authorization test + +statement ok +alter user test set schema test + diff --git a/sql/test/UserDump/Tests/create4.reqtests b/sql/test/UserDump/Tests/create4.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/create4.reqtests @@ -0,0 +1,1 @@ +create3 diff --git a/sql/test/UserDump/Tests/create4.test b/sql/test/UserDump/Tests/create4.test new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/create4.test @@ -0,0 +1,27 @@ +statement ok +create table foo ( + id int, + v int, + primary key (id) +) + +statement ok +create view bar as select * from foo + +statement ok +create function b(i int) returns int begin return select v from bar where id = i; end + +statement ok +create table a ( + id int +) + +statement ok +create trigger a after insert on foo insert into a values (1) + +statement ok +create trigger x after insert on foo insert into a values (1) + +statement ok +create trigger "z" after insert on "foo" insert into a values (1) + diff --git a/sql/test/UserDump/Tests/dump.reqtests b/sql/test/UserDump/Tests/dump.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/UserDump/Tests/dump.reqtests @@ -0,0 +1,1 @@ +create4 diff --git a/sql/test/UserDump/Tests/dump.stable.out b/sql/test/UserDump/Tests/dump.stable.out --- a/sql/test/UserDump/Tests/dump.stable.out +++ b/sql/test/UserDump/Tests/dump.stable.out @@ -11,25 +11,35 @@ CREATE TABLE "voc"."foo" ( "v" INTEGER, CONSTRAINT "foo_id_pkey" PRIMARY KEY ("id") ); -create view bar as select * from foo; -create function b(i int) returns int begin return select v from bar where id = i; end; CREATE TABLE "voc"."a" ( "id" INTEGER ); -create trigger a after insert on foo insert into a values (1); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
