Changeset: cf65a4a29a2b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cf65a4a29a2b
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/emptydb/Tests/check.stable.out
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:
Merge with Dec2025 branch.
diffs (truncated from 347 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
@@ -5240,8 +5240,28 @@ sql_update_dec2025(Client c, mvc *sql, s
printf("Running database upgrade commands:\n%s\n", query);
fflush(stdout);
err = SQLstatementIntern(c, query, "update", true, false, NULL);
+ if (err)
+ return err;
}
+ /* better optimizations lead to fewer (bogus) dependencies, so we
+ * need to remove those bogus dependencies during upgrade */
+ err = SQLstatementIntern(c, "select * from sys.dependencies where id in
(2004, 2005, 2006) and depend_id in (select id from sys._tables where name in
('check_constraints', 'table_constraints') and schema_id = (select id from
sys.schemas where name = 'information_schema'));\n", "update", true, false,
&output);
+ if (err)
+ return err;
+ b = BATdescriptor(output->cols[0].b);
+ if (b != NULL) {
+ if (BATcount(b) != 0) {
+ const char query[] =
+ "delete from sys.dependencies where id in
(2004, 2005, 2006) and depend_id in (select id from sys._tables where name in
('check_constraints', 'table_constraints') and schema_id = (select id from
sys.schemas where name = 'information_schema'));\n";
+ printf("Running database upgrade commands:\n%s\n",
query);
+ fflush(stdout);
+ err = SQLstatementIntern(c, query, "update", true,
false, NULL);
+ }
+ BBPreclaim(b);
+ }
+ res_table_destroy(output);
+
return err;
}
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -712,5 +712,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -712,5 +712,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -254,5 +254,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -254,5 +254,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -339,5 +339,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -254,5 +254,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -254,5 +254,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -339,5 +339,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -3479,11 +3479,8 @@ select 'null in fkeys.delete_action', de
[ "column used by view", "sys", "keys", "name", "information_schema",
"check_constraints", "VIEW" ]
[ "column used by view", "sys", "keys", "table_id",
"information_schema", "check_constraints", "VIEW" ]
[ "column used by view", "sys", "keys", "type", "information_schema",
"check_constraints", "VIEW" ]
-[ "column used by view", "sys", "schemas", "authorization",
"information_schema", "check_constraints", "VIEW" ]
[ "column used by view", "sys", "schemas", "id",
"information_schema", "check_constraints", "VIEW" ]
[ "column used by view", "sys", "schemas", "name",
"information_schema", "check_constraints", "VIEW" ]
-[ "column used by view", "sys", "schemas", "owner",
"information_schema", "check_constraints", "VIEW" ]
-[ "column used by view", "sys", "schemas", "system",
"information_schema", "check_constraints", "VIEW" ]
[ "column used by view", "tmp", "_tables", "id",
"information_schema", "check_constraints", "VIEW" ]
[ "column used by view", "tmp", "_tables", "name",
"information_schema", "check_constraints", "VIEW" ]
[ "column used by view", "tmp", "_tables", "schema_id",
"information_schema", "check_constraints", "VIEW" ]
@@ -3597,11 +3594,8 @@ select 'null in fkeys.delete_action', de
[ "column used by view", "sys", "keys", "name", "information_schema",
"table_constraints", "VIEW" ]
[ "column used by view", "sys", "keys", "table_id",
"information_schema", "table_constraints", "VIEW" ]
[ "column used by view", "sys", "keys", "type", "information_schema",
"table_constraints", "VIEW" ]
-[ "column used by view", "sys", "schemas", "authorization",
"information_schema", "table_constraints", "VIEW" ]
[ "column used by view", "sys", "schemas", "id",
"information_schema", "table_constraints", "VIEW" ]
[ "column used by view", "sys", "schemas", "name",
"information_schema", "table_constraints", "VIEW" ]
-[ "column used by view", "sys", "schemas", "owner",
"information_schema", "table_constraints", "VIEW" ]
-[ "column used by view", "sys", "schemas", "system",
"information_schema", "table_constraints", "VIEW" ]
[ "column used by view", "tmp", "_tables", "id",
"information_schema", "table_constraints", "VIEW" ]
[ "column used by view", "tmp", "_tables", "name",
"information_schema", "table_constraints", "VIEW" ]
[ "column used by view", "tmp", "_tables", "schema_id",
"information_schema", "table_constraints", "VIEW" ]
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -712,5 +712,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -629,5 +629,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -712,5 +712,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -254,5 +254,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
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
@@ -254,5 +254,8 @@ grant execute on function to_hex(bigint)
update sys.functions set system = true where not system and schema_id = 2000
and name = 'to_hex' and type = 1;
Running database upgrade commands:
+delete from sys.dependencies where id in (2004, 2005, 2006) and depend_id in
(select id from sys._tables where name in ('check_constraints',
'table_constraints') and schema_id = (select id from sys.schemas where name =
'information_schema'));
+
+Running database upgrade commands:
delete from sys.dependencies where id = 2048 and depend_id = (select f.id from
sys.functions f where name = 'get_merge_table_partition_expressions');
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
