Changeset: bb7df589c9f8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb7df589c9f8
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/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:
Approve upgrade.
diffs (truncated from 627 to 300 lines):
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
@@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -116,7 +125,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
---
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -116,7 +125,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
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
@@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -116,7 +125,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
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
@@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -116,7 +125,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
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
@@ -5999,8 +5999,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -6042,7 +6051,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -116,7 +125,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5999,8 +5999,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -6042,7 +6051,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
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
@@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -116,7 +125,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
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
@@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses
external name clients.setmemorylimit;
create procedure sys.stopsession("sessionid" int)
external name clients.stopsession;
-update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions' and type = 5;
-update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'sessions';
+create function sys.prepared_statements()
+returns table(
+"sessionid" int,
+"user" string,
+"statementid" int,
+"statement" string,
+"created" timestamp)
+ external name sql.prepared_statements;
+create view sys.prepared_statements as select * from sys.prepared_statements();
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements')
and type = 5;
+update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements');
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout',
'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer',
'stopsession') and type = 2;
create function sys.debug(flag string) returns integer
external name mdb."setDebug";
@@ -116,7 +125,8 @@ update sys.functions set system = true w
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
ALTER TABLE sys.keywords SET READ WRITE;
-insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS');
+DELETE FROM sys.keywords where "keyword" IN
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
+insert into sys.keywords values
('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE');
commit;
set schema "sys";
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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
