Changeset: 2b223d498fe4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b223d498fe4
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
sql/backends/monet5/sql_upgrades.c
sql/scripts/45_uuid.sql
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Jun2016
Log Message:
Turn sys.isauuid into a Boolean returning function.
This fixes bug 3997.
diffs (truncated from 661 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -936,8 +936,8 @@ create filter function "ilike"(val strin
create function sys.imprintsize(i bigint, nme string) returns bigint begin if
nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme =
'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme =
'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 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 sys.isauuid(u uuid) returns uuid external name uuid."isaUUID";
-create function sys.isauuid(u string) returns uuid external name
uuid."isaUUID";
+create function sys.isauuid(u uuid) returns boolean begin return true; end;
+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."<<=";
create filter function "like"(val string, pat string, esc string) external
name algebra."like";
@@ -2032,8 +2032,8 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "insert", "str", 0, 1, false,
false, false ]
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u string) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false, false,
false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -3671,7 +3671,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "arg_1", "varchar", 0, 0,
1, "arg_2", "int", 32, 0, 1, "arg_3", "int",
32, 0, 1, "arg_4", "varchar", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 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", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, 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", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "u", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5320,7 +5320,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -936,8 +936,8 @@ create filter function "ilike"(val strin
create function sys.imprintsize(i bigint, nme string) returns bigint begin if
nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme =
'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme =
'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 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 sys.isauuid(u uuid) returns uuid external name uuid."isaUUID";
-create function sys.isauuid(u string) returns uuid external name
uuid."isaUUID";
+create function sys.isauuid(u uuid) returns boolean begin return true; end;
+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."<<=";
create filter function "like"(val string, pat string, esc string) external
name algebra."like";
@@ -2053,8 +2053,8 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "insert", "str", 0, 1, false,
false, false ]
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u string) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false, false,
false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -3880,7 +3880,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "arg_1", "varchar", 0, 0,
1, "arg_2", "int", 32, 0, 1, "arg_3", "int",
32, 0, 1, "arg_4", "varchar", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 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", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, 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", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "u", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5703,7 +5703,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
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
@@ -1276,6 +1276,25 @@ sql_update_jun2016(Client c, mvc *sql)
pos += snprintf(buf + pos, bufsize - pos,
"insert into sys.systemfunctions (select id from sys.functions
where name in ('bbp', 'malfunctions', 'flush_log', 'debug') and schema_id =
(select id from sys.schemas where name = 'sys') and id not in (select
function_id from sys.systemfunctions));\n");
+ /* 45_uuid.sql */
+ {
+ /* in previous updates, the functions
+ * sys.isauuid(string) was not created, so we can't
+ * always drop it here */
+ sql_subtype tp;
+ sql_find_subtype(&tp, "clob", 0, 0);
+ if (sql_bind_func(sql->sa, s, "isauuid", &tp, NULL, F_FUNC))
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop function sys.isaUUID(string);\n");
+ }
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop function sys.isaUUID(uuid);\n"
+ "create function sys.isaUUID(u uuid)\n"
+ "returns boolean begin return true; end;\n"
+ "create function sys.isaUUID(s string)\n"
+ "returns boolean external name uuid.\"isaUUID\";\n"
+ "insert into sys.systemfunctions (select id from
sys.functions where name = 'isauuid' and schema_id = (select id from
sys.schemas where name = 'sys') and id not in (select function_id from
sys.systemfunctions));\n");
+
/* 46_profiler.sql */
pos += snprintf(buf + pos, bufsize - pos,
"create schema profiler;\n"
diff --git a/sql/scripts/45_uuid.sql b/sql/scripts/45_uuid.sql
--- a/sql/scripts/45_uuid.sql
+++ b/sql/scripts/45_uuid.sql
@@ -14,7 +14,7 @@ create function sys.uuid()
returns uuid external name uuid."new";
create function sys.isaUUID(u uuid)
-returns uuid external name uuid."isaUUID";
+returns boolean begin return true; end;
-create function sys.isaUUID(u string)
-returns uuid external name uuid."isaUUID";
+create function sys.isaUUID(s string)
+returns boolean external name uuid."isaUUID";
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -862,8 +862,8 @@ create filter function "ilike"(val strin
create function sys.imprintsize(i bigint, nme string) returns bigint begin if
nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme =
'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme =
'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 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 sys.isauuid(u uuid) returns uuid external name uuid."isaUUID";
-create function sys.isauuid(u string) returns uuid external name
uuid."isaUUID";
+create function sys.isauuid(u uuid) returns boolean begin return true; end;
+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."<<=";
create filter function "like"(val string, pat string, esc string) external
name algebra."like";
@@ -1880,8 +1880,8 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "insert", "str", 0, 1, false,
false, false ]
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u string) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false, false,
false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -3686,7 +3686,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "arg_1", "varchar", 0, 0,
1, "arg_2", "int", 32, 0, 1, "arg_3", "int",
32, 0, 1, "arg_4", "varchar", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 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", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, 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", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "u", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5482,7 +5482,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
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
@@ -5616,6 +5616,12 @@ external name sql."flush_log";
create function sys.debug(debug int) returns integer
external name mdb."setDebug";
insert into sys.systemfunctions (select id from sys.functions where name in
('bbp', 'malfunctions', 'flush_log', 'debug') and schema_id = (select id from
sys.schemas where name = 'sys') and id not in (select function_id from
sys.systemfunctions));
+drop function sys.isaUUID(uuid);
+create function sys.isaUUID(u uuid)
+returns boolean begin return true; end;
+create function sys.isaUUID(s string)
+returns boolean external name uuid."isaUUID";
+insert into sys.systemfunctions (select id from sys.functions where name =
'isauuid' and schema_id = (select id from sys.schemas where name = 'sys') and
id not in (select function_id from sys.systemfunctions));
create schema profiler;
create procedure profiler.start() external name profiler."start";
create procedure profiler.stop() external name profiler.stop;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
@@ -858,8 +858,8 @@ create filter function "ilike"(val strin
create function sys.imprintsize(i bigint, nme string) returns bigint begin if
nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme =
'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme =
'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 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 sys.isauuid(u uuid) returns uuid external name uuid."isaUUID";
-create function sys.isauuid(u string) returns uuid external name
uuid."isaUUID";
+create function sys.isauuid(u uuid) returns boolean begin return true; end;
+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."<<=";
create filter function "like"(val string, pat string, esc string) external
name algebra."like";
@@ -1855,8 +1855,8 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "insert", "str", 0, 1, false,
false, false ]
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u string) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false, false,
false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -3473,7 +3473,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "arg_1", "varchar", 0, 0,
1, "arg_2", "int", 32, 0, 1, "arg_3", "int",
32, 0, 1, "arg_4", "varchar", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 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", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, 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", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "u", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5095,7 +5095,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
@@ -862,8 +862,8 @@ create filter function "ilike"(val strin
create function sys.imprintsize(i bigint, nme string) returns bigint begin if
nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme =
'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme =
'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 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 sys.isauuid(u uuid) returns uuid external name uuid."isaUUID";
-create function sys.isauuid(u string) returns uuid external name
uuid."isaUUID";
+create function sys.isauuid(u uuid) returns boolean begin return true; end;
+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."<<=";
create filter function "like"(val string, pat string, esc string) external
name algebra."like";
@@ -1880,8 +1880,8 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "insert", "str", 0, 1, false,
false, false ]
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u string) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false, false,
false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
uuid external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
+[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -3686,7 +3686,7 @@ drop function pcre_replace(string, strin
[ "sys", "insert", "arg_1", "varchar", 0, 0,
1, "arg_2", "int", 32, 0, 1, "arg_3", "int",
32, 0, 1, "arg_4", "varchar", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 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", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, 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", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "u", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, 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", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5482,7 +5482,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
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
@@ -4918,6 +4918,12 @@ external name sql."flush_log";
create function sys.debug(debug int) returns integer
external name mdb."setDebug";
insert into sys.systemfunctions (select id from sys.functions where name in
('bbp', 'malfunctions', 'flush_log', 'debug') and schema_id = (select id from
sys.schemas where name = 'sys') and id not in (select function_id from
sys.systemfunctions));
+drop function sys.isaUUID(uuid);
+create function sys.isaUUID(u uuid)
+returns boolean begin return true; end;
+create function sys.isaUUID(s string)
+returns boolean external name uuid."isaUUID";
+insert into sys.systemfunctions (select id from sys.functions where name =
'isauuid' and schema_id = (select id from sys.schemas where name = 'sys') and
id not in (select function_id from sys.systemfunctions));
create schema profiler;
create procedure profiler.start() external name profiler."start";
create procedure profiler.stop() external name profiler.stop;
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
@@ -5660,6 +5660,12 @@ external name sql."flush_log";
create function sys.debug(debug int) returns integer
external name mdb."setDebug";
insert into sys.systemfunctions (select id from sys.functions where name in
('bbp', 'malfunctions', 'flush_log', 'debug') and schema_id = (select id from
sys.schemas where name = 'sys') and id not in (select function_id from
sys.systemfunctions));
+drop function sys.isaUUID(uuid);
+create function sys.isaUUID(u uuid)
+returns boolean begin return true; end;
+create function sys.isaUUID(s string)
+returns boolean external name uuid."isaUUID";
+insert into sys.systemfunctions (select id from sys.functions where name =
'isauuid' and schema_id = (select id from sys.schemas where name = 'sys') and
id not in (select function_id from sys.systemfunctions));
create schema profiler;
create procedure profiler.start() external name profiler."start";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
