Changeset: ca1204b9feab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ca1204b9feab
Modified Files:
sql/backends/monet5/sql_upgrades.c
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: default
Log Message:
Fix and approve upgrade.
diffs (truncated from 372 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
@@ -4227,6 +4227,8 @@ sql_update_default(Client c, mvc *sql, c
" external name sql.vacuum;\n"
"create procedure sys.stop_vacuum(sname
string, tname string, cname string)\n"
" external name
sql.stop_vacuum;\n");
+ pos += snprintf(buf + pos, bufsize - pos,
+ "update sys.functions set system = true
where system <> true and name in ('vacuum', 'stop_vacuum') and schema_id = 2000
and type = %d;\n", F_PROC);
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
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
@@ -5749,4 +5749,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5154,4 +5154,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5820,4 +5820,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5749,4 +5749,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5154,4 +5154,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5820,4 +5820,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -633,4 +633,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -633,4 +633,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -4847,4 +4847,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -633,4 +633,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -633,4 +633,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -4847,4 +4847,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5749,4 +5749,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -5154,4 +5154,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5820,4 +5820,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5749,4 +5749,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
@@ -5154,4 +5154,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -5820,4 +5820,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
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
@@ -633,4 +633,11 @@ update sys.functions set system = true w
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
drop function sys.reverse(string);
drop all function sys.fuse;
+create procedure sys.vacuum(sname string, tname string, cname string)
+ external name sql.vacuum;
+create procedure sys.vacuum(sname string, tname string, cname string, interval
int)
+ external name sql.vacuum;
+create procedure sys.stop_vacuum(sname string, tname string, cname string)
+ external name sql.stop_vacuum;
+update sys.functions set system = true where system <> true and name in
('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
