Changeset: f90d24a8ac52 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f90d24a8ac52
Modified Files:
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/url.mal
sql/backends/monet5/sql_upgrades.c
sql/scripts/12_url.sql
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Change function sys.isaurl to accept string instead of url.
This fixes bug 6785.
diffs (truncated from 458 to 300 lines):
diff --git a/monetdb5/modules/atoms/url.c b/monetdb5/modules/atoms/url.c
--- a/monetdb5/modules/atoms/url.c
+++ b/monetdb5/modules/atoms/url.c
@@ -685,7 +685,7 @@ URLgetUser(str *retval, url *val)
/* COMMAND "isaURL": Check conformity of the URL syntax
* SIGNATURE: isaURL(str) : bit; */
str
-URLisaURL(bit *retval, url *val)
+URLisaURL(bit *retval, str *val)
{
if (val == NULL || *val == NULL)
throw(ILLARG, "url.isaURL", "url missing");
diff --git a/monetdb5/modules/atoms/url.mal b/monetdb5/modules/atoms/url.mal
--- a/monetdb5/modules/atoms/url.mal
+++ b/monetdb5/modules/atoms/url.mal
@@ -77,7 +77,7 @@ command getRobotURL(u:url) :str
address URLgetRobotURL
comment "Extract the location of the robot control file";
-command isaURL(u:url) :bit
+command isaURL(u:str) :bit
address URLisaURL
comment "Check conformity of the URL syntax";
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
@@ -2378,6 +2378,15 @@ sql_update_default(Client c, mvc *sql, c
"update sys.functions set system = true where schema_id
= (select id from sys.schemas where name = 'sys')"
" and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = %d;\n", (int) F_PROC);
+ /* 12_url */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop function isaURL(url);\n"
+ "CREATE function isaURL(theUrl string) RETURNS BOOL\n"
+ " EXTERNAL NAME url.\"isaURL\";\n"
+ "GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;\n"
+ "update sys.functions set system = true where schema_id
= (select id from sys.schemas where name = 'sys')"
+ " and name = 'isaurl' and type = %d;\n", (int) F_FUNC);
+
/* 16_tracelog */
t = mvc_bind_table(sql, sys, "tracelog");
t->system = 0; /* make it non-system else the drop view will fail */
diff --git a/sql/scripts/12_url.sql b/sql/scripts/12_url.sql
--- a/sql/scripts/12_url.sql
+++ b/sql/scripts/12_url.sql
@@ -45,9 +45,9 @@ GRANT EXECUTE ON FUNCTION getUser(url) T
CREATE function getRobotURL(theUrl url) RETURNS STRING
EXTERNAL NAME url."getRobotURL";
GRANT EXECUTE ON FUNCTION getRobotURL(url) TO PUBLIC;
-CREATE function isaURL(theUrl url) RETURNS BOOL
+CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
-GRANT EXECUTE ON FUNCTION isaURL(url) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
CREATE function newurl(protocol STRING, hostname STRING, "port" INT, file
STRING)
RETURNS url
EXTERNAL NAME url."new";
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
@@ -5907,6 +5907,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
---
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -5907,6 +5907,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -5120,6 +5120,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -5120,6 +5120,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -5951,6 +5951,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -5120,6 +5120,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5951,6 +5951,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -5907,6 +5907,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -5120,6 +5120,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -5120,6 +5120,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -5951,6 +5951,11 @@ create procedure resume_log_flushing()
create procedure hot_snapshot(tarfile string)
external name sql.hot_snapshot;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('suspend_log_flushing',
'resume_log_flushing', 'hot_snapshot') and type = 2;
+drop function isaURL(url);
+CREATE function isaURL(theUrl string) RETURNS BOOL
+ EXTERNAL NAME url."isaURL";
+GRANT EXECUTE ON FUNCTION isaURL(string) TO PUBLIC;
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'isaurl' and type = 1;
drop view sys.tracelog;
drop function sys.tracelog();
create function sys.tracelog()
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
@@ -1059,7 +1059,7 @@ create filter function "ilike"(val strin
create filter function "ilike"(val string, pat string, esc string) external
name algebra."ilike";
create function sys.imprintsize(tpe varchar(1024), count bigint) returns
bigint begin if tpe in ('tinyint', 'boolean') then return cast(0.2 * count as
bigint); end if; if tpe = 'smallint' then return cast(0.4 * count as bigint);
end if; if tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval',
'month_interval') then return cast(0.8 * count as bigint); end if; if tpe in
('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid') then return
cast(1.6 * count as bigint); end if; if tpe in ('hugeint', 'decimal', 'uuid',
'mbr') then return cast(3.2 * count as bigint); end if; return 0; end;
create function internaltransform(geom geometry, srid_src integer, srid_dest
integer, proj4_src string, proj4_dest string) returns geometry external name
geom."Transform";
-create function isaurl(theurl url) returns bool external name url."isaURL";
+create function isaurl(theurl string) returns bool external name url."isaURL";
create function sys.isauuid(s string) returns boolean external name
uuid."isaUUID";
create function "left_shift"(i1 inet, i2 inet) returns boolean external name
inet."<<";
create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external
name inet."<<=";
@@ -2503,7 +2503,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "SYSTEM", "insert", "str",
"Internal C", "Scalar function", false, false, false, "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", "insert", "SYSTEM", "insert", "str",
"Internal C", "Scalar function", false, false, false, "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", "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,
"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", "isaurl", "SYSTEM", "create function isaurl(theurl
url) returns bool external name url.\"isaURL\";", "url", "MAL",
"Scalar function", false, false, false, "result", "boolean",
1, 0, "out", "theurl", "url", 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", "isaurl", "SYSTEM", "create function isaurl(theurl
string) returns bool external name url.\"isaURL\";", "url", "MAL",
"Scalar function", false, false, false, "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", "isauuid", "SYSTEM", "create function sys.isauuid(s
string) returns boolean external name uuid.\"isaUUID\";", "uuid", "MAL",
"Scalar function", false, false, false, "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 ]
[ "sys", "isnull", "SYSTEM", "isnil", "calc",
"Internal C", "Scalar function", false, false, false, "res_0",
"boolean", 1, 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", "lag", "SYSTEM", "lag", "sql", "Internal C",
"Analytic function", false, false, false, "res_0", "any", 0,
0, "out", "arg_1", "any", 0, 0, "in", "arg_2",
"bigint", 64, 0, "in", "arg_3", "any", 0, 0,
"in", "arg_4", "boolean", 1, 0, "in", "arg_5",
"boolean", 1, 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 ]
@@ -4687,7 +4687,6 @@ drop function pcre_replace(string, strin
[ "url", "url", "sys", "getuser", "TYPE" ]
[ "inet", "inet", "sys", "host", "TYPE" ]
[ "inet", "inet", "sys", "hostmask", "TYPE" ]
-[ "url", "url", "sys", "isaurl", "TYPE" ]
[ "inet", "inet", "sys", "left_shift", "TYPE" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE" ]
[ "inet", "inet", "sys", "masklen", "TYPE" ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -1063,7 +1063,7 @@ create filter function "ilike"(val strin
create filter function "ilike"(val string, pat string, esc string) external
name algebra."ilike";
create function sys.imprintsize(tpe varchar(1024), count bigint) returns
bigint begin if tpe in ('tinyint', 'boolean') then return cast(0.2 * count as
bigint); end if; if tpe = 'smallint' then return cast(0.4 * count as bigint);
end if; if tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval',
'month_interval') then return cast(0.8 * count as bigint); end if; if tpe in
('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid') then return
cast(1.6 * count as bigint); end if; if tpe in ('hugeint', 'decimal', 'uuid',
'mbr') then return cast(3.2 * count as bigint); end if; return 0; end;
create function internaltransform(geom geometry, srid_src integer, srid_dest
integer, proj4_src string, proj4_dest string) returns geometry external name
geom."Transform";
-create function isaurl(theurl url) returns bool external name url."isaURL";
+create function isaurl(theurl string) returns bool external name url."isaURL";
create function sys.isauuid(s string) returns boolean external name
uuid."isaUUID";
create function "left_shift"(i1 inet, i2 inet) returns boolean external name
inet."<<";
create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external
name inet."<<=";
@@ -2495,7 +2495,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "SYSTEM", "insert", "str",
"Internal C", "Scalar function", false, false, false, "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", "insert", "SYSTEM", "insert", "str",
"Internal C", "Scalar function", false, false, false, "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", "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,
"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", "isaurl", "SYSTEM", "create function isaurl(theurl
url) returns bool external name url.\"isaURL\";", "url", "MAL",
"Scalar function", false, false, false, "result", "boolean",
1, 0, "out", "theurl", "url", 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", "isaurl", "SYSTEM", "create function isaurl(theurl
string) returns bool external name url.\"isaURL\";", "url", "MAL",
"Scalar function", false, false, false, "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", "isauuid", "SYSTEM", "create function sys.isauuid(s
string) returns boolean external name uuid.\"isaUUID\";", "uuid", "MAL",
"Scalar function", false, false, false, "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 ]
[ "sys", "isnull", "SYSTEM", "isnil", "calc",
"Internal C", "Scalar function", false, false, false, "res_0",
"boolean", 1, 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", "lag", "SYSTEM", "lag", "sql", "Internal C",
"Analytic function", false, false, false, "res_0", "any", 0,
0, "out", "arg_1", "any", 0, 0, "in", "arg_2",
"bigint", 64, 0, "in", "arg_3", "any", 0, 0,
"in", "arg_4", "boolean", 1, 0, "in", "arg_5",
"boolean", 1, 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 ]
@@ -4670,7 +4670,6 @@ drop function pcre_replace(string, strin
[ "url", "url", "sys", "getuser", "TYPE" ]
[ "inet", "inet", "sys", "host", "TYPE" ]
[ "inet", "inet", "sys", "hostmask", "TYPE" ]
-[ "url", "url", "sys", "isaurl", "TYPE" ]
[ "inet", "inet", "sys", "left_shift", "TYPE" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE" ]
[ "inet", "inet", "sys", "masklen", "TYPE" ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -1063,7 +1063,7 @@ create filter function "ilike"(val strin
create filter function "ilike"(val string, pat string, esc string) external
name algebra."ilike";
create function sys.imprintsize(tpe varchar(1024), count bigint) returns
bigint begin if tpe in ('tinyint', 'boolean') then return cast(0.2 * count as
bigint); end if; if tpe = 'smallint' then return cast(0.4 * count as bigint);
end if; if tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval',
'month_interval') then return cast(0.8 * count as bigint); end if; if tpe in
('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid') then return
cast(1.6 * count as bigint); end if; if tpe in ('hugeint', 'decimal', 'uuid',
'mbr') then return cast(3.2 * count as bigint); end if; return 0; end;
create function internaltransform(geom geometry, srid_src integer, srid_dest
integer, proj4_src string, proj4_dest string) returns geometry external name
geom."Transform";
-create function isaurl(theurl url) returns bool external name url."isaURL";
+create function isaurl(theurl string) returns bool external name url."isaURL";
create function sys.isauuid(s string) returns boolean external name
uuid."isaUUID";
create function "left_shift"(i1 inet, i2 inet) returns boolean external name
inet."<<";
create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external
name inet."<<=";
@@ -2533,7 +2533,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "SYSTEM", "insert", "str",
"Internal C", "Scalar function", false, false, false, "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", "insert", "SYSTEM", "insert", "str",
"Internal C", "Scalar function", false, false, false, "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", "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,
"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", "isaurl", "SYSTEM", "create function isaurl(theurl
url) returns bool external name url.\"isaURL\";", "url", "MAL",
"Scalar function", false, false, false, "result", "boolean",
1, 0, "out", "theurl", "url", 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", "isaurl", "SYSTEM", "create function isaurl(theurl
string) returns bool external name url.\"isaURL\";", "url", "MAL",
"Scalar function", false, false, false, "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", "isauuid", "SYSTEM", "create function sys.isauuid(s
string) returns boolean external name uuid.\"isaUUID\";", "uuid", "MAL",
"Scalar function", false, false, false, "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 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
