Changeset: 99fb573e6cd1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/99fb573e6cd1
Modified Files:
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-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 427 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -854,3 +854,4 @@ a63e11c1fd1b2dfba2a0ed8a985455286bc023d3
b4c2936c46f28ad6b3e59ed5a1a844726d521994 Dec2025_1
b4c2936c46f28ad6b3e59ed5a1a844726d521994 Dec2025_release
69f4fe2ad29b5d50d9ef06ad76639faaa60fcfa8 Dec2025_3
+69f4fe2ad29b5d50d9ef06ad76639faaa60fcfa8 Dec2025_SP1_release
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
@@ -1,25 +1,3 @@
-Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
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
@@ -1,25 +1,3 @@
-Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
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
@@ -84,28 +84,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
type = 1;
Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
-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');
Running database upgrade commands:
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
@@ -1,27 +1,3 @@
-Running database upgrade commands to update system tables.
-
-Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
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
@@ -1,27 +1,3 @@
-Running database upgrade commands to update system tables.
-
-Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
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
@@ -84,28 +84,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
type = 1;
Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
-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');
Running database upgrade commands:
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
@@ -1,25 +1,3 @@
-Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
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
@@ -1,25 +1,3 @@
-Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
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
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -84,28 +84,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
type = 1;
Running database upgrade commands:
-DROP VIEW sys.describe_accessible_tables CASCADE;
-DROP VIEW sys.roles CASCADE;
-CREATE VIEW sys.roles AS SELECT id, name, grantor FROM sys.auths;
-GRANT SELECT ON sys.roles TO PUBLIC;
-CREATE VIEW sys.describe_accessible_tables AS
- SELECT
- schemas.name AS schema,
- tables.name AS table,
- tt.table_type_name AS table_type,
- pc.privilege_code_name AS privs,
- p.privileges AS privs_code
- FROM privileges p
- JOIN sys.roles ON p.auth_id = roles.id
- JOIN sys.tables ON p.obj_id = tables.id
- JOIN sys.table_types tt ON tables.type = tt.table_type_id
- JOIN sys.schemas ON tables.schema_id = schemas.id
- JOIN sys.privilege_codes pc ON p.privileges = pc.privilege_code_id
- WHERE roles.name = current_role;
-GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC;
-UPDATE sys._tables SET system = true WHERE not system and schema_id = 2000 and
name in ('roles', 'describe_accessible_tables');
-
-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');
Running database upgrade commands:
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
@@ -101203,6 +101203,16 @@ CREATE TABLE "testschema"."nulls_not_dis
);
COPY 1 RECORDS INTO "testschema"."nulls_not_distinct" FROM stdin USING
DELIMITERS E'\t',E'\n','"';
1 1 1 1
+CREATE TABLE "testschema"."double_check" (
+ "c1" INTEGER NOT NULL,
+ "c2" INTEGER,
+ CONSTRAINT "double_check_c1_check" CHECK (c1 >= 1),
+ CONSTRAINT "c2gtc1" CHECK (c2 is null or c2 > c1)
+);
+CREATE UNLOGGED TABLE "testschema"."unlogged_table" (
+ "id" INTEGER,
+ "nm" VARCHAR(99)
+);
CREATE TABLE "testschema"."selfref" (
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
