Changeset: 695b47d71f85 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=695b47d71f85
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (249 lines):
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
@@ -2472,7 +2472,7 @@ sql_update_oct2020(Client c, mvc *sql, c
/* 90_generator.sql */
pos += snprintf(buf + pos, bufsize - pos,
"create function
sys.generate_series(first timestamp, \"limit\" timestamp, stepsize interval
day) returns table (value timestamp)\n"
- " external name
\"generator\".\"series\";\n"
+ " external name generator.series;\n"
"update sys.functions set system = true
where system <> true and name in ('generate_series') and schema_id = (select id
from sys.schemas where name = 'sys') and type = %d;\n", (int) F_UNION);
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", prev_schema);
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4416,7 +4416,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -4416,7 +4416,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -3783,7 +3783,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3783,7 +3783,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4490,7 +4490,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -3783,7 +3783,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4490,7 +4490,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -4421,7 +4421,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade/Tests/All
b/sql/test/emptydb-upgrade/Tests/All
--- a/sql/test/emptydb-upgrade/Tests/All
+++ b/sql/test/emptydb-upgrade/Tests/All
@@ -1,4 +1,4 @@
HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY?unpackage
HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY?upgrade
HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY?dump
-KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP&HAVE_SHP?check
+HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP&HAVE_SHP?check
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -3788,7 +3788,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -3788,7 +3788,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -4495,7 +4495,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4416,7 +4416,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -3782,7 +3782,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3782,7 +3782,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4489,7 +4489,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -4421,7 +4421,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -3788,7 +3788,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -3788,7 +3788,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -4495,7 +4495,7 @@ create aggregate quantile(val INTERVAL D
GRANT EXECUTE ON AGGREGATE quantile(INTERVAL DAY, DOUBLE) TO PUBLIC;
update sys.functions set system = true where system <> true and name in
('median', 'quantile') and schema_id = (select id from sys.schemas where name =
'sys') and type = 3;
create function sys.generate_series(first timestamp, "limit" timestamp,
stepsize interval day) returns table (value timestamp)
- external name "generator"."series";
+ external name generator.series;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
set schema "sys";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
