Changeset: 468848218b68 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/468848218b68
Modified Files:
sql/test/sql_dump/Tests/dump.test
Branch: default
Log Message:
Approve output.
diffs (94 lines):
diff --git a/sql/test/sql_dump/Tests/dump.test
b/sql/test/sql_dump/Tests/dump.test
--- a/sql/test/sql_dump/Tests/dump.test
+++ b/sql/test/sql_dump/Tests/dump.test
@@ -296,10 +296,10 @@ SELECT stmt FROM sys.dump_database(FALSE
START TRANSACTION;
SET SCHEMA "sys";
CREATE ROLE "king";
-CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
-CREATE USER "voc2" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
-CREATE SCHEMA "sbar" AUTHORIZATION monetdb;
-CREATE SCHEMA "sfoo" AUTHORIZATION monetdb;
+CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
+CREATE USER "voc2" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
+CREATE SCHEMA "sbar" AUTHORIZATION "monetdb";
+CREATE SCHEMA "sfoo" AUTHORIZATION "monetdb";
CREATE TYPE "sfoo"."json" EXTERNAL NAME "json";
CREATE TYPE "sys"."t1" EXTERNAL NAME "json";
ALTER USER "voc" SET SCHEMA "sfoo";
@@ -312,15 +312,6 @@ CREATE SEQUENCE "sys"."seq6" AS BIGINT S
CREATE SEQUENCE "sys"."seq7" AS BIGINT START WITH 10;
CREATE SEQUENCE "sys"."seq8" AS BIGINT START WITH -5 INCREMENT BY -1 MINVALUE
-10 MAXVALUE -1;
CREATE SEQUENCE "sys"."seq9" AS BIGINT START WITH 10 MINVALUE 10 MAXVALUE 10;
-UPDATE sys.sequences seq SET start = 5 WHERE name = 'seq1' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq2' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq3' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq4' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq5' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq6' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq7' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = -1 WHERE name = 'seq8' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
-UPDATE sys.sequences seq SET start = 10 WHERE name = 'seq9' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' );
CREATE TABLE "sys"."test" ("s" CHARACTER LARGE OBJECT);
CREATE TABLE "sys"."bla" ("s" CHARACTER LARGE OBJECT(10));
CREATE TABLE "sys"."bob" ("ts" TIMESTAMP(3));
@@ -342,7 +333,7 @@ CREATE TABLE "sys"."higher_scorers" ("na
CREATE TABLE "sys"."unknown_scorers" ("name" CHARACTER LARGE OBJECT,
"first_score" INTEGER, "second_score" INTEGER);
CREATE TABLE "sfoo"."foo" ("fi" INTEGER NOT NULL, "fs" CHARACTER LARGE OBJECT
NOT NULL);
CREATE TABLE "sbar"."bar" ("bi" INTEGER NOT NULL, "bs" CHARACTER LARGE OBJECT
NOT NULL);
-CREATE REMOTE TABLE "sys"."rfoo" ("i" INTEGER) ON
'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3'
;
+CREATE REMOTE TABLE "sys"."rfoo" ("i" INTEGER) ON
'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE MERGE TABLE "sys"."scorers" ("name" CHARACTER LARGE OBJECT,
"first_score" INTEGER, "second_score" INTEGER) PARTITION BY VALUES USING
("sys"."mod"("sys"."greatest"("first_score","second_score"),10));
CREATE MERGE TABLE "sys"."splitted" ("stamp" TIMESTAMP, "val" INTEGER)
PARTITION BY RANGE ON ("stamp");
CREATE MERGE TABLE "sys"."m1" ("i" INTEGER);
@@ -357,6 +348,15 @@ create function "sys"."f1" () returns in
create procedure "sys"."f1" (i int) begin declare x int; end@;
create procedure "sys"."f1" () begin declare x int; end@;
CREATE TABLE "sys"."tbl_with_data" ("c1" INTEGER, "c2" BIGINT, "c3" BINARY
LARGE OBJECT, "c4" BOOLEAN, "c5" CHARACTER LARGE OBJECT, "c6" DATE, "c7"
INTERVAL DAY, "c8" DECIMAL(18,3), "c9" DECIMAL(5), "c10" DECIMAL(5,2), "c11"
DOUBLE, "c12" FLOAT(5), "c13" FLOAT(5,4), "c14" GEOMETRY(POINT), "c18" INTERVAL
YEAR, "c19" INTERVAL YEAR TO MONTH, "c20" INTERVAL MONTH, "c21" REAL, "c22"
INTERVAL DAY, "c23" INTERVAL DAY TO HOUR, "c24" INTERVAL HOUR, "c25" INTERVAL
HOUR TO MINUTE, "c26" TIME, "c27" TIMESTAMP, "c28" TIMESTAMP(2), "c29"
TIMESTAMP WITH TIME ZONE, "c30" JSON, "c31" INET, "c32" URL, "c33" UUID);
+UPDATE sys.sequences seq SET start = 5 WHERE name = 'seq1' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq2' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq3' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq4' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq5' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq6' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq7' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = -1 WHERE name = 'seq8' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
+UPDATE sys.sequences seq SET start = 10 WHERE name = 'seq9' AND schema_id =
(SELECT s.id FROM sys.schemas s WHERE s.name = 'sys');
ALTER TABLE "sys"."yoyo" ALTER COLUMN "tsz" SET DEFAULT 'BLABOLO';
ALTER TABLE "sys"."bolo" ADD CONSTRAINT "cpk" PRIMARY KEY ("s", "v");
ALTER TABLE "sys"."rolo" ADD CONSTRAINT "rolo_v_pkey" PRIMARY KEY ("v");
@@ -371,22 +371,20 @@ ALTER TABLE "sfoo"."foo" ADD CONSTRAINT
ALTER TABLE "sys"."scorers" ADD TABLE "sys"."unknown_scorers" AS PARTITION
FOR NULL VALUES;
ALTER TABLE "sys"."scorers" ADD TABLE "sys"."lower_scorers" AS PARTITION IN
(0,1,2,3,4);
ALTER TABLE "sys"."scorers" ADD TABLE "sys"."higher_scorers" AS PARTITION IN
(5,6,7,8,9);
-ALTER TABLE "sys"."splitted" ADD TABLE "sys"."first_decade" AS PARTITION FROM
RANGE MINVALUE TO '2010-01-01 00:00:00.000000' WITH NULL VALUES;
-ALTER TABLE "sys"."splitted" ADD TABLE "sys"."second_decade" AS PARTITION
FROM '2010-01-01 00:00:00.000000' TO '2020-01-01 00:00:00.000000' ;
+ALTER TABLE "sys"."splitted" ADD TABLE "sys"."first_decade" AS PARTITION FROM
RANGE MINVALUE TO '2010-01-01 00:00:00.000000' WITH NULL VALUES;
+ALTER TABLE "sys"."splitted" ADD TABLE "sys"."second_decade" AS PARTITION
FROM '2010-01-01 00:00:00.000000' TO '2020-01-01 00:00:00.000000';
ALTER TABLE "sys"."m1" ADD TABLE "sys"."p1";
create trigger extra_insert after insert on "sfoo"."tfoo1" referencing new row
as new_row for each statement insert into tfoo2(i) values (new_row.i)@;
-COMMENT ON SCHEMA "sbar" IS 'This is a comment on a schema' ;
-COMMENT ON COLUMN "sfoo"."tfoo1"."i" IS 'This is a comment on a column.' ;
-COMMENT ON INDEX "sys"."ind3" IS 'This is a comment on an index.' ;
-COMMENT ON SEQUENCE "sys"."seq1" IS 'This is a comment on a sequence.' ;
-COMMENT ON WINDOW "sys"."stddev" IS 'This is a comment on a window function.'
;
-TRUNCATE sys.privileges;
-INSERT INTO sys.privileges VALUES ((SELECT t.id FROM sys.schemas s, sys.tables
t WHERE s.id = t.schema_id AND s.name || '.' || t.name = 'sys.foo' ),(SELECT id
FROM sys.auths a WHERE a.name = 'voc' ),(SELECT pc.privilege_code_id FROM
sys.privilege_codes pc WHERE pc.privilege_code_name = 'SELECT' ),(SELECT id
FROM sys.auths g WHERE g.name = 'monetdb' ),0);
-INSERT INTO sys.privileges VALUES ((SELECT c.id FROM sys.schemas s, sys.tables
t, sys.columns c WHERE s.id = t.schema_id AND t.id = c.table_id AND s.name ||
'.' || t.name || '.' || c.name = 'sys.foo.i' ),(SELECT id FROM sys.auths a
WHERE a.name = 'voc' ),(SELECT pc.privilege_code_id FROM sys.privilege_codes
pc WHERE pc.privilege_code_name = 'UPDATE' ),(SELECT id FROM sys.auths g WHERE
g.name = 'monetdb' ),0);
-INSERT INTO sys.privileges VALUES ((SELECT fqn.id FROM
sys.fully_qualified_functions fqn WHERE fqn.nme = 'sys.f1(INTEGER)' AND
fqn.tpe = 'FUNCTION' ),(SELECT id FROM sys.auths a WHERE a.name = 'voc'
),(SELECT pc.privilege_code_id FROM sys.privilege_codes pc WHERE
pc.privilege_code_name = 'EXECUTE' ),(SELECT id FROM sys.auths g WHERE g.name
= 'monetdb' ),0);
-INSERT INTO sys.privileges VALUES ((SELECT fqn.id FROM
sys.fully_qualified_functions fqn WHERE fqn.nme = 'sys.f1(INTEGER)' AND
fqn.tpe = 'PROCEDURE' ),(SELECT id FROM sys.auths a WHERE a.name = 'voc'
),(SELECT pc.privilege_code_id FROM sys.privilege_codes pc WHERE
pc.privilege_code_name = 'EXECUTE' ),(SELECT id FROM sys.auths g WHERE g.name
= 'monetdb' ),0);
-INSERT INTO sys.privileges VALUES ((SELECT fqn.id FROM
sys.fully_qualified_functions fqn WHERE fqn.nme = 'sys.f1()' AND fqn.tpe =
'PROCEDURE' ),(SELECT id FROM sys.auths a WHERE a.name = 'voc' ),(SELECT
pc.privilege_code_id FROM sys.privilege_codes pc WHERE pc.privilege_code_name =
'EXECUTE' ),(SELECT id FROM sys.auths g WHERE g.name = 'monetdb' ),1);
-INSERT INTO sys.privileges VALUES (0,(SELECT id FROM sys.auths a WHERE a.name
= 'voc' ),(SELECT pc.privilege_code_id FROM sys.privilege_codes pc WHERE
pc.privilege_code_name = 'UPDATE' ),(SELECT id FROM sys.auths g WHERE g.name =
'monetdb' ),0);
+COMMENT ON SCHEMA "sbar" IS 'This is a comment on a schema';
+COMMENT ON COLUMN "sfoo"."tfoo1"."i" IS 'This is a comment on a column.';
+COMMENT ON INDEX "sys"."ind3" IS 'This is a comment on an index.';
+COMMENT ON SEQUENCE "sys"."seq1" IS 'This is a comment on a sequence.';
+COMMENT ON WINDOW "sys"."stddev" IS 'This is a comment on a window function.';
+GRANT SELECT ON TABLE "sys"."foo" TO "voc";
+GRANT UPDATE("i") ON "sys"."foo" TO "voc";
+GRANT EXECUTE ON PROCEDURE "sys"."f1"(INTEGER) TO "voc";
+GRANT EXECUTE ON FUNCTION "sys"."f1"() TO "voc";
+GRANT EXECUTE ON PROCEDURE "sys"."f1"() TO "voc" WITH GRANT OPTION;
COPY 3 RECORDS INTO "sys"."tbl_with_data"("c1", "c2", "c3", "c4", "c5", "c6",
"c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c18", "c19", "c20",
"c21", "c22", "c23", "c24", "c25", "c26", "c27", "c28", "c29", "c30", "c31",
"c32", "c33") FROM STDIN USING DELIMITERS '|',E'\n','"';
1234|5678|90|true|"Hello\n \\|\"
World"|2020-12-20|10.000|1023.345|12345|123.45|1123.455|1122133.5|121233.45|"POINT
(5.1
34.5)"|2000|4000|8000|65333.414|8000.000|4000.000|2000.000|1000.000|14:18:18|2015-05-22
14:18:17.780331|2015-05-22 00:00:00.00|2015-05-22
12:18:17.780331+00:00|"{\"price\":9}"|10.1.0.0/16|"https://m...@www.monetdb.org:458/Doc/Abc.html?lang=nl&sort=asc#example";|65950c76-a2f6-4543-660a-b849cf5f2453
null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
