Changeset: dae30aa04d0b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dae30aa04d0b
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
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/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.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: label
Log Message:
Approve upgrade.
diffs (truncated from 4124 to 300 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
@@ -7002,7 +7002,6 @@ sql_update_default(Client c, mvc *sql, s
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_add_schemas_to_users;\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_grant_user_privileges;\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_sequences;\n"
- "\n"
" --functions and table-likes can be
interdependent. They should be inserted in the order of their catalogue id.\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(ORDER BY stmts.o),
stmts.s\n"
" FROM (\n"
@@ -7010,12 +7009,10 @@ sql_update_default(Client c, mvc *sql, s
" UNION ALL\n"
" SELECT t.o, t.stmt FROM sys.dump_tables t\n"
" ) AS stmts(o, s);\n"
- "\n"
" -- dump table data before adding constraints
and fixing sequences\n"
" IF NOT DESCRIBE THEN\n"
" CALL sys.dump_table_data();\n"
" END IF;\n"
- "\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_start_sequences;\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_column_defaults;\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_table_constraint_type;\n"
@@ -7027,13 +7024,10 @@ sql_update_default(Client c, mvc *sql, s
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_table_grants;\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_column_grants;\n"
" INSERT INTO sys.dump_statements SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), stmt FROM
sys.dump_function_grants;\n"
- "\n"
" --TODO Improve performance of
dump_table_data.\n"
" --TODO loaders, procedures, window and filter
sys.functions.\n"
" --TODO look into order dependent
group_concat\n"
- "\n"
" INSERT INTO sys.dump_statements VALUES
((SELECT COUNT(*) FROM sys.dump_statements) + 1, 'COMMIT;');\n"
- "\n"
" RETURN sys.dump_statements;\n"
"END;\n"
"GRANT SELECT ON sys.describe_tables TO
PUBLIC;\n"
@@ -7041,11 +7035,9 @@ sql_update_default(Client c, mvc *sql, s
"GRANT SELECT ON sys.fully_qualified_functions
TO PUBLIC;\n"
"GRANT SELECT ON sys.describe_privileges TO
PUBLIC;\n"
"GRANT SELECT ON sys.describe_functions TO
PUBLIC;\n"
- "\n"
- "CREATE FUNCTION check_constraint(sname STRING,
cname STRING) RETURNS STRING EXTERNAL NAME sql.\"check\";\n"
- "grant execute on function check_constraint to
public;\n"
- "\n"
- "update sys.functions set system = true where
not system and schema_id = 2000 and name in ('dump_database',
'describe_columns', 'describe_type');\n"
+ "CREATE FUNCTION sys.check_constraint(sname
STRING, cname STRING) RETURNS STRING EXTERNAL NAME sql.\"check\";\n"
+ "grant execute on function sys.check_constraint
to public;\n"
+ "update sys.functions set system = true where
not system and schema_id = 2000 and name in ('dump_database',
'describe_columns', 'describe_type', 'check_constraint');\n"
"update sys._tables set system = true where not
system and schema_id = 2000 and name in ('dump_comments', 'dump_tables',
'dump_functions', 'dump_function_grants', 'describe_functions',
'describe_privileges', 'describe_comments', 'fully_qualified_functions',
'describe_tables');\n";
if ((t = mvc_bind_table(sql, s, "dump_comments")) !=
NULL)
t->system = 0;
@@ -7118,9 +7110,8 @@ sql_update_default(Client c, mvc *sql, s
" ('ClientPid');\n"
"update sys.functions set
system = true where schema_id = 2000 and name in ('setclientinfo',
'sessions');\n"
"update sys._tables set system
= true where schema_id = 2000 and name in ('clientinfo_properties',
'sessions');\n";
- ;
- sql_schema *sys = mvc_bind_schema(sql,
"sys");
- sql_table *t = mvc_bind_table(sql, sys,
"sessions");
+
+ t = mvc_bind_table(sql, s, "sessions");
t->system = 0; /* make it non-system
else the drop view will fail */
printf("Running database upgrade
commands:\n%s\n", query3);
fflush(stdout);
@@ -7141,7 +7132,6 @@ sql_update_default(Client c, mvc *sql, s
"GRANT SELECT ON
sys.key_types TO PUBLIC;\n"
"UPDATE sys._tables SET
system = true WHERE schema_id = 2000 AND name = 'key_types';\n";
- sql_table *t;
if ((t = mvc_bind_table(sql, s,
"key_types")) != NULL)
t->system = 0;
printf("Running database
upgrade commands:\n%s\n", query4);
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
@@ -362,5 +362,5 @@ BEGIN
RETURN sys.dump_statements;
END;
-CREATE FUNCTION check_constraint(sname STRING, cname STRING) RETURNS STRING
EXTERNAL NAME sql."check";
-grant execute on function check_constraint to public;
+CREATE FUNCTION sys.check_constraint(sname STRING, cname STRING) RETURNS
STRING EXTERNAL NAME sql."check";
+grant execute on function sys.check_constraint to public;
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
@@ -958,7 +958,6 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_add_schemas_to_users;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_grant_user_privileges;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_sequences;
-
--functions and table-likes can be interdependent. They should be inserted in
the order of their catalogue id.
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
FROM (
@@ -966,12 +965,10 @@ BEGIN
UNION ALL
SELECT t.o, t.stmt FROM sys.dump_tables t
) AS stmts(o, s);
-
-- dump table data before adding constraints and fixing sequences
IF NOT DESCRIBE THEN
CALL sys.dump_table_data();
END IF;
-
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_start_sequences;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_defaults;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_constraint_type;
@@ -983,13 +980,10 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_function_grants;
-
--TODO Improve performance of dump_table_data.
--TODO loaders, procedures, window and filter sys.functions.
--TODO look into order dependent group_concat
-
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
-
RETURN sys.dump_statements;
END;
GRANT SELECT ON sys.describe_tables TO PUBLIC;
@@ -997,7 +991,9 @@ GRANT SELECT ON sys.describe_comments TO
GRANT SELECT ON sys.fully_qualified_functions TO PUBLIC;
GRANT SELECT ON sys.describe_privileges TO PUBLIC;
GRANT SELECT ON sys.describe_functions TO PUBLIC;
-update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type');
+CREATE FUNCTION sys.check_constraint(sname STRING, cname STRING) RETURNS
STRING EXTERNAL NAME sql."check";
+grant execute on function sys.check_constraint to public;
+update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type',
'check_constraint');
update sys._tables set system = true where not system and schema_id = 2000 and
name in ('dump_comments', 'dump_tables', 'dump_functions',
'dump_function_grants', 'describe_functions', 'describe_privileges',
'describe_comments', 'fully_qualified_functions', 'describe_tables');
Running database upgrade commands:
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
@@ -946,7 +946,6 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_add_schemas_to_users;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_grant_user_privileges;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_sequences;
-
--functions and table-likes can be interdependent. They should be inserted in
the order of their catalogue id.
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
FROM (
@@ -954,12 +953,10 @@ BEGIN
UNION ALL
SELECT t.o, t.stmt FROM sys.dump_tables t
) AS stmts(o, s);
-
-- dump table data before adding constraints and fixing sequences
IF NOT DESCRIBE THEN
CALL sys.dump_table_data();
END IF;
-
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_start_sequences;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_defaults;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_constraint_type;
@@ -971,13 +968,10 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_function_grants;
-
--TODO Improve performance of dump_table_data.
--TODO loaders, procedures, window and filter sys.functions.
--TODO look into order dependent group_concat
-
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
-
RETURN sys.dump_statements;
END;
GRANT SELECT ON sys.describe_tables TO PUBLIC;
@@ -985,7 +979,9 @@ GRANT SELECT ON sys.describe_comments TO
GRANT SELECT ON sys.fully_qualified_functions TO PUBLIC;
GRANT SELECT ON sys.describe_privileges TO PUBLIC;
GRANT SELECT ON sys.describe_functions TO PUBLIC;
-update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type');
+CREATE FUNCTION sys.check_constraint(sname STRING, cname STRING) RETURNS
STRING EXTERNAL NAME sql."check";
+grant execute on function sys.check_constraint to public;
+update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type',
'check_constraint');
update sys._tables set system = true where not system and schema_id = 2000 and
name in ('dump_comments', 'dump_tables', 'dump_functions',
'dump_function_grants', 'describe_functions', 'describe_privileges',
'describe_comments', 'fully_qualified_functions', 'describe_tables');
Running database upgrade commands:
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
@@ -1027,7 +1027,6 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_add_schemas_to_users;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_grant_user_privileges;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_sequences;
-
--functions and table-likes can be interdependent. They should be inserted in
the order of their catalogue id.
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
FROM (
@@ -1035,12 +1034,10 @@ BEGIN
UNION ALL
SELECT t.o, t.stmt FROM sys.dump_tables t
) AS stmts(o, s);
-
-- dump table data before adding constraints and fixing sequences
IF NOT DESCRIBE THEN
CALL sys.dump_table_data();
END IF;
-
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_start_sequences;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_defaults;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_constraint_type;
@@ -1052,13 +1049,10 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_function_grants;
-
--TODO Improve performance of dump_table_data.
--TODO loaders, procedures, window and filter sys.functions.
--TODO look into order dependent group_concat
-
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
-
RETURN sys.dump_statements;
END;
GRANT SELECT ON sys.describe_tables TO PUBLIC;
@@ -1066,7 +1060,9 @@ GRANT SELECT ON sys.describe_comments TO
GRANT SELECT ON sys.fully_qualified_functions TO PUBLIC;
GRANT SELECT ON sys.describe_privileges TO PUBLIC;
GRANT SELECT ON sys.describe_functions TO PUBLIC;
-update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type');
+CREATE FUNCTION sys.check_constraint(sname STRING, cname STRING) RETURNS
STRING EXTERNAL NAME sql."check";
+grant execute on function sys.check_constraint to public;
+update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type',
'check_constraint');
update sys._tables set system = true where not system and schema_id = 2000 and
name in ('dump_comments', 'dump_tables', 'dump_functions',
'dump_function_grants', 'describe_functions', 'describe_privileges',
'describe_comments', 'fully_qualified_functions', 'describe_tables');
Running database upgrade commands:
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
@@ -958,7 +958,6 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_add_schemas_to_users;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_grant_user_privileges;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_sequences;
-
--functions and table-likes can be interdependent. They should be inserted in
the order of their catalogue id.
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
FROM (
@@ -966,12 +965,10 @@ BEGIN
UNION ALL
SELECT t.o, t.stmt FROM sys.dump_tables t
) AS stmts(o, s);
-
-- dump table data before adding constraints and fixing sequences
IF NOT DESCRIBE THEN
CALL sys.dump_table_data();
END IF;
-
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_start_sequences;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_defaults;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_constraint_type;
@@ -983,13 +980,10 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_table_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_column_grants;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_function_grants;
-
--TODO Improve performance of dump_table_data.
--TODO loaders, procedures, window and filter sys.functions.
--TODO look into order dependent group_concat
-
INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, 'COMMIT;');
-
RETURN sys.dump_statements;
END;
GRANT SELECT ON sys.describe_tables TO PUBLIC;
@@ -997,7 +991,9 @@ GRANT SELECT ON sys.describe_comments TO
GRANT SELECT ON sys.fully_qualified_functions TO PUBLIC;
GRANT SELECT ON sys.describe_privileges TO PUBLIC;
GRANT SELECT ON sys.describe_functions TO PUBLIC;
-update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type');
+CREATE FUNCTION sys.check_constraint(sname STRING, cname STRING) RETURNS
STRING EXTERNAL NAME sql."check";
+grant execute on function sys.check_constraint to public;
+update sys.functions set system = true where not system and schema_id = 2000
and name in ('dump_database', 'describe_columns', 'describe_type',
'check_constraint');
update sys._tables set system = true where not system and schema_id = 2000 and
name in ('dump_comments', 'dump_tables', 'dump_functions',
'dump_function_grants', 'describe_functions', 'describe_privileges',
'describe_comments', 'fully_qualified_functions', 'describe_tables');
Running database upgrade commands:
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
@@ -946,7 +946,6 @@ BEGIN
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_add_schemas_to_users;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_grant_user_privileges;
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_sequences;
-
--functions and table-likes can be interdependent. They should be inserted in
the order of their catalogue id.
INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
FROM (
@@ -954,12 +953,10 @@ BEGIN
UNION ALL
SELECT t.o, t.stmt FROM sys.dump_tables t
) AS stmts(o, s);
-
-- dump table data before adding constraints and fixing sequences
IF NOT DESCRIBE THEN
CALL sys.dump_table_data();
END IF;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
