Changeset: 078f07239154 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/078f07239154
Modified Files:
clients/Tests/MAL-signatures-hge.test
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.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/upgrade.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.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-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.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.int128
Branch: default
Log Message:
Fix and approve upgrade code.
diffs (truncated from 454 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -49879,6 +49879,11 @@ unsafe pattern sql.transaction_rollback(
SQLtransaction_rollback;
A transaction statement (type can be commit,release,rollback or start)
sql
+unclosed_result_sets
+pattern sql.unclosed_result_sets() (X_0:bat[:oid], X_1:bat[:int])
+sql_unclosed_result_sets;
+return query_id/res_id of unclosed result sets
+sql
unionfunc
pattern sql.unionfunc(X_0:str, X_1:str, X_2:any...):any...
SQLunionfunc;
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
@@ -4391,7 +4391,7 @@ sql_update_default(Client c, mvc *sql, s
")\n"
"external name sql.unclosed_result_sets;\n"
"grant execute on function sys.unclosed_result_sets()
to public;\n"
- "update sys.functions set system = true where system <>
true and schema_id = 2000 and name in ('vacuum', 'stop_vacuum');\n";
+ "update sys.functions set system = true where system <>
true and schema_id = 2000 and name in ('vacuum', 'stop_vacuum',
'unclosed_result_sets');\n";
printf("Running database upgrade commands:\n%s\n",
query);
fflush(stdout);
err = SQLstatementIntern(c, query, "update", true,
false, NULL);
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -513,5 +513,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -496,5 +496,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -579,5 +579,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -513,5 +513,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -496,5 +496,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -579,5 +579,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
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
@@ -7,5 +7,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
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
@@ -7,5 +7,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
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
@@ -90,5 +90,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
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
@@ -7,5 +7,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
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
@@ -7,5 +7,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
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
@@ -90,5 +90,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
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
@@ -2916,6 +2916,7 @@ select 'null in fkeys.delete_action', de
[ "sys.functions", "sys", "tracelog", "SYSTEM", "create
function sys.tracelog() returns table (ticks bigint, stmt string, event string)
external name sql.dump_trace;", "sql", "MAL", "Function returning a table",
false, false, false, true, NULL, "ticks", "bigint", 63,
0, "out", "stmt", "varchar", 0, 0, "out", "event",
"varchar", 0, 0, "out", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys.functions", "sys", "truncate", "SYSTEM", "stringleft",
"str", "Internal C", "Scalar function", false, false, false, false,
NULL, "res_0", "varchar", 0, 0, "out", "arg_1",
"varchar", 0, 0, "in", "arg_2", "int", 31, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "ucase", "SYSTEM", "toUpper",
"str", "Internal C", "Scalar function", false, false, false, false,
NULL, "res_0", "varchar", 0, 0, "out", "arg_1",
"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,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
+[ "sys.functions", "sys", "unclosed_result_sets", "SYSTEM", "create
function sys.unclosed_result_sets() returns table(\"query_id\" oid, \"res_id\"
int) external name sql.unclosed_result_sets;", "sql", "MAL", "Function
returning a table", false, false, false, true, NULL, "query_id",
"oid", 63, 0, "out", "res_id", "int", 31, 0, "out",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys.functions", "sys", "upper", "SYSTEM", "toUpper",
"str", "Internal C", "Scalar function", false, false, false, false,
NULL, "res_0", "varchar", 0, 0, "out", "arg_1",
"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,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "url_extract_host", "SYSTEM", "create
function sys.url_extract_host(url string, no_www bool) returns string external
name url.\"extractURLHost\";", "url", "MAL", "Scalar function", false,
false, false, true, NULL, "result", "varchar", 0, 0,
"out", "url", "varchar", 0, 0, "in", "no_www",
"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, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys.functions", "sys", "user_statistics", "SYSTEM", "create
function sys.user_statistics() returns table(username string, querycount
bigint, totalticks bigint, started timestamp, finished timestamp, maxticks
bigint, maxquery string) external name sysmon.user_statistics;", "sysmon",
"MAL", "Function returning a table", false, false, false, true,
NULL, "username", "varchar", 0, 0, "out", "querycount",
"bigint", 63, 0, "out", "totalticks", "bigint", 63,
0, "out", "started", "timestamp", 7, 0, "out",
"finished", "timestamp", 7, 0, "out", "maxticks",
"bigint", 63, 0, "out", "maxquery", "varchar", 0,
0, "out", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
@@ -5214,6 +5215,7 @@ select 'null in fkeys.delete_action', de
[ "grant on function", "sys", "timestamp_to_str", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "timestamp_to_str", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "tracelog", "public", "EXECUTE",
"monetdb", 0 ]
+[ "grant on function", "sys", "unclosed_result_sets", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "url_extract_host", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "uuid", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "uuid", "public", "EXECUTE",
"monetdb", 0 ]
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -533,5 +533,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -516,5 +516,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -599,5 +599,12 @@ create procedure sys.vacuum(sname string
external name sql.vacuum;
create procedure sys.stop_vacuum(sname string, tname string)
external name sql.stop_vacuum;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum');
+create function sys.unclosed_result_sets()
+returns table(
+ "query_id" oid,
+ "res_id" int
+)
+external name sql.unclosed_result_sets;
+grant execute on function sys.unclosed_result_sets() to public;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('vacuum', 'stop_vacuum', 'unclosed_result_sets');
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
