Changeset: 7b87f748deaa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7b87f748deaa
Modified Files:
sql/test/sql_dump/Tests/dump.test
Branch: pp_hashjoin
Log Message:
cleanup conflict
diffs (27 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
@@ -354,7 +354,6 @@ CREATE TABLE "sys"."pfoo2" ("i" INTEGER)
CREATE TABLE "sys"."rolo" ("v" CHARACTER VARYING NOT NULL);
CREATE TABLE "sys"."second_decade" ("stamp" TIMESTAMP, "val" INTEGER);
CREATE TABLE "sys"."tbl_with_data" ("c1" INTEGER, "c2" BIGINT, "c3" BINARY
LARGE OBJECT, "c4" BOOLEAN, "c5" CHARACTER VARYING, "c6" DATE, "c7" INTERVAL
DAY, "c8" DECIMAL(18,3), "c9" DECIMAL(5), "c10" DECIMAL(5,2), "c11" DOUBLE
PRECISION, "c12" FLOAT(5), "c13" FLOAT(5), "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);
-<<<<<<< working copy
CREATE TABLE "sys"."test" ("s" CHARACTER VARYING);
CREATE TABLE "sys"."third_decade" ("stamp" TIMESTAMP, "val" INTEGER);
CREATE TABLE "sys"."ungolo" ("x" INTEGER, "y" INTEGER, "z" INTEGER);
@@ -364,7 +363,6 @@ CREATE TYPE "sfoo"."json" EXTERNAL NAME
CREATE TYPE "sys"."t1" EXTERNAL NAME "json";
CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
CREATE USER "voc2" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
-=======
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
14:18:17.780331+02:00|"{\"price\":9}"|10.1.0.0/16|"https://[email protected]: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
@@ -401,7 +399,6 @@ COMMENT ON INDEX "sys"."ind3" IS 'This i
COMMENT ON COLUMN "sfoo"."tfoo1"."i" IS 'This is a comment on a column.';
COMMENT ON SCHEMA "sbar" IS 'This is a comment on a schema';
COMMENT ON WINDOW "sys"."stddev"(DOUBLE PRECISION,BIGINT) IS 'This is a
comment on a window function.';
->>>>>>> merge rev
GRANT SELECT ON TABLE "sys"."foo" TO "voc";
GRANT UPDATE("i") ON "sys"."foo" TO "voc";
SET SCHEMA "sfoo"; create function "sfoo"."func1" (x int, y int) returns int
begin return x + y; end@;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
