Changeset: 48c729f50515 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/48c729f50515
Modified Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
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.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Branch: userprofile
Log Message:
Approvals on "weird" systems.
diffs (truncated from 1894 to 300 lines):
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -4087,6 +4087,34 @@ update sys._tables set system = true whe
update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('analyze','statistics');
Running database upgrade commands:
+alter table sys.db_user_info add column max_memory bigint;
+alter table sys.db_user_info add column max_workers int;
+alter table sys.db_user_info add column optimizer varchar(1024);
+alter table sys.db_user_info add column default_role int;
+alter table sys.db_user_info add column password varchar(256);
+update sys.db_user_info u set max_memory = 0, max_workers = 0, optimizer =
'default_pipe', default_role = (select id from sys.auths a where a.name =
u.name);
+-- and copying passwords
+
+Running database upgrade commands:
+drop view sys.dependency_schemas_on_users;
+drop view sys.roles;
+drop view sys.users;
+drop function sys.db_users();
+CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths a WHERE
a.name NOT IN (SELECT u.name FROM sys.db_user_info u);
+GRANT SELECT ON sys.roles TO PUBLIC;
+CREATE VIEW sys.users AS SELECT name, fullname, default_schema, schema_path,
max_memory, max_workers, optimizer, default_role FROM sys.db_user_info;
+GRANT SELECT ON sys.users TO PUBLIC;
+CREATE FUNCTION sys.db_users() RETURNS TABLE(name varchar(2048)) RETURN SELECT
name FROM sys.db_user_info;
+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.db_user_info 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 name in ('users', 'roles',
'dependency_schemas_on_users') AND schema_id = 2000;
+update sys.functions set system = true where system <> true and name in
('db_users') and schema_id = 2000 and type = 5;
+
+Running database upgrade commands:
drop function sys.dump_database(boolean);
drop procedure sys.dump_table_data();
drop procedure sys.dump_table_data(string, string);
@@ -4096,6 +4124,7 @@ drop view sys.dump_sequences;
drop view sys.dump_start_sequences;
drop view sys.dump_tables;
drop view sys.describe_tables;
+drop view sys.dump_create_users;
CREATE VIEW sys.describe_partition_tables AS
SELECT
m_sch,
@@ -4240,6 +4269,16 @@ BEGIN
END WHILE;
END IF;
END;
+CREATE VIEW sys.dump_create_users AS
+ SELECT
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ sys.sq(sys.password_hash(ui.name)) ||
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' || ifthenelse(ui.schema_path
= '"sys"', '', ' SCHEMA PATH ' || sys.sq(ui.schema_path)) || ';' stmt,
+ ui.name user_name
+ FROM sys.db_user_info ui, sys.schemas s
+ WHERE ui.default_schema = s.id
+ AND ui.name <> 'monetdb'
+ AND ui.name <> '.snapshot';
CREATE VIEW sys.describe_tables AS
SELECT
t.id o,
@@ -4325,7 +4364,7 @@ BEGIN
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
RETURN sys.dump_statements;
END;
-update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables') AND schema_id = 2000;
+update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables', 'dump_create_users')
AND schema_id = 2000;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING
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
@@ -3740,6 +3740,34 @@ update sys._tables set system = true whe
update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('analyze','statistics');
Running database upgrade commands:
+alter table sys.db_user_info add column max_memory bigint;
+alter table sys.db_user_info add column max_workers int;
+alter table sys.db_user_info add column optimizer varchar(1024);
+alter table sys.db_user_info add column default_role int;
+alter table sys.db_user_info add column password varchar(256);
+update sys.db_user_info u set max_memory = 0, max_workers = 0, optimizer =
'default_pipe', default_role = (select id from sys.auths a where a.name =
u.name);
+-- and copying passwords
+
+Running database upgrade commands:
+drop view sys.dependency_schemas_on_users;
+drop view sys.roles;
+drop view sys.users;
+drop function sys.db_users();
+CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths a WHERE
a.name NOT IN (SELECT u.name FROM sys.db_user_info u);
+GRANT SELECT ON sys.roles TO PUBLIC;
+CREATE VIEW sys.users AS SELECT name, fullname, default_schema, schema_path,
max_memory, max_workers, optimizer, default_role FROM sys.db_user_info;
+GRANT SELECT ON sys.users TO PUBLIC;
+CREATE FUNCTION sys.db_users() RETURNS TABLE(name varchar(2048)) RETURN SELECT
name FROM sys.db_user_info;
+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.db_user_info 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 name in ('users', 'roles',
'dependency_schemas_on_users') AND schema_id = 2000;
+update sys.functions set system = true where system <> true and name in
('db_users') and schema_id = 2000 and type = 5;
+
+Running database upgrade commands:
drop function sys.dump_database(boolean);
drop procedure sys.dump_table_data();
drop procedure sys.dump_table_data(string, string);
@@ -3749,6 +3777,7 @@ drop view sys.dump_sequences;
drop view sys.dump_start_sequences;
drop view sys.dump_tables;
drop view sys.describe_tables;
+drop view sys.dump_create_users;
CREATE VIEW sys.describe_partition_tables AS
SELECT
m_sch,
@@ -3893,6 +3922,16 @@ BEGIN
END WHILE;
END IF;
END;
+CREATE VIEW sys.dump_create_users AS
+ SELECT
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ sys.sq(sys.password_hash(ui.name)) ||
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' || ifthenelse(ui.schema_path
= '"sys"', '', ' SCHEMA PATH ' || sys.sq(ui.schema_path)) || ';' stmt,
+ ui.name user_name
+ FROM sys.db_user_info ui, sys.schemas s
+ WHERE ui.default_schema = s.id
+ AND ui.name <> 'monetdb'
+ AND ui.name <> '.snapshot';
CREATE VIEW sys.describe_tables AS
SELECT
t.id o,
@@ -3978,7 +4017,7 @@ BEGIN
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
RETURN sys.dump_statements;
END;
-update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables') AND schema_id = 2000;
+update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables', 'dump_create_users')
AND schema_id = 2000;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3740,6 +3740,34 @@ update sys._tables set system = true whe
update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('analyze','statistics');
Running database upgrade commands:
+alter table sys.db_user_info add column max_memory bigint;
+alter table sys.db_user_info add column max_workers int;
+alter table sys.db_user_info add column optimizer varchar(1024);
+alter table sys.db_user_info add column default_role int;
+alter table sys.db_user_info add column password varchar(256);
+update sys.db_user_info u set max_memory = 0, max_workers = 0, optimizer =
'default_pipe', default_role = (select id from sys.auths a where a.name =
u.name);
+-- and copying passwords
+
+Running database upgrade commands:
+drop view sys.dependency_schemas_on_users;
+drop view sys.roles;
+drop view sys.users;
+drop function sys.db_users();
+CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths a WHERE
a.name NOT IN (SELECT u.name FROM sys.db_user_info u);
+GRANT SELECT ON sys.roles TO PUBLIC;
+CREATE VIEW sys.users AS SELECT name, fullname, default_schema, schema_path,
max_memory, max_workers, optimizer, default_role FROM sys.db_user_info;
+GRANT SELECT ON sys.users TO PUBLIC;
+CREATE FUNCTION sys.db_users() RETURNS TABLE(name varchar(2048)) RETURN SELECT
name FROM sys.db_user_info;
+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.db_user_info 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 name in ('users', 'roles',
'dependency_schemas_on_users') AND schema_id = 2000;
+update sys.functions set system = true where system <> true and name in
('db_users') and schema_id = 2000 and type = 5;
+
+Running database upgrade commands:
drop function sys.dump_database(boolean);
drop procedure sys.dump_table_data();
drop procedure sys.dump_table_data(string, string);
@@ -3749,6 +3777,7 @@ drop view sys.dump_sequences;
drop view sys.dump_start_sequences;
drop view sys.dump_tables;
drop view sys.describe_tables;
+drop view sys.dump_create_users;
CREATE VIEW sys.describe_partition_tables AS
SELECT
m_sch,
@@ -3893,6 +3922,16 @@ BEGIN
END WHILE;
END IF;
END;
+CREATE VIEW sys.dump_create_users AS
+ SELECT
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ sys.sq(sys.password_hash(ui.name)) ||
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' || ifthenelse(ui.schema_path
= '"sys"', '', ' SCHEMA PATH ' || sys.sq(ui.schema_path)) || ';' stmt,
+ ui.name user_name
+ FROM sys.db_user_info ui, sys.schemas s
+ WHERE ui.default_schema = s.id
+ AND ui.name <> 'monetdb'
+ AND ui.name <> '.snapshot';
CREATE VIEW sys.describe_tables AS
SELECT
t.id o,
@@ -3978,7 +4017,7 @@ BEGIN
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
RETURN sys.dump_statements;
END;
-update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables') AND schema_id = 2000;
+update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables', 'dump_create_users')
AND schema_id = 2000;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -3740,6 +3740,34 @@ update sys._tables set system = true whe
update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('analyze','statistics');
Running database upgrade commands:
+alter table sys.db_user_info add column max_memory bigint;
+alter table sys.db_user_info add column max_workers int;
+alter table sys.db_user_info add column optimizer varchar(1024);
+alter table sys.db_user_info add column default_role int;
+alter table sys.db_user_info add column password varchar(256);
+update sys.db_user_info u set max_memory = 0, max_workers = 0, optimizer =
'default_pipe', default_role = (select id from sys.auths a where a.name =
u.name);
+-- and copying passwords
+
+Running database upgrade commands:
+drop view sys.dependency_schemas_on_users;
+drop view sys.roles;
+drop view sys.users;
+drop function sys.db_users();
+CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths a WHERE
a.name NOT IN (SELECT u.name FROM sys.db_user_info u);
+GRANT SELECT ON sys.roles TO PUBLIC;
+CREATE VIEW sys.users AS SELECT name, fullname, default_schema, schema_path,
max_memory, max_workers, optimizer, default_role FROM sys.db_user_info;
+GRANT SELECT ON sys.users TO PUBLIC;
+CREATE FUNCTION sys.db_users() RETURNS TABLE(name varchar(2048)) RETURN SELECT
name FROM sys.db_user_info;
+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.db_user_info 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 name in ('users', 'roles',
'dependency_schemas_on_users') AND schema_id = 2000;
+update sys.functions set system = true where system <> true and name in
('db_users') and schema_id = 2000 and type = 5;
+
+Running database upgrade commands:
drop function sys.dump_database(boolean);
drop procedure sys.dump_table_data();
drop procedure sys.dump_table_data(string, string);
@@ -3749,6 +3777,7 @@ drop view sys.dump_sequences;
drop view sys.dump_start_sequences;
drop view sys.dump_tables;
drop view sys.describe_tables;
+drop view sys.dump_create_users;
CREATE VIEW sys.describe_partition_tables AS
SELECT
m_sch,
@@ -3893,6 +3922,16 @@ BEGIN
END WHILE;
END IF;
END;
+CREATE VIEW sys.dump_create_users AS
+ SELECT
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ sys.sq(sys.password_hash(ui.name)) ||
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' || ifthenelse(ui.schema_path
= '"sys"', '', ' SCHEMA PATH ' || sys.sq(ui.schema_path)) || ';' stmt,
+ ui.name user_name
+ FROM sys.db_user_info ui, sys.schemas s
+ WHERE ui.default_schema = s.id
+ AND ui.name <> 'monetdb'
+ AND ui.name <> '.snapshot';
CREATE VIEW sys.describe_tables AS
SELECT
t.id o,
@@ -3978,7 +4017,7 @@ BEGIN
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
RETURN sys.dump_statements;
END;
-update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables') AND schema_id = 2000;
+update sys._tables set system = true where name in
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'describe_tables', 'dump_tables', 'dump_create_users')
AND schema_id = 2000;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
---
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4156,6 +4156,34 @@ update sys._tables set system = true whe
update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('analyze','statistics');
Running database upgrade commands:
+alter table sys.db_user_info add column max_memory bigint;
+alter table sys.db_user_info add column max_workers int;
+alter table sys.db_user_info add column optimizer varchar(1024);
+alter table sys.db_user_info add column default_role int;
+alter table sys.db_user_info add column password varchar(256);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
