Changeset: 5c1d5b581176 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5c1d5b581176
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.32bit
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-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
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/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.32bit
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.32bit
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.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:
Merge with Sep2022 branch.
diffs (truncated from 615 to 300 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
@@ -5054,6 +5054,24 @@ sql_update_sep2022(Client c, mvc *sql)
}
}
+ /* 16_tracelog */
+ pos = snprintf(buf, bufsize, "select f.id from sys.schemas s,
sys.functions f, sys.auths a, sys.privileges p, sys.auths g, sys.function_types
ft, sys.privilege_codes pc where s.id = f.schema_id and f.id = p.obj_id and
p.auth_id = a.id and p.grantor = g.id and p.privileges = pc.privilege_code_id
and f.type = ft.function_type_id and s.name = 'sys' and f.name = 'tracelog' and
ft.function_type_keyword = 'FUNCTION';\n");
+ assert(pos < bufsize);
+ if ((err = SQLstatementIntern(c, buf, "update", true, false, &output)))
+ goto bailout;
+ if ((b = BBPquickdesc(output->cols[0].b)) && BATcount(b) == 0) {
+ pos = snprintf(buf, bufsize,
+ "grant execute on function
sys.tracelog to public;\n"
+ "grant select on sys.tracelog to
public;\n");
+ assert(pos < bufsize);
+ printf("Running database upgrade commands:\n%s\n", buf);
+ err = SQLstatementIntern(c, buf, "update", true, false, NULL);
+ }
+ res_table_destroy(output);
+ output = NULL;
+ if (err != MAL_SUCCEED)
+ return err;
+
bailout:
if (output)
res_table_destroy(output);
diff --git a/sql/scripts/16_tracelog.sql b/sql/scripts/16_tracelog.sql
--- a/sql/scripts/16_tracelog.sql
+++ b/sql/scripts/16_tracelog.sql
@@ -14,3 +14,6 @@ create function sys.tracelog()
external name sql.dump_trace;
create view sys.tracelog as select * from sys.tracelog();
+
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
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
@@ -4397,6 +4397,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -4397,6 +4397,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -4050,6 +4050,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -4050,6 +4050,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -4466,6 +4466,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -4050,6 +4050,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
---
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4466,6 +4466,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -4391,6 +4391,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -4044,6 +4044,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
@@ -4044,6 +4044,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -4460,6 +4460,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -3275,6 +3275,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -3275,6 +3275,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -2928,6 +2928,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -2928,6 +2928,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.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
@@ -3344,6 +3344,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -2928,6 +2928,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -3344,6 +3344,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
+Running database upgrade commands:
drop procedure if exists wlc.master();
drop procedure if exists wlc.master(string);
drop procedure if exists wlc.stop();
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
@@ -3269,6 +3269,10 @@ Running database upgrade commands:
ALTER TABLE sys.table_types SET READ ONLY;
Running database upgrade commands:
+grant execute on function sys.tracelog to public;
+grant select on sys.tracelog to public;
+
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
