Changeset: 2ebb4c92692e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ebb4c92692e
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.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:
Backed out changeset 00d1a186e938: it removes too much.
diffs (truncated from 303 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
@@ -2548,14 +2548,6 @@ sql_update_default(Client c, mvc *sql, c
"update sys._tables set system = true where schema_id =
(select id from sys.schemas where name = 'sys')"
" and name = 'queue';\n");
- /* fix sql_privileges entries */
- pos += snprintf(buf + pos, bufsize - pos,
- "delete from \"privileges\" where\n"
- "\"obj_id\" not in (select \"id\" from \"functions\"
union select \"id\" from \"tables\" union select \"id\" from \"columns\" union
select \"id\" from \"schemas\")\n"
- "or (\"auth_id\",\"grantor\") not in (select
\"id\",\"id\" from \"auths\" union select 0,0);\n"
- "delete from \"auths\" where \"grantor\" not in (select
\"id\" from \"auths\" union select 0);\n"
- "delete from \"user_role\" where
(\"login_id\",\"role_id\") not in (select \"id\",\"id\" from \"auths\" union
select 0,0);\n");
-
/* 51_sys_schema_extensions */
pos += snprintf(buf + pos, bufsize - pos,
"ALTER TABLE sys.keywords SET READ WRITE;\n"
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
@@ -6045,11 +6045,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6045,11 +6045,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5258,11 +5258,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5258,11 +5258,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6089,11 +6089,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5258,11 +5258,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6089,11 +6089,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6045,11 +6045,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5258,11 +5258,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5258,11 +5258,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6089,11 +6089,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6045,11 +6045,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5257,11 +5257,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5257,11 +5257,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6088,11 +6088,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6045,11 +6045,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5258,11 +5258,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -5258,11 +5258,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
ALTER TABLE sys.keywords SET READ WRITE;
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');
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
@@ -6089,11 +6089,6 @@ external name sql.sysmon_stop;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
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';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables"
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id"
from "auths" union select 0,0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
