Changeset: 8e4bb4d9a5ed for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8e4bb4d9a5ed
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/76_dump.sql
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
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.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
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.int128
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sql_dump/Tests/dump.test
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
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.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
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.int128
Branch: userprofile
Log Message:
CREATE USER doesn't create the schema, and CREATE SCHEMA needs the user.
So we need to create the user with the sys schema and later alter it.
diffs (256 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
@@ -4895,7 +4895,7 @@ sql_update_default(Client c, mvc *sql)
" SELECT\n"
" 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED
PASSWORD ' ||\n"
" sys.sq(sys.password_hash(ui.name)) ||\n"
- " ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA ' ||
sys.sq(s.name) || ' SCHEMA PATH ' || sys.sq(ui.schema_path) || ';' stmt,\n"
+ " ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' ||
ifthenelse(ui.schema_path = '\"sys\"', '', ' SCHEMA PATH ' ||
sys.sq(ui.schema_path)) || ';' stmt,\n"
" ui.name user_name\n"
" FROM sys.db_user_info ui, sys.schemas s\n"
" WHERE ui.default_schema = s.id\n"
diff --git a/sql/scripts/76_dump.sql b/sql/scripts/76_dump.sql
--- a/sql/scripts/76_dump.sql
+++ b/sql/scripts/76_dump.sql
@@ -16,7 +16,7 @@ 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.sq(s.name) || '
SCHEMA PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -4273,7 +4273,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -4342,7 +4342,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -4267,7 +4267,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -4336,7 +4336,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3141,7 +3141,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3210,7 +3210,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3135,7 +3135,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3204,7 +3204,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -480,7 +480,7 @@ select 'null in value_partitions.value',
[ "sys._tables", "sys", "dump_comments", "create view
sys.dump_comments as select 'COMMENT ON ' || c.tpe || ' ' || c.fqn || ' IS ' ||
sys.sq(c.rem) || ';' stmt from sys.describe_comments c;", "VIEW", true,
"COMMIT", "WRITABLE", NULL ]
[ "sys._tables", "sys", "dump_create_roles", "create view
sys.dump_create_roles as select 'CREATE ROLE ' || sys.dq(name) || ';' stmt,
name user_name from sys.auths where name not in (select name from
sys.db_user_info) and grantor <> 0;", "VIEW", true, "COMMIT",
"WRITABLE", NULL ]
[ "sys._tables", "sys", "dump_create_schemas", "create view
sys.dump_create_schemas as select 'CREATE SCHEMA ' || sys.dq(s.name) ||
ifthenelse(a.name <> 'sysadmin', ' AUTHORIZATION ' || sys.dq(a.name), ' ') ||
';' stmt, s.name schema_name from sys.schemas s, sys.auths a where
s.authorization = a.id and s.system = false;", "VIEW", true, "COMMIT",
"WRITABLE", NULL ]
-[ "sys._tables", "sys", "dump_create_users", "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.sq(s.name) || ' 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';", "VIEW", true, "COMMIT", "WRITABLE",
NULL ]
+[ "sys._tables", "sys", "dump_create_users", "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';", "VIEW", true, "COMMIT",
"WRITABLE", NULL ]
[ "sys._tables", "sys", "dump_foreign_keys", "create view
sys.dump_foreign_keys as select 'ALTER TABLE ' || sys.fqn(fk_s, fk_t) || ' ADD
CONSTRAINT ' || sys.dq(fk) || ' ' || 'FOREIGN KEY(' ||
group_concat(sys.dq(fk_c), ',') ||') ' || 'REFERENCES ' || sys.fqn(pk_s, pk_t)
|| '(' || group_concat(sys.dq(pk_c), ',') || ') ' || 'ON DELETE ' || on_delete
|| ' ON UPDATE ' || on_update || ';' stmt, fk_s foreign_schema_name, fk_t
foreign_table_name, pk_s primary_schema_name, pk_t primary_table_name, fk
key_name from sys.describe_foreign_keys group by fk_s, fk_t, pk_s, pk_t, fk,
on_delete, on_update;", "VIEW", true, "COMMIT", "WRITABLE",
NULL ]
[ "sys._tables", "sys", "dump_function_grants", "create view
sys.dump_function_grants as with func_args_all(func_id, number, max_number,
func_arg) as (select a.func_id, a.number, max(a.number) over (partition by
a.func_id order by a.number desc), group_concat(sys.describe_type(a.type,
a.type_digits, a.type_scale), ', ') over (partition by a.func_id order by
a.number) from sys.args a where a.inout = 1), func_args(func_id, func_arg) as
(select func_id, func_arg from func_args_all where number = max_number) select
'GRANT ' || pc.privilege_code_name || ' ON ' || ft.function_type_keyword || ' '
|| sys.fqn(s.name, f.name) || '(' || coalesce(fa.func_arg, '') || ') TO ' ||
ifthenelse(a.name = 'public', 'PUBLIC', sys.dq(a.name)) || case when
p.grantable = 1 then ' WITH GRANT OPTION' else '' end || ';' stmt, s.name
schema_name, f.name function_name, a.name grantee from sys.schemas s,
sys.functions f left outer join func_args fa on f.id = fa.func_id, sys.auths a,
sys.privileges p, sys.auths g,
sys.function_types ft, sys.privilege_codes pc where s.id = f.schema_id and
f.id = p.obj_id and p.auth_id = a.id and p.grantor = g.id and p.privileges =
pc.privilege_code_id and f.type = ft.function_type_id and not f.system order by
s.name, f.name, a.name, g.name, p.grantable;", "VIEW", true, "COMMIT",
"WRITABLE", NULL ]
[ "sys._tables", "sys", "dump_functions", "create view
sys.dump_functions as select f.o o, sys.schema_guard(f.sch, f.fun, f.def) stmt,
f.sch schema_name, f.fun function_name from sys.describe_functions f;",
"VIEW", true, "COMMIT", "WRITABLE", NULL ]
@@ -3652,7 +3652,6 @@ select 'null in value_partitions.value',
[ "column used by view", "sys", "db_user_info", "name", "sys",
"dump_create_users", "VIEW" ]
[ "column used by view", "sys", "db_user_info", "schema_path", "sys",
"dump_create_users", "VIEW" ]
[ "column used by view", "sys", "schemas", "id", "sys",
"dump_create_users", "VIEW" ]
-[ "column used by view", "sys", "schemas", "name", "sys",
"dump_create_users", "VIEW" ]
[ "column used by view", "sys", "describe_foreign_keys", "fk",
"sys", "dump_foreign_keys", "VIEW" ]
[ "column used by view", "sys", "describe_foreign_keys", "fk_c",
"sys", "dump_foreign_keys", "VIEW" ]
[ "column used by view", "sys", "describe_foreign_keys", "fk_s",
"sys", "dump_foreign_keys", "VIEW" ]
diff --git a/sql/test/sql_dump/Tests/dump.test
b/sql/test/sql_dump/Tests/dump.test
--- a/sql/test/sql_dump/Tests/dump.test
+++ b/sql/test/sql_dump/Tests/dump.test
@@ -1,4 +1,5 @@
hash-threshold 200
+
statement ok
SET TIME ZONE INTERVAL '02:00' HOUR TO MINUTE
@@ -285,8 +286,8 @@ SELECT stmt FROM sys.dump_database(FALSE
START TRANSACTION;
SET SCHEMA "sys";
CREATE ROLE "king";
-CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys SCHEMA PATH '"voc"';
-CREATE USER "voc2" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys SCHEMA PATH '"voc2"';
+CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
+CREATE USER "voc2" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA sys;
CREATE SCHEMA "sbar" AUTHORIZATION "monetdb";
CREATE SCHEMA "sfoo" AUTHORIZATION "monetdb";
CREATE TYPE "sfoo"."json" EXTERNAL NAME "json";
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4273,7 +4273,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4342,7 +4342,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
diff --git
a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -4267,7 +4267,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -4336,7 +4336,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3141,7 +3141,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3210,7 +3210,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3135,7 +3135,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
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
@@ -3204,7 +3204,7 @@ 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.sq(s.name) || ' SCHEMA
PATH ' || sys.sq(ui.schema_path) || ';' stmt,
+ ' 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
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
