Changeset: 26cd45909c40 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26cd45909c40
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64.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/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:
Fox upgrade of sys.var().
diffs (277 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2991,9 +2991,19 @@ sql_update_default(Client c, mvc *sql, c
"external name
\"sql\".\"sql_variables\";\n"
"grant execute on function
\"sys\".\"var\" to public;\n");
+ /* update system tables so that the content
+ * looks more like what it would be if sys.var
+ * had been defined by the C code in
+ * sql_create_env() */
pos += snprintf(buf + pos, bufsize - pos,
- "update sys.functions set system = true
where schema_id = (select id from sys.schemas where name = 'sys')"
- " and name = 'var' and type = %d;\n",
(int) F_UNION);
+ "update sys.functions set system =
true,"
+ //" func = 'CREATE FUNCTION
\"sys\".\"var\"() RETURNS TABLE(\"schema\" string, \"name\" string, \"type\"
string, \"value\" string) EXTERNAL NAME \"sql\".\"sql_variables\";',"
+ " language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = %d;\n"
+ "update sys.args set type = 'char'
where func_id = (select id from sys.functions where name = 'var' and schema_id
= (select id from sys.schemas where name = 'sys') and type = %d) and type =
'clob';\n"
+ "update sys.privileges set grantor = 0
where obj_id = (select id from sys.functions where name = 'var' and schema_id =
(select id from sys.schemas where name = 'sys') and type = %d);\n",
+ (int) F_UNION,
+ (int) F_UNION,
+ (int) F_UNION);
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", prev_schema);
assert(pos < bufsize);
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
@@ -54,7 +54,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -54,7 +54,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -54,7 +54,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -54,7 +54,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -6014,7 +6014,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -6014,7 +6014,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -59,7 +59,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -59,7 +59,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -59,7 +59,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
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
@@ -6019,7 +6019,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -54,7 +54,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -53,7 +53,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -53,7 +53,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -6013,7 +6013,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -59,7 +59,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -59,7 +59,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -59,7 +59,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -6019,7 +6019,9 @@ update sys._tables set system = true whe
drop function "sys"."var"();
create function "sys"."var"() returns table("schema" string, "name" string,
"type" string, "value" string) external name "sql"."sql_variables";
grant execute on function "sys"."var" to public;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'var' and type = 5;
+update sys.functions set system = true, language = 2, side_effect = false
where name = 'var' and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
+update sys.args set type = 'char' where func_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5) and type = 'clob';
+update sys.privileges set grantor = 0 where obj_id = (select id from
sys.functions where name = 'var' and schema_id = (select id from sys.schemas
where name = 'sys') and type = 5);
set schema "sys";
# MonetDB/SQL module loaded
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
