Changeset: d8c7df25ba75 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8c7df25ba75
Branch: default
Log Message:
Merge monetdbe-proxy.
diffs (truncated from 4824 to 300 lines):
diff --git a/dump_output.sql b/dump_output.sql
new file mode 100644
--- /dev/null
+++ b/dump_output.sql
@@ -0,0 +1,101 @@
+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 TYPE "sfoo"."json" EXTERNAL NAME "json";
+CREATE TYPE "sys"."t1" EXTERNAL NAME "json";
+ALTER USER "voc" SET SCHEMA "sfoo";
+CREATE SEQUENCE "sys"."seq1" AS BIGINT START WITH 10 INCREMENT BY 3 MINVALUE 4
MAXVALUE 10 CACHE 2 CYCLE;
+CREATE SEQUENCE "sys"."seq2" AS BIGINT START WITH 10 INCREMENT BY 3 MINVALUE 4
MAXVALUE 10 CACHE 2 CYCLE;
+CREATE SEQUENCE "sys"."seq3" AS BIGINT START WITH 10 MINVALUE 4 MAXVALUE 10
CACHE 2 CYCLE;
+CREATE SEQUENCE "sys"."seq4" AS BIGINT START WITH 10 MAXVALUE 10 CACHE 2 CYCLE;
+CREATE SEQUENCE "sys"."seq5" AS BIGINT START WITH 10 MAXVALUE 10 CACHE 2;
+CREATE SEQUENCE "sys"."seq6" AS BIGINT START WITH 10 CACHE 2;
+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));
+CREATE TABLE "sys"."fdgdf" ("tsz" TIMESTAMP(4) WITH TIME ZONE);
+CREATE TABLE "sys"."yoyo" ("tsz" CHARACTER LARGE OBJECT);
+CREATE TABLE "sys"."bolo" ("s" CHARACTER LARGE OBJECT NOT NULL, "v" CHARACTER
LARGE OBJECT NOT NULL);
+CREATE TABLE "sys"."rolo" ("v" CHARACTER LARGE OBJECT NOT NULL);
+CREATE TABLE "sys"."ungolo" ("x" INTEGER, "y" INTEGER, "z" INTEGER);
+CREATE TABLE "sfoo"."tfoo1" ("i" INTEGER);
+CREATE TABLE "sfoo"."tfoo2" ("i" INTEGER);
+CREATE TABLE "sfoo"."test" ("s" CHARACTER LARGE OBJECT);
+CREATE TABLE "sys"."pfoo1" ("i" INTEGER);
+CREATE TABLE "sys"."pfoo2" ("i" INTEGER);
+create function "sfoo"."func1" (x int, y int) returns int begin return x + y;
end;
+create view "sfoo"."baz" (i) as select func1(t.x, t.y) from (values (10, 1),
(20, 2)) as t(x,y);
+create function "sfoo"."func2" () returns table(i integer) begin return select
* from "sfoo"."baz"; end;
+CREATE TABLE "sys"."lower_scorers" ("name" CHARACTER LARGE OBJECT,
"first_score" INTEGER, "second_score" INTEGER);
+CREATE TABLE "sys"."higher_scorers" ("name" CHARACTER LARGE OBJECT,
"first_score" INTEGER, "second_score" INTEGER);
+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 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);
+CREATE REPLICA TABLE "sys"."rep" ("i" INTEGER);
+CREATE TABLE "sys"."first_decade" ("stamp" TIMESTAMP, "val" INTEGER);
+CREATE TABLE "sys"."second_decade" ("stamp" TIMESTAMP, "val" INTEGER);
+CREATE TABLE "sys"."third_decade" ("stamp" TIMESTAMP, "val" INTEGER);
+CREATE TABLE "sys"."p1" ("i" INTEGER);
+create or replace window "sys"."stddev" (val bigint) returns double external
name "sql"."stdevp";
+CREATE TABLE "sys"."foo" ("i" INTEGER, "j" INTEGER);
+create function "sys"."f1" () returns int begin return 10; end;
+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);
+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");
+ALTER TABLE "sys"."ungolo" ADD CONSTRAINT "ungolo_x_y_unique" UNIQUE ("x",
"y");
+ALTER TABLE "sys"."ungolo" ADD CONSTRAINT "ungolo_z_unique" UNIQUE ("z");
+ALTER TABLE "sfoo"."foo" ADD CONSTRAINT "foo_pk" PRIMARY KEY ("fi", "fs");
+ALTER TABLE "sbar"."bar" ADD CONSTRAINT "bar_pk" PRIMARY KEY ("bi", "bs");
+CREATE INDEX "ind1" ON "sys"."ungolo"(x,y);
+CREATE IMPRINTS INDEX "ind2" ON "sys"."ungolo"(y,z);
+CREATE ORDERED INDEX "ind3" ON "sys"."ungolo"(x,z);
+ALTER TABLE "sfoo"."foo" ADD CONSTRAINT "fk_foo_to_bar" FOREIGN KEY("fi","fs")
REFERENCES "sbar"."bar"("bi","bs") ON DELETE SET NULL ON UPDATE CASCADE;
+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"."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, tables t
WHERE s.id = t.schema_id AND s.name || '.' || t.name = 'sys.foo' ),(SELECT id
FROM auths a WHERE a.name = 'voc' ),(SELECT pc.privilege_code_id FROM
privilege_codes pc WHERE pc.privilege_code_name = 'SELECT' ),(SELECT id FROM
auths g WHERE g.name = 'monetdb' ),0);
+INSERT INTO sys.privileges VALUES ((SELECT c.id FROM sys.schemas s, tables t,
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 auths a WHERE a.name =
'voc' ),(SELECT pc.privilege_code_id FROM privilege_codes pc WHERE
pc.privilege_code_name = 'UPDATE' ),(SELECT id FROM auths g WHERE g.name =
'monetdb' ),0);
+INSERT INTO sys.privileges VALUES ((SELECT fqn.id FROM
fully_qualified_functions fqn WHERE fqn.nme = 'sys.f1(INTEGER)' AND fqn.tpe =
'FUNCTION' ),(SELECT id FROM auths a WHERE a.name = 'voc' ),(SELECT
pc.privilege_code_id FROM privilege_codes pc WHERE pc.privilege_code_name =
'EXECUTE' ),(SELECT id FROM auths g WHERE g.name = 'monetdb' ),0);
+INSERT INTO sys.privileges VALUES ((SELECT fqn.id FROM
fully_qualified_functions fqn WHERE fqn.nme = 'sys.f1(INTEGER)' AND fqn.tpe =
'PROCEDURE' ),(SELECT id FROM auths a WHERE a.name = 'voc' ),(SELECT
pc.privilege_code_id FROM privilege_codes pc WHERE pc.privilege_code_name =
'EXECUTE' ),(SELECT id FROM auths g WHERE g.name = 'monetdb' ),0);
+INSERT INTO sys.privileges VALUES ((SELECT fqn.id FROM
fully_qualified_functions fqn WHERE fqn.nme = 'sys.f1()' AND fqn.tpe =
'PROCEDURE' ),(SELECT id FROM auths a WHERE a.name = 'voc' ),(SELECT
pc.privilege_code_id FROM privilege_codes pc WHERE pc.privilege_code_name =
'EXECUTE' ),(SELECT id FROM auths g WHERE g.name = 'monetdb' ),1);
+INSERT INTO sys.privileges VALUES (0,(SELECT id FROM auths a WHERE a.name =
'voc' ),(SELECT pc.privilege_code_id FROM privilege_codes pc WHERE
pc.privilege_code_name = 'UPDATE' ),(SELECT id FROM auths g WHERE g.name =
'monetdb' ),0);
+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 '|','\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
13:18:17.780331+01: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
+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
+
+SELECT stmt FROM sys.dump_database(FALSE);
+ROLLBACK;
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -1037,7 +1037,8 @@ AUTHgetRemoteTableCredentials(const char
p = lookupRemoteTableKey(local_table);
if (p == BUN_NONE) {
- throw(MAL, "getRemoteTableCredentials", "No credentials for
remote table %s found", local_table);
+ // No credentials for remote table with name local_table.
+ return MAL_SUCCEED;
}
assert(rt_key);
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -39,6 +39,7 @@ set(include_sql_files
60_wlcr
61_wlcr
75_storagemodel
+ 76_dump
80_statistics
81_tracer)
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3764,8 +3764,8 @@ sql_rt_credentials_wrap(Client cntxt, Ma
bat *uname = getArgReference_bat(stk, pci, 1);
bat *hash = getArgReference_bat(stk, pci, 2);
str *table = getArgReference_str(stk, pci, 3);
- str uris;
- str unames;
+ str uris = NULL;
+ str unames = NULL;
str hashs = NULL;
str msg = MAL_SUCCEED;
(void)mb;
@@ -3784,11 +3784,11 @@ sql_rt_credentials_wrap(Client cntxt, Ma
goto bailout;
MT_lock_set(&mal_contextLock);
- if (BUNappend(urib, uris, false) != GDK_SUCCEED)
+ if (BUNappend(urib, uris? uris: str_nil, false) != GDK_SUCCEED)
goto lbailout;
- if (BUNappend(unameb, unames, false) != GDK_SUCCEED)
+ if (BUNappend(unameb, unames? unames: str_nil , false) != GDK_SUCCEED)
goto lbailout;
- if (BUNappend(hashb, hashs, false) != GDK_SUCCEED)
+ if (BUNappend(hashb, hashs? hashs: str_nil, false) != GDK_SUCCEED)
goto lbailout;
MT_lock_unset(&mal_contextLock);
BBPkeepref(*uri = urib->batCacheid);
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2549,7 +2549,7 @@ sql_update_oct2020_sp1(Client c, mvc *sq
static str
sql_update_default(Client c, mvc *sql, const char *prev_schema, bool
*systabfixed)
{
- size_t bufsize = 8192, pos = 0;
+ size_t bufsize = 65536, pos = 0;
char *buf = NULL, *err = NULL;
res_table *output = NULL;
BAT *b = NULL;
@@ -2602,113 +2602,113 @@ sql_update_default(Client c, mvc *sql, c
" ELSE 'CHARACTER(' || digits
|| ')'\n"
" END\n"
" WHEN 'clob' THEN\n"
- " CASE digits\n"
- " WHEN 0 THEN 'CHARACTER LARGE
OBJECT'\n"
- " ELSE 'CHARACTER LARGE
OBJECT(' || digits || ')'\n"
- " END\n"
+ " CASE digits\n"
+ " WHEN 0 THEN 'CHARACTER LARGE
OBJECT'\n"
+ " ELSE 'CHARACTER LARGE OBJECT('
|| digits || ')'\n"
+ " END\n"
" WHEN 'date' THEN 'DATE'\n"
" WHEN 'day_interval' THEN
'INTERVAL DAY'\n"
" WHEN ctype = 'decimal' THEN\n"
- " CASE\n"
- " WHEN (digits = 1 AND tscale
= 0) OR digits = 0 THEN 'DECIMAL'\n"
- " WHEN tscale = 0 THEN
'DECIMAL(' || digits || ')'\n"
- " WHEN digits = 39 THEN
'DECIMAL(' || 38 || ',' || tscale || ')'\n"
- " WHEN digits = 19 AND (SELECT
COUNT(*) = 0 FROM sys.types WHERE sqlname = 'hugeint' ) THEN 'DECIMAL(' || 18
|| ',' || tscale || ')'\n"
- " ELSE 'DECIMAL(' || digits ||
',' || tscale || ')'\n"
- " END\n"
+ " CASE\n"
+ " WHEN (digits = 1 AND tscale = 0)
OR digits = 0 THEN 'DECIMAL'\n"
+ " WHEN tscale = 0 THEN 'DECIMAL('
|| digits || ')'\n"
+ " WHEN digits = 39 THEN 'DECIMAL('
|| 38 || ',' || tscale || ')'\n"
+ " WHEN digits = 19 AND (SELECT
COUNT(*) = 0 FROM sys.types WHERE sqlname = 'hugeint' ) THEN 'DECIMAL(' || 18
|| ',' || tscale || ')'\n"
+ " ELSE 'DECIMAL(' || digits || ','
|| tscale || ')'\n"
+ " END\n"
" WHEN 'double' THEN\n"
- " CASE\n"
- " WHEN digits = 53 and tscale
= 0 THEN 'DOUBLE'\n"
- " WHEN tscale = 0 THEN
'FLOAT(' || digits || ')'\n"
- " ELSE 'FLOAT(' || digits ||
',' || tscale || ')'\n"
- " END\n"
+ " CASE\n"
+ " WHEN digits = 53 and tscale = 0
THEN 'DOUBLE'\n"
+ " WHEN tscale = 0 THEN 'FLOAT(' ||
digits || ')'\n"
+ " ELSE 'FLOAT(' || digits || ','
|| tscale || ')'\n"
+ " END\n"
" WHEN 'geometry' THEN\n"
- " CASE digits\n"
- " WHEN 4 THEN 'GEOMETRY(POINT'
||\n"
+ " CASE digits\n"
+ " WHEN 4 THEN 'GEOMETRY(POINT'
||\n"
" CASE tscale\n"
" WHEN 0 THEN ''\n"
" ELSE ',' || tscale\n"
" END || ')'\n"
- " WHEN 8 THEN
'GEOMETRY(LINESTRING' ||\n"
+ " WHEN 8 THEN
'GEOMETRY(LINESTRING' ||\n"
" CASE tscale\n"
" WHEN 0 THEN ''\n"
" ELSE ',' || tscale\n"
" END || ')'\n"
- " WHEN 16 THEN
'GEOMETRY(POLYGON' ||\n"
+ " WHEN 16 THEN 'GEOMETRY(POLYGON'
||\n"
" CASE tscale\n"
" WHEN 0 THEN ''\n"
" ELSE ',' || tscale\n"
" END || ')'\n"
- " WHEN 20 THEN
'GEOMETRY(MULTIPOINT' ||\n"
+ " WHEN 20 THEN
'GEOMETRY(MULTIPOINT' ||\n"
" CASE tscale\n"
" WHEN 0 THEN ''\n"
" ELSE ',' || tscale\n"
" END || ')'\n"
- " WHEN 24 THEN
'GEOMETRY(MULTILINESTRING' ||\n"
+ " WHEN 24 THEN
'GEOMETRY(MULTILINESTRING' ||\n"
" CASE tscale\n"
" WHEN 0 THEN ''\n"
" ELSE ',' || tscale\n"
" END || ')'\n"
- " WHEN 28 THEN
'GEOMETRY(MULTIPOLYGON' ||\n"
+ " WHEN 28 THEN
'GEOMETRY(MULTIPOLYGON' ||\n"
" CASE tscale\n"
" WHEN 0 THEN ''\n"
" ELSE ',' || tscale\n"
" END || ')'\n"
- " WHEN 32 THEN
'GEOMETRY(GEOMETRYCOLLECTION' ||\n"
+ " WHEN 32 THEN
'GEOMETRY(GEOMETRYCOLLECTION' ||\n"
" CASE tscale\n"
" WHEN 0 THEN ''\n"
" ELSE ',' || tscale\n"
" END || ')'\n"
- " ELSE 'GEOMETRY'\n"
+ " ELSE 'GEOMETRY'\n"
" END\n"
" WHEN 'hugeint' THEN 'HUGEINT'\n"
" WHEN 'int' THEN 'INTEGER'\n"
" WHEN 'month_interval' THEN\n"
- " CASE digits\n"
- " WHEN 1 THEN 'INTERVAL
YEAR'\n"
- " WHEN 2 THEN 'INTERVAL YEAR
TO MONTH'\n"
- " WHEN 3 THEN 'INTERVAL
MONTH'\n"
- " END\n"
+ " CASE digits\n"
+ " WHEN 1 THEN 'INTERVAL YEAR'\n"
+ " WHEN 2 THEN 'INTERVAL YEAR TO
MONTH'\n"
+ " WHEN 3 THEN 'INTERVAL MONTH'\n"
+ " END\n"
" WHEN 'real' THEN\n"
- " CASE\n"
- " WHEN digits = 24 and tscale
= 0 THEN 'REAL'\n"
- " WHEN tscale = 0 THEN
'FLOAT(' || digits || ')'\n"
- " ELSE 'FLOAT(' || digits ||
',' || tscale || ')'\n"
- " END\n"
+ " CASE\n"
+ " WHEN digits = 24 and tscale = 0
THEN 'REAL'\n"
+ " WHEN tscale = 0 THEN 'FLOAT(' ||
digits || ')'\n"
+ " ELSE 'FLOAT(' || digits || ','
|| tscale || ')'\n"
+ " END\n"
" WHEN 'sec_interval' THEN\n"
- " CASE digits\n"
- " WHEN 4 THEN 'INTERVAL DAY'\n"
- " WHEN 5 THEN 'INTERVAL DAY TO
HOUR'\n"
- " WHEN 6 THEN 'INTERVAL DAY TO
MINUTE'\n"
- " WHEN 7 THEN 'INTERVAL DAY TO
SECOND'\n"
- " WHEN 8 THEN 'INTERVAL
HOUR'\n"
- " WHEN 9 THEN 'INTERVAL HOUR
TO MINUTE'\n"
- " WHEN 10 THEN 'INTERVAL HOUR
TO SECOND'\n"
- " WHEN 11 THEN 'INTERVAL
MINUTE'\n"
- " WHEN 12 THEN 'INTERVAL
MINUTE TO SECOND'\n"
- " WHEN 13 THEN 'INTERVAL
SECOND'\n"
- " END\n"
+ " CASE digits\n"
+ " WHEN 4 THEN 'INTERVAL DAY'\n"
+ " WHEN 5 THEN 'INTERVAL DAY TO
HOUR'\n"
+ " WHEN 6 THEN 'INTERVAL DAY TO
MINUTE'\n"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
