Changeset: 7b4c6037b13f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b4c6037b13f Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out 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.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 656 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 @@ -4385,6 +4385,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -4385,6 +4385,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; 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 @@ -3790,6 +3790,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; 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 @@ -3790,6 +3790,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; 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 @@ -4459,6 +4459,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 @@ -3790,6 +3790,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 @@ -4459,6 +4459,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; 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 @@ -4385,6 +4385,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; 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 @@ -3790,6 +3790,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; 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 @@ -3790,6 +3790,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; 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 @@ -4459,6 +4459,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -873,7 +873,7 @@ CREATE TABLE "sys"."_tables" ("id" INTEG CREATE TABLE "sys"."args" ("id" INTEGER, "func_id" INTEGER, "name" VARCHAR(256), "type" VARCHAR(1024), "type_digits" INTEGER, "type_scale" INTEGER, "inout" TINYINT, "number" INTEGER); CREATE TABLE "sys"."auths" ("id" INTEGER, "name" VARCHAR(1024), "grantor" INTEGER); CREATE TABLE "sys"."comments" ("id" INTEGER NOT NULL, "remark" VARCHAR(65000) NOT NULL, CONSTRAINT "comments_id_pkey" PRIMARY KEY ("id")); -CREATE TABLE "sys"."db_user_info" ("name" VARCHAR(1024), "fullname" VARCHAR(2048), "default_schema" INTEGER); +CREATE TABLE "sys"."db_user_info" ("name" VARCHAR(1024), "fullname" VARCHAR(2048), "default_schema" INTEGER, "schema_path" CHARACTER LARGE OBJECT); CREATE TABLE "sys"."dependencies" ("id" INTEGER, "depend_id" INTEGER, "depend_type" SMALLINT); CREATE TABLE "sys"."dependency_types" ("dependency_type_id" SMALLINT NOT NULL, "dependency_type_name" VARCHAR(15) NOT NULL, CONSTRAINT "dependency_types_dependency_type_id_pkey" PRIMARY KEY ("dependency_type_id"), CONSTRAINT "dependency_types_dependency_type_name_unique" UNIQUE ("dependency_type_name")); CREATE TABLE "sys"."function_languages" ("language_id" SMALLINT NOT NULL, "language_name" VARCHAR(20) NOT NULL, "language_keyword" VARCHAR(20), CONSTRAINT "function_languages_language_id_pkey" PRIMARY KEY ("language_id"), CONSTRAINT "function_languages_language_name_unique" UNIQUE ("language_name")); @@ -959,7 +959,7 @@ SELECT "id", "name", "schema_id", "query create view sys."tablestorage" as select "schema", "table", max("count") as "rowcount", count(*) as "storages", sum(columnsize) as columnsize, sum(heapsize) as heapsize, sum(hashes) as hashsize, sum("imprints") as imprintsize, sum(orderidx) as orderidxsize from sys."storage" group by "schema", "table" order by "schema", "table"; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list