Changeset: 78b070926000 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/78b070926000
Branch: nilmask
Log Message:
merged with default
diffs (truncated from 416 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -54,7 +54,7 @@
# derivatives (CentOS, Scientific Linux), the geos library is not
# available. However, the geos library is available in the Extra
# Packages for Enterprise Linux (EPEL).
-%if %{fedpkgs}
+%if %{fedpkgs} && (0%{?rhel} != 7) && (0%{?rhel} != 8)
# By default create the MonetDB-geom-MonetDB5 package on Fedora and RHEL 7
%bcond_without geos
%endif
@@ -534,6 +534,7 @@ exit 0
%if %{with cintegration}
%{_libdir}/monetdb5/lib_capi.so
%endif
+%{_libdir}/monetdb5/lib_csv.so
%{_libdir}/monetdb5/lib_generator.so
%doc %{_mandir}/man1/mserver5.1.gz
%dir %{_datadir}/doc/MonetDB
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -4,4 +4,5 @@ debian/tmp/usr/lib/x86_64-linux-gnu/libm
# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT:
lib_{fits,geom,gsl,microbenchmark,opt_sql_append,pyapi*,rapi,sql,udf}.so
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_capi.so
usr/lib/x86_64-linux-gnu/monetdb5
+debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_csv.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_generator.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Fri Oct 20 2023 Panagiotis Koutsourakis <[email protected]>
+- Change how json is stored in the database: We now normalize json
+ strings after parsing, removing whitespace and eliminating duplicate
+ keys in objects.
+- The function json.filter now properly returns json scalars instead of
+ wrapping them in an array.
+
* Wed Sep 13 2023 Sjoerd Mullender <[email protected]>
- Removed the MAL tokenizer module. It was never usable from SQL and
in this form never would be.
diff --git a/monetdb5/ChangeLog.json-storage b/monetdb5/ChangeLog.json-storage
deleted file mode 100644
--- a/monetdb5/ChangeLog.json-storage
+++ /dev/null
@@ -1,10 +0,0 @@
-# ChangeLog file for monetdb5
-# This file is updated with Maddlog
-
-* Fri Oct 20 2023 Panagiotis Koutsourakis <[email protected]>
-- Change how json is stored in the database: We now normalize json
- strings after parsing, removing whitespace and eliminating duplicate
- keys in objects.
-- The function json.filter now properly returns json scalars instead of
- wrapping them in an array.
-
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
@@ -6315,6 +6315,8 @@ sql_update_default(Client c, mvc *sql, s
"RETURNS TABLE(\"table\" STRING, \"table_id\" INT,
\"rowcount\" BIGINT)\n"
"EXTERNAL NAME sql.persist_unlogged;\n"
"GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO
PUBLIC;\n"
+ "GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string)
TO PUBLIC;\n"
+ "GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string,
string) TO PUBLIC;\n"
"UPDATE sys.functions SET system = true WHERE system <>
true AND\n"
"name = 'persist_unlogged' AND schema_id = 2000;\n";
printf("Running database upgrade commands:\n%s\n", query);
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -753,6 +753,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -753,6 +753,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -822,6 +822,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -753,6 +753,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -753,6 +753,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -822,6 +822,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
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
@@ -393,6 +393,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
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
@@ -393,6 +393,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
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
@@ -462,6 +462,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
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
@@ -462,6 +462,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
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
@@ -393,6 +393,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
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
@@ -393,6 +393,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
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
@@ -462,6 +462,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -1885,9 +1885,6 @@ select 'null in fkeys.delete_action', de
[ "sys.functions", "sys", "insert", "SYSTEM", "insert",
"str", "Internal C", "Scalar function", false, false, false, false,
NULL, "res_0", "char", 0, 0, "out", "arg_1", "char",
0, 0, "in", "arg_2", "int", 32, 0, "in",
"arg_3", "int", 32, 0, "in", "arg_4", "char", 0,
0, "in", 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 ]
[ "sys.functions", "sys", "insert", "SYSTEM", "insert",
"str", "Internal C", "Scalar function", false, false, false, false,
NULL, "res_0", "clob", 0, 0, "out", "arg_1", "clob",
0, 0, "in", "arg_2", "int", 32, 0, "in",
"arg_3", "int", 32, 0, "in", "arg_4", "clob", 0,
0, "in", 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 ]
[ "sys.functions", "sys", "insert", "SYSTEM", "insert",
"str", "Internal C", "Scalar function", false, false, false, false,
NULL, "res_0", "varchar", 0, 0, "out", "arg_1",
"varchar", 0, 0, "in", "arg_2", "int", 32, 0,
"in", "arg_3", "int", 32, 0, "in", "arg_4",
"varchar", 0, 0, "in", 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
]
-[ "sys.functions", "sys", "persist_unlogged", "SYSTEM", "create
function sys.persist_unlogged() returns table(\"table\" string, \"table_id\"
int, \"rowcount\" bigint) external name sql.persist_unlogged;", "sql",
"MAL", "Function returning a table", true, false, false, true, NULL,
"table", "clob", 0, 0, "out", "table_id", "int", 32,
0, "out", "rowcount", "bigint", 64, 0, "out", 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, NULL,
NULL, NULL, NULL, NULL ]
-[ "sys.functions", "sys", "persist_unlogged", "SYSTEM", "create
function sys.persist_unlogged(sname string) returns table(\"table\" string,
\"table_id\" int, \"rowcount\" bigint) external name sql.persist_unlogged;",
"sql", "MAL", "Function returning a table", true, false, false,
true, NULL, "table", "clob", 0, 0, "out", "table_id",
"int", 32, 0, "out", "rowcount", "bigint", 64, 0,
"out", "sname", "clob", 0, 0, "in", 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 ]
-[ "sys.functions", "sys", "persist_unlogged", "SYSTEM", "create
function sys.persist_unlogged(sname string, tname string) returns
table(\"table\" string, \"table_id\" int, \"rowcount\" bigint) external name
sql.persist_unlogged;", "sql", "MAL", "Function returning a table", true,
false, false, true, NULL, "table", "clob", 0, 0, "out",
"table_id", "int", 32, 0, "out", "rowcount", "bigint",
64, 0, "out", "sname", "clob", 0, 0, "in",
"tname", "clob", 0, 0, "in", 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 ]
[ "sys.functions", "sys", "internaltransform", "SYSTEM", "create
function internaltransform(geom geometry, srid_src integer, srid_dest integer,
proj4_src string, proj4_dest string) returns geometry external name
geom.\"Transform\";", "geom", "MAL", "Scalar function", false,
false, false, true, NULL, "result", "geometry", 0, 0,
"out", "geom", "geometry", 0, 0, "in", "srid_src", "int",
32, 0, "in", "srid_dest", "int", 32, 0, "in",
"proj4_src", "clob", 0, 0, "in", "proj4_dest", "clob", 0,
0, "in", 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 ]
[ "sys.functions", "sys", "isaurl", "SYSTEM", "create
function isaurl(theurl string) returns bool external name url.\"isaURL\";",
"url", "MAL", "Scalar function", false, false, false, true, NULL,
"result", "boolean", 1, 0, "out", "theurl", "clob",
0, 0, "in", 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, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
[ "sys.functions", "sys", "isauuid", "SYSTEM", "create
function sys.isauuid(s string) returns boolean external name
uuid.\"isaUUID\";", "uuid", "MAL", "Scalar function", false,
false, false, true, NULL, "result", "boolean", 1, 0,
"out", "s", "clob", 0, 0, "in", 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, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL ]
@@ -2092,6 +2089,9 @@ select 'null in fkeys.delete_action', de
[ "sys.functions", "sys", "pause", "SYSTEM", "create
procedure sys.pause(tag bigint, username string) external name sysmon.pause;",
"sysmon", "MAL", "Procedure", true, false, false, true, NULL,
"tag", "bigint", 64, 0, "in", "username", "clob", 0,
0, "in", 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, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
[ "sys.functions", "sys", "pcre_replace", "", "create function
pcre_replace(origin string, pat string, repl string, flags string) returns
string external name pcre.replace;", "pcre", "MAL", "Scalar function",
false, false, false, true, NULL, "result", "clob", 0, 0,
"out", "origin", "clob", 0, 0, "in", "pat", "clob", 0,
0, "in", "repl", "clob", 0, 0, "in", "flags",
"clob", 0, 0, "in", 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 ]
[ "sys.functions", "sys", "percent_rank", "SYSTEM", "percent_rank",
"sql", "Internal C", "Analytic function", false, false, false, true,
NULL, "res_0", "double", 53, 0, "out", "arg_1",
"any", 0, 0, "in", 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, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL ]
+[ "sys.functions", "sys", "persist_unlogged", "SYSTEM", "create
function sys.persist_unlogged() returns table(\"table\" string, \"table_id\"
int, \"rowcount\" bigint) external name sql.persist_unlogged;", "sql",
"MAL", "Function returning a table", true, false, false, true, NULL,
"table", "clob", 0, 0, "out", "table_id", "int", 32,
0, "out", "rowcount", "bigint", 64, 0, "out", 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, NULL,
NULL, NULL, NULL, NULL ]
+[ "sys.functions", "sys", "persist_unlogged", "SYSTEM", "create
function sys.persist_unlogged(sname string) returns table(\"table\" string,
\"table_id\" int, \"rowcount\" bigint) external name sql.persist_unlogged;",
"sql", "MAL", "Function returning a table", true, false, false,
true, NULL, "table", "clob", 0, 0, "out", "table_id",
"int", 32, 0, "out", "rowcount", "bigint", 64, 0,
"out", "sname", "clob", 0, 0, "in", 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 ]
+[ "sys.functions", "sys", "persist_unlogged", "SYSTEM", "create
function sys.persist_unlogged(sname string, tname string) returns
table(\"table\" string, \"table_id\" int, \"rowcount\" bigint) external name
sql.persist_unlogged;", "sql", "MAL", "Function returning a table", true,
false, false, true, NULL, "table", "clob", 0, 0, "out",
"table_id", "int", 32, 0, "out", "rowcount", "bigint",
64, 0, "out", "sname", "clob", 0, 0, "in",
"tname", "clob", 0, 0, "in", 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 ]
[ "sys.functions", "sys", "pi", "SYSTEM", "pi", "mmath",
"Internal C", "Scalar function", false, false, false, false, NULL,
"res_0", "double", 53, 0, "out", 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, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
[ "sys.functions", "sys", "power", "SYSTEM", "pow",
"mmath", "Internal C", "Scalar function", false, false, false,
false, NULL, "res_0", "double", 53, 0, "out",
"arg_1", "double", 53, 0, "in", "arg_2",
"double", 53, 0, "in", 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, NULL, NULL, NULL, NULL, NULL
]
[ "sys.functions", "sys", "power", "SYSTEM", "pow",
"mmath", "Internal C", "Scalar function", false, false, false,
false, NULL, "res_0", "real", 24, 0, "out", "arg_1",
"real", 24, 0, "in", "arg_2", "real", 24, 0, "in",
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,
NULL, NULL, NULL, NULL, NULL ]
@@ -4656,9 +4656,6 @@ select 'null in fkeys.delete_action', de
[ "grant on function", "sys", "hostmask", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "hot_snapshot", ".snapshot", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "hot_snapshot", ".snapshot", "EXECUTE",
"monetdb", 0 ]
-[ "grant on function", "sys", "persist_unlogged", "public",
"EXECUTE", "monetdb", 0 ]
-[ "grant on function", "sys", "persist_unlogged", "public",
"EXECUTE", "monetdb", 0 ]
-[ "grant on function", "sys", "persist_unlogged", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "internaltransform", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "isaurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "isauuid", "public", "EXECUTE",
"monetdb", 0 ]
@@ -4705,6 +4702,9 @@ select 'null in fkeys.delete_action', de
[ "grant on function", "sys", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "pause", "public", "EXECUTE",
"monetdb", 0 ]
+[ "grant on function", "sys", "persist_unlogged", "public",
"EXECUTE", "monetdb", 0 ]
+[ "grant on function", "sys", "persist_unlogged", "public",
"EXECUTE", "monetdb", 0 ]
+[ "grant on function", "sys", "persist_unlogged", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "prepared_statements", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "prepared_statements_args", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "qgramnormalize", "public",
"EXECUTE", "monetdb", 0 ]
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -753,6 +753,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -753,6 +753,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
RETURNS TABLE("table" STRING, "table_id" INT, "rowcount" BIGINT)
EXTERNAL NAME sql.persist_unlogged;
GRANT EXECUTE ON FUNCTION sys.persist_unlogged() TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION sys.persist_unlogged(string, string) TO PUBLIC;
UPDATE sys.functions SET system = true WHERE system <> true AND
name = 'persist_unlogged' AND schema_id = 2000;
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -822,6 +822,8 @@ CREATE FUNCTION sys.persist_unlogged(sna
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
