Changeset: 78871701baea for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/78871701baea
Modified Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Mar2025
Log Message:
Approve upgrade changes.
diffs (truncated from 1752 to 300 lines):
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -295,3 +295,70 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
delete from sys.privileges where (obj_id) not in (select id from (SELECT id
FROM sys.schemas UNION ALL SELECT id FROM sys._tables UNION ALL SELECT id FROM
sys._columns UNION ALL SELECT id FROM sys.functions) as t);
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ WRITE;
+INSERT INTO sys.table_types VALUES (31, 'LOCAL TEMPORARY VIEW');
+
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ ONLY;
+
+Running database upgrade commands:
+DROP VIEW information_schema.views CASCADE;
+DROP VIEW information_schema.tables CASCADE;
+CREATE VIEW INFORMATION_SCHEMA.TABLES AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ tt."table_type_name" AS TABLE_TYPE,
+ cast(NULL AS varchar(1)) AS SELF_REFERENCING_COLUMN_NAME,
+ cast(NULL AS varchar(1)) AS REFERENCE_GENERATION,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_CATALOG,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_SCHEMA,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_NAME,
+ cast(sys.ifthenelse((t."type" IN (0, 3, 7, 20, 30) AND t."access" IN (0,
2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TYPED,
+ cast((CASE t."commit_action" WHEN 1 THEN 'DELETE' WHEN 2 THEN 'PRESERVE'
WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS COMMIT_ACTION,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ st."count" AS row_count,
+ t."system" AS is_system,
+ sys.ifthenelse(t."type" IN (1, 11, 21, 31), TRUE, FALSE) AS is_view,
+ t."query" AS query_def,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ INNER JOIN sys."table_types" tt ON t."type" = tt."table_type_id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ LEFT OUTER JOIN (SELECT DISTINCT "schema", "table", "count" FROM
sys."statistics"()) st ON (s."name" = st."schema" AND t."name" = st."table")
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.TABLES TO PUBLIC WITH GRANT OPTION;
+CREATE VIEW INFORMATION_SCHEMA.VIEWS AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ t."query" AS VIEW_DEFINITION,
+ cast('NONE' AS varchar(10)) AS CHECK_OPTION,
+ cast('NO' AS varchar(3)) AS IS_UPDATABLE,
+ cast('NO' AS varchar(3)) AS INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ t."system" AS is_system,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ WHERE t."type" IN (1, 11, 21, 31)
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.VIEWS TO PUBLIC WITH GRANT OPTION;
+
+UPDATE sys._tables SET system = true where system <> true
+ and schema_id = (select s.id from sys.schemas s where s.name =
'information_schema')
+ and name in ('tables','views');
+
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -295,3 +295,70 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
delete from sys.privileges where (obj_id) not in (select id from (SELECT id
FROM sys.schemas UNION ALL SELECT id FROM sys._tables UNION ALL SELECT id FROM
sys._columns UNION ALL SELECT id FROM sys.functions) as t);
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ WRITE;
+INSERT INTO sys.table_types VALUES (31, 'LOCAL TEMPORARY VIEW');
+
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ ONLY;
+
+Running database upgrade commands:
+DROP VIEW information_schema.views CASCADE;
+DROP VIEW information_schema.tables CASCADE;
+CREATE VIEW INFORMATION_SCHEMA.TABLES AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ tt."table_type_name" AS TABLE_TYPE,
+ cast(NULL AS varchar(1)) AS SELF_REFERENCING_COLUMN_NAME,
+ cast(NULL AS varchar(1)) AS REFERENCE_GENERATION,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_CATALOG,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_SCHEMA,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_NAME,
+ cast(sys.ifthenelse((t."type" IN (0, 3, 7, 20, 30) AND t."access" IN (0,
2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TYPED,
+ cast((CASE t."commit_action" WHEN 1 THEN 'DELETE' WHEN 2 THEN 'PRESERVE'
WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS COMMIT_ACTION,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ st."count" AS row_count,
+ t."system" AS is_system,
+ sys.ifthenelse(t."type" IN (1, 11, 21, 31), TRUE, FALSE) AS is_view,
+ t."query" AS query_def,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ INNER JOIN sys."table_types" tt ON t."type" = tt."table_type_id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ LEFT OUTER JOIN (SELECT DISTINCT "schema", "table", "count" FROM
sys."statistics"()) st ON (s."name" = st."schema" AND t."name" = st."table")
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.TABLES TO PUBLIC WITH GRANT OPTION;
+CREATE VIEW INFORMATION_SCHEMA.VIEWS AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ t."query" AS VIEW_DEFINITION,
+ cast('NONE' AS varchar(10)) AS CHECK_OPTION,
+ cast('NO' AS varchar(3)) AS IS_UPDATABLE,
+ cast('NO' AS varchar(3)) AS INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ t."system" AS is_system,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ WHERE t."type" IN (1, 11, 21, 31)
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.VIEWS TO PUBLIC WITH GRANT OPTION;
+
+UPDATE sys._tables SET system = true where system <> true
+ and schema_id = (select s.id from sys.schemas s where s.name =
'information_schema')
+ and name in ('tables','views');
+
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -378,3 +378,70 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
delete from sys.privileges where (obj_id) not in (select id from (SELECT id
FROM sys.schemas UNION ALL SELECT id FROM sys._tables UNION ALL SELECT id FROM
sys._columns UNION ALL SELECT id FROM sys.functions) as t);
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ WRITE;
+INSERT INTO sys.table_types VALUES (31, 'LOCAL TEMPORARY VIEW');
+
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ ONLY;
+
+Running database upgrade commands:
+DROP VIEW information_schema.views CASCADE;
+DROP VIEW information_schema.tables CASCADE;
+CREATE VIEW INFORMATION_SCHEMA.TABLES AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ tt."table_type_name" AS TABLE_TYPE,
+ cast(NULL AS varchar(1)) AS SELF_REFERENCING_COLUMN_NAME,
+ cast(NULL AS varchar(1)) AS REFERENCE_GENERATION,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_CATALOG,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_SCHEMA,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_NAME,
+ cast(sys.ifthenelse((t."type" IN (0, 3, 7, 20, 30) AND t."access" IN (0,
2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TYPED,
+ cast((CASE t."commit_action" WHEN 1 THEN 'DELETE' WHEN 2 THEN 'PRESERVE'
WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS COMMIT_ACTION,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ st."count" AS row_count,
+ t."system" AS is_system,
+ sys.ifthenelse(t."type" IN (1, 11, 21, 31), TRUE, FALSE) AS is_view,
+ t."query" AS query_def,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ INNER JOIN sys."table_types" tt ON t."type" = tt."table_type_id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ LEFT OUTER JOIN (SELECT DISTINCT "schema", "table", "count" FROM
sys."statistics"()) st ON (s."name" = st."schema" AND t."name" = st."table")
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.TABLES TO PUBLIC WITH GRANT OPTION;
+CREATE VIEW INFORMATION_SCHEMA.VIEWS AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ t."query" AS VIEW_DEFINITION,
+ cast('NONE' AS varchar(10)) AS CHECK_OPTION,
+ cast('NO' AS varchar(3)) AS IS_UPDATABLE,
+ cast('NO' AS varchar(3)) AS INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ t."system" AS is_system,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ WHERE t."type" IN (1, 11, 21, 31)
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.VIEWS TO PUBLIC WITH GRANT OPTION;
+
+UPDATE sys._tables SET system = true where system <> true
+ and schema_id = (select s.id from sys.schemas s where s.name =
'information_schema')
+ and name in ('tables','views');
+
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -295,3 +295,70 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
delete from sys.privileges where (obj_id) not in (select id from (SELECT id
FROM sys.schemas UNION ALL SELECT id FROM sys._tables UNION ALL SELECT id FROM
sys._columns UNION ALL SELECT id FROM sys.functions) as t);
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ WRITE;
+INSERT INTO sys.table_types VALUES (31, 'LOCAL TEMPORARY VIEW');
+
+Running database upgrade commands:
+ALTER TABLE sys.table_types SET READ ONLY;
+
+Running database upgrade commands:
+DROP VIEW information_schema.views CASCADE;
+DROP VIEW information_schema.tables CASCADE;
+CREATE VIEW INFORMATION_SCHEMA.TABLES AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ tt."table_type_name" AS TABLE_TYPE,
+ cast(NULL AS varchar(1)) AS SELF_REFERENCING_COLUMN_NAME,
+ cast(NULL AS varchar(1)) AS REFERENCE_GENERATION,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_CATALOG,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_SCHEMA,
+ cast(NULL AS varchar(1)) AS USER_DEFINED_TYPE_NAME,
+ cast(sys.ifthenelse((t."type" IN (0, 3, 7, 20, 30) AND t."access" IN (0,
2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TYPED,
+ cast((CASE t."commit_action" WHEN 1 THEN 'DELETE' WHEN 2 THEN 'PRESERVE'
WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS COMMIT_ACTION,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ st."count" AS row_count,
+ t."system" AS is_system,
+ sys.ifthenelse(t."type" IN (1, 11, 21, 31), TRUE, FALSE) AS is_view,
+ t."query" AS query_def,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ INNER JOIN sys."table_types" tt ON t."type" = tt."table_type_id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ LEFT OUTER JOIN (SELECT DISTINCT "schema", "table", "count" FROM
sys."statistics"()) st ON (s."name" = st."schema" AND t."name" = st."table")
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.TABLES TO PUBLIC WITH GRANT OPTION;
+CREATE VIEW INFORMATION_SCHEMA.VIEWS AS SELECT
+ cast(NULL AS varchar(1)) AS TABLE_CATALOG,
+ s."name" AS TABLE_SCHEMA,
+ t."name" AS TABLE_NAME,
+ t."query" AS VIEW_DEFINITION,
+ cast('NONE' AS varchar(10)) AS CHECK_OPTION,
+ cast('NO' AS varchar(3)) AS IS_UPDATABLE,
+ cast('NO' AS varchar(3)) AS INSERTABLE_INTO,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE,
+ cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO,
+ -- MonetDB column extensions
+ t."schema_id" AS schema_id,
+ t."id" AS table_id,
+ t."type" AS table_type_id,
+ t."system" AS is_system,
+ cm."remark" AS comments
+ FROM sys."tables" t
+ INNER JOIN sys."schemas" s ON t."schema_id" = s."id"
+ LEFT OUTER JOIN sys."comments" cm ON t."id" = cm."id"
+ WHERE t."type" IN (1, 11, 21, 31)
+ ORDER BY s."name", t."name";
+GRANT SELECT ON TABLE INFORMATION_SCHEMA.VIEWS TO PUBLIC WITH GRANT OPTION;
+
+UPDATE sys._tables SET system = true where system <> true
+ and schema_id = (select s.id from sys.schemas s where s.name =
'information_schema')
+ and name in ('tables','views');
+
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -295,3 +295,70 @@ GRANT SELECT ON sys.geometry_columns TO
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
