Changeset: 696c593610a6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=696c593610a6
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/check.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/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade/Tests/check.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
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.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: Jul2017
Log Message:
Upgrade approvals.
diffs (truncated from 1047 to 300 lines):
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -1292,17 +1292,17 @@ drop function pcre_replace(string, strin
[ "sys", "columns", "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, 0 ]
[ "sys", "db_user_info", NULL, 0, true, 0, 0 ]
[ "sys", "dependencies", NULL, 0, true, 0, 0 ]
-[ "sys", "dependency_types", NULL, 0, true, 0, 0
]
+[ "sys", "dependency_types", NULL, 0, true, 0, 1
]
[ "sys", "environment", "create view sys.environment as select * from
sys.environment();", 1, true, 0, 0 ]
-[ "sys", "function_languages", NULL, 0, true, 0, 0
]
-[ "sys", "function_types", NULL, 0, true, 0, 0
]
+[ "sys", "function_languages", NULL, 0, true, 0, 1
]
+[ "sys", "function_types", NULL, 0, true, 0, 1
]
[ "sys", "functions", NULL, 0, true, 0, 0 ]
[ "sys", "geometry_columns", "create view geometry_columns as select
e.value as f_table_catalog, s.name as f_table_schema, y.f_table_name,
y.f_geometry_column, y.coord_dimension, y.srid, y.type from schemas s,
environment e, (select t.schema_id, t.name as f_table_name, x.name as
f_geometry_column, has_z(info)+has_m(info)+2 as coord_dimension, srid,
get_type(info, 0) as type from tables t, (select name, table_id, type_digits as
info, type_scale as srid from columns where type in (select distinct sqlname
from types where systemname='wkb')) as x where t.id=x.table_id) y where
y.schema_id=s.id and e.name='gdk_dbname';", 1, true, 0, 0
]
[ "sys", "idxs", NULL, 0, true, 0, 0 ]
-[ "sys", "index_types", NULL, 0, true, 0, 0 ]
-[ "sys", "key_types", NULL, 0, true, 0, 0 ]
+[ "sys", "index_types", NULL, 0, true, 0, 1 ]
+[ "sys", "key_types", NULL, 0, true, 0, 1 ]
[ "sys", "keys", NULL, 0, true, 0, 0 ]
-[ "sys", "keywords", NULL, 0, true, 0, 0 ]
+[ "sys", "keywords", NULL, 0, true, 0, 1 ]
[ "sys", "netcdf_attrs", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_dims", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_files", NULL, 0, true, 0, 0 ]
@@ -1310,7 +1310,7 @@ drop function pcre_replace(string, strin
[ "sys", "netcdf_vars", NULL, 0, true, 0, 0 ]
[ "sys", "objects", NULL, 0, true, 0, 0 ]
[ "sys", "optimizers", "create view sys.optimizers as select * from
sys.optimizers();", 1, true, 0, 0 ]
-[ "sys", "privilege_codes", NULL, 0, true, 0, 0
]
+[ "sys", "privilege_codes", NULL, 0, true, 0, 1
]
[ "sys", "privileges", NULL, 0, true, 0, 0 ]
[ "sys", "querylog_calls", "create view sys.querylog_calls as
select * from sys.querylog_calls();", 1, true, 0, 0 ]
[ "sys", "querylog_catalog", "create view sys.querylog_catalog as
select * from sys.querylog_catalog();", 1, true, 0, 0 ]
@@ -1326,7 +1326,7 @@ drop function pcre_replace(string, strin
[ "sys", "storagemodel", "create view sys.storagemodel as select * from
sys.storagemodel();", 1, true, 0, 0 ]
[ "sys", "storagemodelinput", NULL, 0, true, 0, 0
]
[ "sys", "systemfunctions", NULL, 0, true, 0, 0
]
-[ "sys", "table_types", NULL, 0, true, 0, 0 ]
+[ "sys", "table_types", NULL, 0, true, 0, 1 ]
[ "sys", "tables", "SELECT \"id\", \"name\", \"schema_id\",
\"query\", CAST(CASE WHEN \"system\" THEN \"type\" + 10 /* system table/view */
ELSE (CASE WHEN \"commit_action\" = 0 THEN \"type\" /* table/view */ ELSE
\"type\" + 20 /* global temp table */ END) END AS SMALLINT) AS \"type\",
\"system\", \"commit_action\", \"access\", CASE WHEN (NOT \"system\" AND
\"commit_action\" > 0) THEN 1 ELSE 0 END AS \"temporary\" FROM
\"sys\".\"_tables\" WHERE \"type\" <> 2 UNION ALL SELECT \"id\", \"name\",
\"schema_id\", \"query\", CAST(\"type\" + 30 /* local temp table */ AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", 1 AS
\"temporary\" FROM \"tmp\".\"_tables\";", 1, true, 0, 0 ]
[ "sys", "tablestoragemodel", "create view sys.tablestoragemodel as
select \"schema\",\"table\",max(count) as \"count\", sum(columnsize) as
columnsize, sum(heapsize) as heapsize, sum(hashes) as hashes, sum(\"imprints\")
as \"imprints\", sum(case when sorted = false then 8 * count else 0 end) as
auxiliary from sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, 0 ]
[ "sys", "tracelog", "create view sys.tracelog as select * from
sys.tracelog();", 1, true, 0, 0 ]
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
@@ -40,27 +40,34 @@ create procedure profiler.setlimit(lim i
drop procedure profiler.setpoolsize;
drop procedure profiler.setstream;
insert into sys.systemfunctions (select id from sys.functions where name in
('getlimit', 'setlimit') and schema_id = (select id from sys.schemas where name
= 'profiler') and id not in (select function_id from sys.systemfunctions));
+ALTER TABLE sys.keywords SET READ ONLY;
+ALTER TABLE sys.table_types SET READ ONLY;
+ALTER TABLE sys.dependency_types SET READ ONLY;
CREATE TABLE sys.function_types (
function_type_id SMALLINT NOT NULL PRIMARY KEY,
function_type_name VARCHAR(30) NOT NULL UNIQUE);
INSERT INTO sys.function_types (function_type_id, function_type_name) VALUES
(1, 'Scalar function'), (2, 'Procedure'), (3, 'Aggregate function'), (4,
'Filter function'), (5, 'Function returning a table'),
(6, 'Analytic function'), (7, 'Loader function');
+ALTER TABLE sys.function_types SET READ ONLY;
CREATE TABLE sys.function_languages (
language_id SMALLINT NOT NULL PRIMARY KEY,
language_name VARCHAR(20) NOT NULL UNIQUE);
INSERT INTO sys.function_languages (language_id, language_name) VALUES
(0, 'Internal C'), (1, 'MAL'), (2, 'SQL'), (3, 'R'), (4, 'C'), (5, 'Java'),
(6, 'Python'), (7, 'Python Mapped');
+ALTER TABLE sys.function_languages SET READ ONLY;
CREATE TABLE sys.key_types (
key_type_id SMALLINT NOT NULL PRIMARY KEY,
key_type_name VARCHAR(15) NOT NULL UNIQUE);
INSERT INTO sys.key_types (key_type_id, key_type_name) VALUES
(0, 'Primary Key'), (1, 'Unique Key'), (2, 'Foreign Key');
+ALTER TABLE sys.key_types SET READ ONLY;
CREATE TABLE sys.index_types (
index_type_id SMALLINT NOT NULL PRIMARY KEY,
index_type_name VARCHAR(25) NOT NULL UNIQUE);
INSERT INTO sys.index_types (index_type_id, index_type_name) VALUES
(0, 'Hash'), (1, 'Join'), (2, 'Order preserving hash'), (3, 'No-index'), (4,
'Imprint'), (5, 'Ordered');
+ALTER TABLE sys.index_types SET READ ONLY;
CREATE TABLE sys.privilege_codes (
privilege_code_id INT NOT NULL PRIMARY KEY,
privilege_code_name VARCHAR(30) NOT NULL UNIQUE);
@@ -69,6 +76,7 @@ INSERT INTO sys.privilege_codes (privile
(3, 'SELECT,UPDATE'), (5, 'SELECT,INSERT'), (6, 'INSERT,UPDATE'), (7,
'SELECT,INSERT,UPDATE'),
(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'),
(12, 'INSERT,DELETE'),
(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15,
'SELECT,INSERT,UPDATE,DELETE');
+ALTER TABLE sys.privilege_codes SET READ ONLY;
update sys._tables set system = true where name in ('function_languages',
'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id
= (select id from sys.schemas where name = 'sys');
delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
set schema "sys";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
@@ -1278,17 +1278,17 @@ drop function pcre_replace(string, strin
[ "sys", "columns", "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, 0 ]
[ "sys", "db_user_info", NULL, 0, true, 0, 0 ]
[ "sys", "dependencies", NULL, 0, true, 0, 0 ]
-[ "sys", "dependency_types", NULL, 0, true, 0, 0
]
+[ "sys", "dependency_types", NULL, 0, true, 0, 1
]
[ "sys", "environment", "create view sys.environment as select * from
sys.environment();", 1, true, 0, 0 ]
-[ "sys", "function_languages", NULL, 0, true, 0, 0
]
-[ "sys", "function_types", NULL, 0, true, 0, 0
]
+[ "sys", "function_languages", NULL, 0, true, 0, 1
]
+[ "sys", "function_types", NULL, 0, true, 0, 1
]
[ "sys", "functions", NULL, 0, true, 0, 0 ]
[ "sys", "geometry_columns", "create view geometry_columns as select
e.value as f_table_catalog, s.name as f_table_schema, y.f_table_name,
y.f_geometry_column, y.coord_dimension, y.srid, y.type from schemas s,
environment e, (select t.schema_id, t.name as f_table_name, x.name as
f_geometry_column, has_z(info)+has_m(info)+2 as coord_dimension, srid,
get_type(info, 0) as type from tables t, (select name, table_id, type_digits as
info, type_scale as srid from columns where type in (select distinct sqlname
from types where systemname='wkb')) as x where t.id=x.table_id) y where
y.schema_id=s.id and e.name='gdk_dbname';", 1, true, 0, 0
]
[ "sys", "idxs", NULL, 0, true, 0, 0 ]
-[ "sys", "index_types", NULL, 0, true, 0, 0 ]
-[ "sys", "key_types", NULL, 0, true, 0, 0 ]
+[ "sys", "index_types", NULL, 0, true, 0, 1 ]
+[ "sys", "key_types", NULL, 0, true, 0, 1 ]
[ "sys", "keys", NULL, 0, true, 0, 0 ]
-[ "sys", "keywords", NULL, 0, true, 0, 0 ]
+[ "sys", "keywords", NULL, 0, true, 0, 1 ]
[ "sys", "netcdf_attrs", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_dims", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_files", NULL, 0, true, 0, 0 ]
@@ -1296,7 +1296,7 @@ drop function pcre_replace(string, strin
[ "sys", "netcdf_vars", NULL, 0, true, 0, 0 ]
[ "sys", "objects", NULL, 0, true, 0, 0 ]
[ "sys", "optimizers", "create view sys.optimizers as select * from
sys.optimizers();", 1, true, 0, 0 ]
-[ "sys", "privilege_codes", NULL, 0, true, 0, 0
]
+[ "sys", "privilege_codes", NULL, 0, true, 0, 1
]
[ "sys", "privileges", NULL, 0, true, 0, 0 ]
[ "sys", "querylog_calls", "create view sys.querylog_calls as
select * from sys.querylog_calls();", 1, true, 0, 0 ]
[ "sys", "querylog_catalog", "create view sys.querylog_catalog as
select * from sys.querylog_catalog();", 1, true, 0, 0 ]
@@ -1312,7 +1312,7 @@ drop function pcre_replace(string, strin
[ "sys", "storagemodel", "create view sys.storagemodel as select * from
sys.storagemodel();", 1, true, 0, 0 ]
[ "sys", "storagemodelinput", NULL, 0, true, 0, 0
]
[ "sys", "systemfunctions", NULL, 0, true, 0, 0
]
-[ "sys", "table_types", NULL, 0, true, 0, 0 ]
+[ "sys", "table_types", NULL, 0, true, 0, 1 ]
[ "sys", "tables", "SELECT \"id\", \"name\", \"schema_id\",
\"query\", CAST(CASE WHEN \"system\" THEN \"type\" + 10 /* system table/view */
ELSE (CASE WHEN \"commit_action\" = 0 THEN \"type\" /* table/view */ ELSE
\"type\" + 20 /* global temp table */ END) END AS SMALLINT) AS \"type\",
\"system\", \"commit_action\", \"access\", CASE WHEN (NOT \"system\" AND
\"commit_action\" > 0) THEN 1 ELSE 0 END AS \"temporary\" FROM
\"sys\".\"_tables\" WHERE \"type\" <> 2 UNION ALL SELECT \"id\", \"name\",
\"schema_id\", \"query\", CAST(\"type\" + 30 /* local temp table */ AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", 1 AS
\"temporary\" FROM \"tmp\".\"_tables\";", 1, true, 0, 0 ]
[ "sys", "tablestoragemodel", "create view sys.tablestoragemodel as
select \"schema\",\"table\",max(count) as \"count\", sum(columnsize) as
columnsize, sum(heapsize) as heapsize, sum(hashes) as hashes, sum(\"imprints\")
as \"imprints\", sum(case when sorted = false then 8 * count else 0 end) as
auxiliary from sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, 0 ]
[ "sys", "tracelog", "create view sys.tracelog as select * from
sys.tracelog();", 1, true, 0, 0 ]
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
@@ -1282,17 +1282,17 @@ drop function pcre_replace(string, strin
[ "sys", "columns", "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, 0 ]
[ "sys", "db_user_info", NULL, 0, true, 0, 0 ]
[ "sys", "dependencies", NULL, 0, true, 0, 0 ]
-[ "sys", "dependency_types", NULL, 0, true, 0, 0
]
+[ "sys", "dependency_types", NULL, 0, true, 0, 1
]
[ "sys", "environment", "create view sys.environment as select * from
sys.environment();", 1, true, 0, 0 ]
-[ "sys", "function_languages", NULL, 0, true, 0, 0
]
-[ "sys", "function_types", NULL, 0, true, 0, 0
]
+[ "sys", "function_languages", NULL, 0, true, 0, 1
]
+[ "sys", "function_types", NULL, 0, true, 0, 1
]
[ "sys", "functions", NULL, 0, true, 0, 0 ]
[ "sys", "geometry_columns", "create view geometry_columns as select
e.value as f_table_catalog, s.name as f_table_schema, y.f_table_name,
y.f_geometry_column, y.coord_dimension, y.srid, y.type from schemas s,
environment e, (select t.schema_id, t.name as f_table_name, x.name as
f_geometry_column, has_z(info)+has_m(info)+2 as coord_dimension, srid,
get_type(info, 0) as type from tables t, (select name, table_id, type_digits as
info, type_scale as srid from columns where type in (select distinct sqlname
from types where systemname='wkb')) as x where t.id=x.table_id) y where
y.schema_id=s.id and e.name='gdk_dbname';", 1, true, 0, 0
]
[ "sys", "idxs", NULL, 0, true, 0, 0 ]
-[ "sys", "index_types", NULL, 0, true, 0, 0 ]
-[ "sys", "key_types", NULL, 0, true, 0, 0 ]
+[ "sys", "index_types", NULL, 0, true, 0, 1 ]
+[ "sys", "key_types", NULL, 0, true, 0, 1 ]
[ "sys", "keys", NULL, 0, true, 0, 0 ]
-[ "sys", "keywords", NULL, 0, true, 0, 0 ]
+[ "sys", "keywords", NULL, 0, true, 0, 1 ]
[ "sys", "netcdf_attrs", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_dims", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_files", NULL, 0, true, 0, 0 ]
@@ -1300,7 +1300,7 @@ drop function pcre_replace(string, strin
[ "sys", "netcdf_vars", NULL, 0, true, 0, 0 ]
[ "sys", "objects", NULL, 0, true, 0, 0 ]
[ "sys", "optimizers", "create view sys.optimizers as select * from
sys.optimizers();", 1, true, 0, 0 ]
-[ "sys", "privilege_codes", NULL, 0, true, 0, 0
]
+[ "sys", "privilege_codes", NULL, 0, true, 0, 1
]
[ "sys", "privileges", NULL, 0, true, 0, 0 ]
[ "sys", "querylog_calls", "create view sys.querylog_calls as
select * from sys.querylog_calls();", 1, true, 0, 0 ]
[ "sys", "querylog_catalog", "create view sys.querylog_catalog as
select * from sys.querylog_catalog();", 1, true, 0, 0 ]
@@ -1316,7 +1316,7 @@ drop function pcre_replace(string, strin
[ "sys", "storagemodel", "create view sys.storagemodel as select * from
sys.storagemodel();", 1, true, 0, 0 ]
[ "sys", "storagemodelinput", NULL, 0, true, 0, 0
]
[ "sys", "systemfunctions", NULL, 0, true, 0, 0
]
-[ "sys", "table_types", NULL, 0, true, 0, 0 ]
+[ "sys", "table_types", NULL, 0, true, 0, 1 ]
[ "sys", "tables", "SELECT \"id\", \"name\", \"schema_id\",
\"query\", CAST(CASE WHEN \"system\" THEN \"type\" + 10 /* system table/view */
ELSE (CASE WHEN \"commit_action\" = 0 THEN \"type\" /* table/view */ ELSE
\"type\" + 20 /* global temp table */ END) END AS SMALLINT) AS \"type\",
\"system\", \"commit_action\", \"access\", CASE WHEN (NOT \"system\" AND
\"commit_action\" > 0) THEN 1 ELSE 0 END AS \"temporary\" FROM
\"sys\".\"_tables\" WHERE \"type\" <> 2 UNION ALL SELECT \"id\", \"name\",
\"schema_id\", \"query\", CAST(\"type\" + 30 /* local temp table */ AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", 1 AS
\"temporary\" FROM \"tmp\".\"_tables\";", 1, true, 0, 0 ]
[ "sys", "tablestoragemodel", "create view sys.tablestoragemodel as
select \"schema\",\"table\",max(count) as \"count\", sum(columnsize) as
columnsize, sum(heapsize) as heapsize, sum(hashes) as hashes, sum(\"imprints\")
as \"imprints\", sum(case when sorted = false then 8 * count else 0 end) as
auxiliary from sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, 0 ]
[ "sys", "tracelog", "create view sys.tracelog as select * from
sys.tracelog();", 1, true, 0, 0 ]
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
@@ -1292,17 +1292,17 @@ drop function pcre_replace(string, strin
[ "sys", "columns", "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, 0 ]
[ "sys", "db_user_info", NULL, 0, true, 0, 0 ]
[ "sys", "dependencies", NULL, 0, true, 0, 0 ]
-[ "sys", "dependency_types", NULL, 0, true, 0, 0
]
+[ "sys", "dependency_types", NULL, 0, true, 0, 1
]
[ "sys", "environment", "create view sys.environment as select * from
sys.environment();", 1, true, 0, 0 ]
-[ "sys", "function_languages", NULL, 0, true, 0, 0
]
-[ "sys", "function_types", NULL, 0, true, 0, 0
]
+[ "sys", "function_languages", NULL, 0, true, 0, 1
]
+[ "sys", "function_types", NULL, 0, true, 0, 1
]
[ "sys", "functions", NULL, 0, true, 0, 0 ]
[ "sys", "geometry_columns", "create view geometry_columns as select
e.value as f_table_catalog, s.name as f_table_schema, y.f_table_name,
y.f_geometry_column, y.coord_dimension, y.srid, y.type from schemas s,
environment e, (select t.schema_id, t.name as f_table_name, x.name as
f_geometry_column, has_z(info)+has_m(info)+2 as coord_dimension, srid,
get_type(info, 0) as type from tables t, (select name, table_id, type_digits as
info, type_scale as srid from columns where type in (select distinct sqlname
from types where systemname='wkb')) as x where t.id=x.table_id) y where
y.schema_id=s.id and e.name='gdk_dbname';", 1, true, 0, 0
]
[ "sys", "idxs", NULL, 0, true, 0, 0 ]
-[ "sys", "index_types", NULL, 0, true, 0, 0 ]
-[ "sys", "key_types", NULL, 0, true, 0, 0 ]
+[ "sys", "index_types", NULL, 0, true, 0, 1 ]
+[ "sys", "key_types", NULL, 0, true, 0, 1 ]
[ "sys", "keys", NULL, 0, true, 0, 0 ]
-[ "sys", "keywords", NULL, 0, true, 0, 0 ]
+[ "sys", "keywords", NULL, 0, true, 0, 1 ]
[ "sys", "netcdf_attrs", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_dims", NULL, 0, true, 0, 0 ]
[ "sys", "netcdf_files", NULL, 0, true, 0, 0 ]
@@ -1310,7 +1310,7 @@ drop function pcre_replace(string, strin
[ "sys", "netcdf_vars", NULL, 0, true, 0, 0 ]
[ "sys", "objects", NULL, 0, true, 0, 0 ]
[ "sys", "optimizers", "create view sys.optimizers as select * from
sys.optimizers();", 1, true, 0, 0 ]
-[ "sys", "privilege_codes", NULL, 0, true, 0, 0
]
+[ "sys", "privilege_codes", NULL, 0, true, 0, 1
]
[ "sys", "privileges", NULL, 0, true, 0, 0 ]
[ "sys", "querylog_calls", "create view sys.querylog_calls as
select * from sys.querylog_calls();", 1, true, 0, 0 ]
[ "sys", "querylog_catalog", "create view sys.querylog_catalog as
select * from sys.querylog_catalog();", 1, true, 0, 0 ]
@@ -1326,7 +1326,7 @@ drop function pcre_replace(string, strin
[ "sys", "storagemodel", "create view sys.storagemodel as select * from
sys.storagemodel();", 1, true, 0, 0 ]
[ "sys", "storagemodelinput", NULL, 0, true, 0, 0
]
[ "sys", "systemfunctions", NULL, 0, true, 0, 0
]
-[ "sys", "table_types", NULL, 0, true, 0, 0 ]
+[ "sys", "table_types", NULL, 0, true, 0, 1 ]
[ "sys", "tables", "SELECT \"id\", \"name\", \"schema_id\",
\"query\", CAST(CASE WHEN \"system\" THEN \"type\" + 10 /* system table/view */
ELSE (CASE WHEN \"commit_action\" = 0 THEN \"type\" /* table/view */ ELSE
\"type\" + 20 /* global temp table */ END) END AS SMALLINT) AS \"type\",
\"system\", \"commit_action\", \"access\", CASE WHEN (NOT \"system\" AND
\"commit_action\" > 0) THEN 1 ELSE 0 END AS \"temporary\" FROM
\"sys\".\"_tables\" WHERE \"type\" <> 2 UNION ALL SELECT \"id\", \"name\",
\"schema_id\", \"query\", CAST(\"type\" + 30 /* local temp table */ AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", 1 AS
\"temporary\" FROM \"tmp\".\"_tables\";", 1, true, 0, 0 ]
[ "sys", "tablestoragemodel", "create view sys.tablestoragemodel as
select \"schema\",\"table\",max(count) as \"count\", sum(columnsize) as
columnsize, sum(heapsize) as heapsize, sum(hashes) as hashes, sum(\"imprints\")
as \"imprints\", sum(case when sorted = false then 8 * count else 0 end) as
auxiliary from sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, 0 ]
[ "sys", "tracelog", "create view sys.tracelog as select * from
sys.tracelog();", 1, true, 0, 0 ]
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
@@ -40,27 +40,34 @@ create procedure profiler.setlimit(lim i
drop procedure profiler.setpoolsize;
drop procedure profiler.setstream;
insert into sys.systemfunctions (select id from sys.functions where name in
('getlimit', 'setlimit') and schema_id = (select id from sys.schemas where name
= 'profiler') and id not in (select function_id from sys.systemfunctions));
+ALTER TABLE sys.keywords SET READ ONLY;
+ALTER TABLE sys.table_types SET READ ONLY;
+ALTER TABLE sys.dependency_types SET READ ONLY;
CREATE TABLE sys.function_types (
function_type_id SMALLINT NOT NULL PRIMARY KEY,
function_type_name VARCHAR(30) NOT NULL UNIQUE);
INSERT INTO sys.function_types (function_type_id, function_type_name) VALUES
(1, 'Scalar function'), (2, 'Procedure'), (3, 'Aggregate function'), (4,
'Filter function'), (5, 'Function returning a table'),
(6, 'Analytic function'), (7, 'Loader function');
+ALTER TABLE sys.function_types SET READ ONLY;
CREATE TABLE sys.function_languages (
language_id SMALLINT NOT NULL PRIMARY KEY,
language_name VARCHAR(20) NOT NULL UNIQUE);
INSERT INTO sys.function_languages (language_id, language_name) VALUES
(0, 'Internal C'), (1, 'MAL'), (2, 'SQL'), (3, 'R'), (4, 'C'), (5, 'Java'),
(6, 'Python'), (7, 'Python Mapped');
+ALTER TABLE sys.function_languages SET READ ONLY;
CREATE TABLE sys.key_types (
key_type_id SMALLINT NOT NULL PRIMARY KEY,
key_type_name VARCHAR(15) NOT NULL UNIQUE);
INSERT INTO sys.key_types (key_type_id, key_type_name) VALUES
(0, 'Primary Key'), (1, 'Unique Key'), (2, 'Foreign Key');
+ALTER TABLE sys.key_types SET READ ONLY;
CREATE TABLE sys.index_types (
index_type_id SMALLINT NOT NULL PRIMARY KEY,
index_type_name VARCHAR(25) NOT NULL UNIQUE);
INSERT INTO sys.index_types (index_type_id, index_type_name) VALUES
(0, 'Hash'), (1, 'Join'), (2, 'Order preserving hash'), (3, 'No-index'), (4,
'Imprint'), (5, 'Ordered');
+ALTER TABLE sys.index_types SET READ ONLY;
CREATE TABLE sys.privilege_codes (
privilege_code_id INT NOT NULL PRIMARY KEY,
privilege_code_name VARCHAR(30) NOT NULL UNIQUE);
@@ -69,6 +76,7 @@ INSERT INTO sys.privilege_codes (privile
(3, 'SELECT,UPDATE'), (5, 'SELECT,INSERT'), (6, 'INSERT,UPDATE'), (7,
'SELECT,INSERT,UPDATE'),
(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'),
(12, 'INSERT,DELETE'),
(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15,
'SELECT,INSERT,UPDATE,DELETE');
+ALTER TABLE sys.privilege_codes SET READ ONLY;
update sys._tables set system = true where name in ('function_languages',
'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id
= (select id from sys.schemas where name = 'sys');
delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
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
@@ -5262,27 +5262,34 @@ create procedure profiler.setlimit(lim i
drop procedure profiler.setpoolsize;
drop procedure profiler.setstream;
insert into sys.systemfunctions (select id from sys.functions where name in
('getlimit', 'setlimit') and schema_id = (select id from sys.schemas where name
= 'profiler') and id not in (select function_id from sys.systemfunctions));
+ALTER TABLE sys.keywords SET READ ONLY;
+ALTER TABLE sys.table_types SET READ ONLY;
+ALTER TABLE sys.dependency_types SET READ ONLY;
CREATE TABLE sys.function_types (
function_type_id SMALLINT NOT NULL PRIMARY KEY,
function_type_name VARCHAR(30) NOT NULL UNIQUE);
INSERT INTO sys.function_types (function_type_id, function_type_name) VALUES
(1, 'Scalar function'), (2, 'Procedure'), (3, 'Aggregate function'), (4,
'Filter function'), (5, 'Function returning a table'),
(6, 'Analytic function'), (7, 'Loader function');
+ALTER TABLE sys.function_types SET READ ONLY;
CREATE TABLE sys.function_languages (
language_id SMALLINT NOT NULL PRIMARY KEY,
language_name VARCHAR(20) NOT NULL UNIQUE);
INSERT INTO sys.function_languages (language_id, language_name) VALUES
(0, 'Internal C'), (1, 'MAL'), (2, 'SQL'), (3, 'R'), (4, 'C'), (5, 'Java'),
(6, 'Python'), (7, 'Python Mapped');
+ALTER TABLE sys.function_languages SET READ ONLY;
CREATE TABLE sys.key_types (
key_type_id SMALLINT NOT NULL PRIMARY KEY,
key_type_name VARCHAR(15) NOT NULL UNIQUE);
INSERT INTO sys.key_types (key_type_id, key_type_name) VALUES
(0, 'Primary Key'), (1, 'Unique Key'), (2, 'Foreign Key');
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
