external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PG18 - Normalize \d+ output in PG18 by filtering “Not-null constraints” blocks (#8183) 

DESCRIPTION: Normalize \d+ output in PG18 by filtering “Not-null
constraints” blocks
fixes #8095 


**PR Description**
Postgres 18 started representing column `NOT NULL` as named constraints
in `pg_constraint`, and `psql \d+` now prints them under a `Not-null
constraints:` section. This caused extra diffs in our regression tests.

14e87ffa5c

This PR updates the normalization rules to strip those sections during
diff filtering by adding two regex rules:

* remove the `Not-null constraints:` header
* remove any indented constraint lines ending in `_not_null`
pull/8228/head
Mehmet YILMAZ 2025-10-02 13:48:27 +03:00 committed by GitHub
parent cec1848b13
commit d4dfdd765b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 315 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/regress/expected/generated_identity.out
View File

@ -473,25 +473,19 @@ SELECT create_distributed_table('color', 'color_id');
(1 row) (1 row)
INSERT INTO color(color_name) VALUES ('Blue'); INSERT INTO color(color_name) VALUES ('Blue');
\d+ color SELECT pg_get_serial_sequence('color', 'color_id');
Table "generated_identities.color" pg_get_serial_sequence
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------------------------------------------------------------------- ---------------------------------------------------------------------
color_id | bigint | | not null | generated always as identity | plain | | generated_identities.color_color_id_seq
color_name | character varying | | not null | | extended | | (1 row)
Indexes:
"color_color_id_key" UNIQUE CONSTRAINT, btree (color_id)
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO generated_identities; SET search_path TO generated_identities;
\d+ color SELECT pg_get_serial_sequence('color', 'color_id');
Table "generated_identities.color" pg_get_serial_sequence
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------------------------------------------------------------------- ---------------------------------------------------------------------
color_id | bigint | | not null | generated always as identity | plain | | generated_identities.color_color_id_seq
color_name | character varying | | not null | | extended | | (1 row)
Indexes:
"color_color_id_key" UNIQUE CONSTRAINT, btree (color_id)
INSERT INTO color(color_name) VALUES ('Red'); INSERT INTO color(color_name) VALUES ('Red');
-- alter sequence .. restart -- alter sequence .. restart

103
src/test/regress/expected/multi_partitioning_utils.out
View File

@ -118,15 +118,17 @@ SELECT generate_alter_table_attach_partition_command('date_partition_2007');
(1 row) (1 row)
-- detach and attach the partition by the command generated by us -- detach and attach the partition by the command generated by us
\d+ date_partitioned_table SELECT child.relname AS partition_name,
Partitioned table "public.date_partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
id | integer | | | | plain | | date_partition_2006 | FOR VALUES FROM ('01-01-2006') TO ('01-01-2007')
time | date | | | | plain | | date_partition_2007 | FOR VALUES FROM ('01-01-2007') TO ('01-01-2008')
Partition key: RANGE ("time") (2 rows)
Partitions: date_partition_2006 FOR VALUES FROM ('01-01-2006') TO ('01-01-2007'),
date_partition_2007 FOR VALUES FROM ('01-01-2007') TO ('01-01-2008')
SELECT detach_and_attach_partition('date_partition_2007', 'date_partitioned_table'); SELECT detach_and_attach_partition('date_partition_2007', 'date_partitioned_table');
detach_and_attach_partition detach_and_attach_partition
@ -135,15 +137,17 @@ SELECT detach_and_attach_partition('date_partition_2007', 'date_partitioned_tabl
(1 row) (1 row)
-- check that both partitions are visiable -- check that both partitions are visiable
\d+ date_partitioned_table SELECT child.relname AS partition_name,
Partitioned table "public.date_partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
id | integer | | | | plain | | date_partition_2006 | FOR VALUES FROM ('01-01-2006') TO ('01-01-2007')
time | date | | | | plain | | date_partition_2007 | FOR VALUES FROM ('01-01-2007') TO ('01-01-2008')
Partition key: RANGE ("time") (2 rows)
Partitions: date_partition_2006 FOR VALUES FROM ('01-01-2006') TO ('01-01-2007'),
date_partition_2007 FOR VALUES FROM ('01-01-2007') TO ('01-01-2008')
-- make sure that inter shard commands work as expected -- make sure that inter shard commands work as expected
-- assume that the shardId is 100 -- assume that the shardId is 100
@ -159,14 +163,16 @@ SELECT worker_apply_inter_shard_ddl_command(referencing_shard:=100, referencing_
(1 row) (1 row)
-- the hierarcy is successfully created -- the hierarcy is successfully created
\d+ date_partitioned_table_100 SELECT child.relname AS partition_name,
Partitioned table "public.date_partitioned_table_100" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table_100';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
id | integer | | | | plain | | date_partition_2007_100 | FOR VALUES FROM ('01-01-2007') TO ('01-02-2008')
time | date | | | | plain | | (1 row)
Partition key: RANGE ("time")
Partitions: date_partition_2007_100 FOR VALUES FROM ('01-01-2007') TO ('01-02-2008')
-- Citus can also get the DDL events for the partitions as regular tables -- Citus can also get the DDL events for the partitions as regular tables
SELECT master_get_table_ddl_events('date_partition_2007_100'); SELECT master_get_table_ddl_events('date_partition_2007_100');
@ -186,14 +192,15 @@ SELECT worker_apply_inter_shard_ddl_command(referencing_shard:=100, referencing_
(1 row) (1 row)
-- the hierarcy is successfully broken -- the hierarcy is successfully broken
\d+ date_partitioned_table_100 SELECT child.relname AS partition_name,
Partitioned table "public.date_partitioned_table_100" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table_100';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
id | integer | | | | plain | | (0 rows)
time | date | | | | plain | |
Partition key: RANGE ("time")
Number of partitions: 0
-- now lets have some more complex partitioning hierarcies with -- now lets have some more complex partitioning hierarcies with
-- tables on different schemas and constraints on the tables -- tables on different schemas and constraints on the tables
@ -242,15 +249,17 @@ SELECT public.generate_alter_table_attach_partition_command('child_2');
SET search_path = 'partition_parent_schema'; SET search_path = 'partition_parent_schema';
-- detach and attach the partition by the command generated by us -- detach and attach the partition by the command generated by us
\d+ parent_table SELECT child.relname AS partition_name,
Partitioned table "partition_parent_schema.parent_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'parent_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
id | integer | | not null | | plain | | child_1 | FOR VALUES FROM ('01-01-2009') TO ('01-02-2010')
time | date | | | now() | plain | | child_2 | FOR VALUES FROM ('01-01-2006') TO ('01-01-2007')
Partition key: RANGE ("time") (2 rows)
Partitions: partition_child_1_schema.child_1 FOR VALUES FROM ('01-01-2009') TO ('01-02-2010'),
partition_child_2_schema.child_2 FOR VALUES FROM ('01-01-2006') TO ('01-01-2007')
SELECT public.detach_and_attach_partition('partition_child_1_schema.child_1', 'parent_table'); SELECT public.detach_and_attach_partition('partition_child_1_schema.child_1', 'parent_table');
detach_and_attach_partition detach_and_attach_partition
@ -259,15 +268,17 @@ SELECT public.detach_and_attach_partition('partition_child_1_schema.child_1', 'p
(1 row) (1 row)
-- check that both partitions are visiable -- check that both partitions are visiable
\d+ parent_table SELECT child.relname AS partition_name,
Partitioned table "partition_parent_schema.parent_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'parent_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
id | integer | | not null | | plain | | child_2 | FOR VALUES FROM ('01-01-2006') TO ('01-01-2007')
time | date | | | now() | plain | | child_1 | FOR VALUES FROM ('01-01-2009') TO ('01-02-2010')
Partition key: RANGE ("time") (2 rows)
Partitions: partition_child_1_schema.child_1 FOR VALUES FROM ('01-01-2009') TO ('01-02-2010'),
partition_child_2_schema.child_2 FOR VALUES FROM ('01-01-2006') TO ('01-01-2007')
-- some very simple checks that should error out -- some very simple checks that should error out
SELECT public.generate_alter_table_attach_partition_command('parent_table'); SELECT public.generate_alter_table_attach_partition_command('parent_table');

246
src/test/regress/expected/pg17.out
View File

@ -743,15 +743,17 @@ SELECT create_distributed_table('partitioned_table', 'a');
CREATE TABLE pt_2 PARTITION OF partitioned_table FOR VALUES FROM (50) TO (1000); CREATE TABLE pt_2 PARTITION OF partitioned_table FOR VALUES FROM (50) TO (1000);
-- (1) The partitioned table has pt_1 and pt_2 as its partitions -- (1) The partitioned table has pt_1 and pt_2 as its partitions
\d+ partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | pt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | pt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) (2 rows)
Partitions: pt_1 FOR VALUES FROM (1) TO (50),
pt_2 FOR VALUES FROM (50) TO (1000)
-- (2) The partitions have the same identity column as the parent table; -- (2) The partitions have the same identity column as the parent table;
-- This is PG17 behavior for support for identity in partitioned tables. -- This is PG17 behavior for support for identity in partitioned tables.
@ -774,16 +776,18 @@ Partition of: partitioned_table FOR VALUES FROM (50) TO (1000)
-- Attaching a partition inherits the identity column from the parent table -- Attaching a partition inherits the identity column from the parent table
CREATE TABLE pt_3 (a bigint not null, c int); CREATE TABLE pt_3 (a bigint not null, c int);
ALTER TABLE partitioned_table ATTACH PARTITION pt_3 FOR VALUES FROM (1000) TO (2000); ALTER TABLE partitioned_table ATTACH PARTITION pt_3 FOR VALUES FROM (1000) TO (2000);
\d+ partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | pt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | pt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) pt_3 | FOR VALUES FROM (1000) TO (2000)
Partitions: pt_1 FOR VALUES FROM (1) TO (50), (3 rows)
pt_2 FOR VALUES FROM (50) TO (1000),
pt_3 FOR VALUES FROM (1000) TO (2000)
\d pt_3; \d pt_3;
Table "pg17.pt_3" Table "pg17.pt_3"
@ -803,16 +807,18 @@ DETAIL: The new partition may not contain an identity column.
SET search_path TO pg17; SET search_path TO pg17;
-- Show that DDL for partitioned_table has correctly propagated to the worker node; -- Show that DDL for partitioned_table has correctly propagated to the worker node;
-- (1) The partitioned table has pt_1, pt_2 and pt_3 as its partitions -- (1) The partitioned table has pt_1, pt_2 and pt_3 as its partitions
\d+ partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | pt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | pt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) pt_3 | FOR VALUES FROM (1000) TO (2000)
Partitions: pt_1 FOR VALUES FROM (1) TO (50), (3 rows)
pt_2 FOR VALUES FROM (50) TO (1000),
pt_3 FOR VALUES FROM (1000) TO (2000)
-- (2) The partititions have the same identity column as the parent table -- (2) The partititions have the same identity column as the parent table
\d pt_1; \d pt_1;
@ -845,15 +851,17 @@ SET search_path TO pg17;
ALTER TABLE partitioned_table DETACH PARTITION pt_3; ALTER TABLE partitioned_table DETACH PARTITION pt_3;
-- partitioned_table has pt_1, pt_2 as its partitions -- partitioned_table has pt_1, pt_2 as its partitions
-- and pt_3 does not have an identity column -- and pt_3 does not have an identity column
\d+ partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | pt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | pt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) (2 rows)
Partitions: pt_1 FOR VALUES FROM (1) TO (50),
pt_2 FOR VALUES FROM (50) TO (1000)
\d pt_3; \d pt_3;
Table "pg17.pt_3" Table "pg17.pt_3"
@ -865,15 +873,17 @@ Partitions: pt_1 FOR VALUES FROM (1) TO (50),
-- Verify that the detach has propagated to the worker node -- Verify that the detach has propagated to the worker node
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | pt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | pt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) (2 rows)
Partitions: pt_1 FOR VALUES FROM (1) TO (50),
pt_2 FOR VALUES FROM (50) TO (1000)
\d pt_3; \d pt_3;
Table "pg17.pt_3" Table "pg17.pt_3"
@ -903,16 +913,17 @@ ALTER TABLE alt_test ALTER COLUMN a SET GENERATED BY DEFAULT SET INCREMENT BY 2
ERROR: alter table command is currently unsupported ERROR: alter table command is currently unsupported
DETAIL: Only ADD|DROP COLUMN, SET|DROP NOT NULL, SET|DROP DEFAULT, ADD|DROP|VALIDATE CONSTRAINT, SET (), RESET (), ENABLE|DISABLE|NO FORCE|FORCE ROW LEVEL SECURITY, ATTACH|DETACH PARTITION and TYPE subcommands are supported. DETAIL: Only ADD|DROP COLUMN, SET|DROP NOT NULL, SET|DROP DEFAULT, ADD|DROP|VALIDATE CONSTRAINT, SET (), RESET (), ENABLE|DISABLE|NO FORCE|FORCE ROW LEVEL SECURITY, ATTACH|DETACH PARTITION and TYPE subcommands are supported.
-- Verify that the identity column was not added, on coordinator and worker nodes -- Verify that the identity column was not added, on coordinator and worker nodes
\d+ alt_test; SELECT child.relname AS partition_name,
Partitioned table "pg17.alt_test" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | integer | | | | plain | | alt_test_pt_1 | FOR VALUES FROM (1) TO (50)
b | date | | | | plain | | alt_test_pt_2 | FOR VALUES FROM (50) TO (100)
c | integer | | | | plain | | (2 rows)
Partition key: RANGE (c)
Partitions: alt_test_pt_1 FOR VALUES FROM (1) TO (50),
alt_test_pt_2 FOR VALUES FROM (50) TO (100)
\d alt_test_pt_1; \d alt_test_pt_1;
Table "pg17.alt_test_pt_1" Table "pg17.alt_test_pt_1"
@ -934,16 +945,17 @@ Partition of: alt_test FOR VALUES FROM (50) TO (100)
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ alt_test; SELECT child.relname AS partition_name,
Partitioned table "pg17.alt_test" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | integer | | | | plain | | alt_test_pt_1 | FOR VALUES FROM (1) TO (50)
b | date | | | | plain | | alt_test_pt_2 | FOR VALUES FROM (50) TO (100)
c | integer | | | | plain | | (2 rows)
Partition key: RANGE (c)
Partitions: alt_test_pt_1 FOR VALUES FROM (1) TO (50),
alt_test_pt_2 FOR VALUES FROM (50) TO (100)
\d alt_test_pt_1; \d alt_test_pt_1;
Table "pg17.alt_test_pt_1" Table "pg17.alt_test_pt_1"
@ -984,16 +996,17 @@ ALTER TABLE alt_test ALTER COLUMN a DROP IDENTITY;
ERROR: alter table command is currently unsupported ERROR: alter table command is currently unsupported
DETAIL: Only ADD|DROP COLUMN, SET|DROP NOT NULL, SET|DROP DEFAULT, ADD|DROP|VALIDATE CONSTRAINT, SET (), RESET (), ENABLE|DISABLE|NO FORCE|FORCE ROW LEVEL SECURITY, ATTACH|DETACH PARTITION and TYPE subcommands are supported. DETAIL: Only ADD|DROP COLUMN, SET|DROP NOT NULL, SET|DROP DEFAULT, ADD|DROP|VALIDATE CONSTRAINT, SET (), RESET (), ENABLE|DISABLE|NO FORCE|FORCE ROW LEVEL SECURITY, ATTACH|DETACH PARTITION and TYPE subcommands are supported.
-- Verify that alt_test still has identity on column a -- Verify that alt_test still has identity on column a
\d+ alt_test; SELECT child.relname AS partition_name,
Partitioned table "pg17.alt_test" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | alt_test_pt_1 | FOR VALUES FROM (1) TO (50)
b | integer | | | | plain | | alt_test_pt_2 | FOR VALUES FROM (50) TO (100)
c | integer | | | | plain | | (2 rows)
Partition key: RANGE (c)
Partitions: alt_test_pt_1 FOR VALUES FROM (1) TO (50),
alt_test_pt_2 FOR VALUES FROM (50) TO (100)
\d alt_test_pt_1; \d alt_test_pt_1;
Table "pg17.alt_test_pt_1" Table "pg17.alt_test_pt_1"
@ -1015,16 +1028,17 @@ Partition of: alt_test FOR VALUES FROM (50) TO (100)
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ alt_test; SELECT child.relname AS partition_name,
Partitioned table "pg17.alt_test" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | alt_test_pt_1 | FOR VALUES FROM (1) TO (50)
b | integer | | | | plain | | alt_test_pt_2 | FOR VALUES FROM (50) TO (100)
c | integer | | | | plain | | (2 rows)
Partition key: RANGE (c)
Partitions: alt_test_pt_1 FOR VALUES FROM (1) TO (50),
alt_test_pt_2 FOR VALUES FROM (50) TO (100)
\d alt_test_pt_1; \d alt_test_pt_1;
Table "pg17.alt_test_pt_1" Table "pg17.alt_test_pt_1"
@ -1064,16 +1078,18 @@ CREATE TABLE lpt_2 PARTITION OF local_partitioned_table FOR VALUES FROM (50) TO
CREATE TABLE lpt_3 (a bigint not null, c int); CREATE TABLE lpt_3 (a bigint not null, c int);
ALTER TABLE local_partitioned_table ATTACH PARTITION lpt_3 FOR VALUES FROM (1000) TO (2000); ALTER TABLE local_partitioned_table ATTACH PARTITION lpt_3 FOR VALUES FROM (1000) TO (2000);
-- The partitions have the same identity column as the parent table, on coordinator and worker nodes -- The partitions have the same identity column as the parent table, on coordinator and worker nodes
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.local_partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | lpt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | lpt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) lpt_3 | FOR VALUES FROM (1000) TO (2000)
Partitions: lpt_1 FOR VALUES FROM (1) TO (50), (3 rows)
lpt_2 FOR VALUES FROM (50) TO (1000),
lpt_3 FOR VALUES FROM (1000) TO (2000)
\d lpt_1; \d lpt_1;
Table "pg17.lpt_1" Table "pg17.lpt_1"
@ -1101,16 +1117,18 @@ Partition of: local_partitioned_table FOR VALUES FROM (1000) TO (2000)
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.local_partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | lpt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | lpt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) lpt_3 | FOR VALUES FROM (1000) TO (2000)
Partitions: lpt_1 FOR VALUES FROM (1) TO (50), (3 rows)
lpt_2 FOR VALUES FROM (50) TO (1000),
lpt_3 FOR VALUES FROM (1000) TO (2000)
\d lpt_1; \d lpt_1;
Table "pg17.lpt_1" Table "pg17.lpt_1"
@ -1140,15 +1158,17 @@ Partition of: local_partitioned_table FOR VALUES FROM (1000) TO (2000)
SET search_path TO pg17; SET search_path TO pg17;
-- Test detaching a partition with an identity column from a citus local table -- Test detaching a partition with an identity column from a citus local table
ALTER TABLE local_partitioned_table DETACH PARTITION lpt_3; ALTER TABLE local_partitioned_table DETACH PARTITION lpt_3;
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.local_partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | lpt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | lpt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) (2 rows)
Partitions: lpt_1 FOR VALUES FROM (1) TO (50),
lpt_2 FOR VALUES FROM (50) TO (1000)
\d lpt_3; \d lpt_3;
Table "pg17.lpt_3" Table "pg17.lpt_3"
@ -1159,15 +1179,17 @@ Partitions: lpt_1 FOR VALUES FROM (1) TO (50),
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
Partitioned table "pg17.local_partitioned_table" pg_get_expr(child.relpartbound, child.oid) AS partition_bound
Column | Type | Collation | Nullable | Default | Storage | Stats target | Description FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
partition_name | partition_bound
--------------------------------------------------------------------- ---------------------------------------------------------------------
a | bigint | | not null | generated by default as identity | plain | | lpt_1 | FOR VALUES FROM (1) TO (50)
c | integer | | | | plain | | lpt_2 | FOR VALUES FROM (50) TO (1000)
Partition key: RANGE (c) (2 rows)
Partitions: lpt_1 FOR VALUES FROM (1) TO (50),
lpt_2 FOR VALUES FROM (50) TO (1000)
\d lpt_3; \d lpt_3;
Table "pg17.lpt_3" Table "pg17.lpt_3"

4
src/test/regress/sql/generated_identity.sql
View File

@ -242,11 +242,11 @@ CREATE TABLE color (
) USING columnar; ) USING columnar;
SELECT create_distributed_table('color', 'color_id'); SELECT create_distributed_table('color', 'color_id');
INSERT INTO color(color_name) VALUES ('Blue'); INSERT INTO color(color_name) VALUES ('Blue');
\d+ color SELECT pg_get_serial_sequence('color', 'color_id');
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO generated_identities; SET search_path TO generated_identities;
\d+ color SELECT pg_get_serial_sequence('color', 'color_id');
INSERT INTO color(color_name) VALUES ('Red'); INSERT INTO color(color_name) VALUES ('Red');
-- alter sequence .. restart -- alter sequence .. restart
ALTER SEQUENCE color_color_id_seq RESTART WITH 1000; ALTER SEQUENCE color_color_id_seq RESTART WITH 1000;

42
src/test/regress/sql/multi_partitioning_utils.sql
View File

@ -102,12 +102,22 @@ SELECT generate_alter_table_attach_partition_command('date_partition_2006');
SELECT generate_alter_table_attach_partition_command('date_partition_2007'); SELECT generate_alter_table_attach_partition_command('date_partition_2007');
-- detach and attach the partition by the command generated by us -- detach and attach the partition by the command generated by us
\d+ date_partitioned_table SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table';
SELECT detach_and_attach_partition('date_partition_2007', 'date_partitioned_table'); SELECT detach_and_attach_partition('date_partition_2007', 'date_partitioned_table');
-- check that both partitions are visiable -- check that both partitions are visiable
\d+ date_partitioned_table SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table';
-- make sure that inter shard commands work as expected -- make sure that inter shard commands work as expected
@ -121,7 +131,12 @@ SELECT worker_apply_inter_shard_ddl_command(referencing_shard:=100, referencing_
command:='ALTER TABLE date_partitioned_table ATTACH PARTITION date_partition_2007 FOR VALUES FROM (''2007-01-01'') TO (''2008-01-02'')' ); command:='ALTER TABLE date_partitioned_table ATTACH PARTITION date_partition_2007 FOR VALUES FROM (''2007-01-01'') TO (''2008-01-02'')' );
-- the hierarcy is successfully created -- the hierarcy is successfully created
\d+ date_partitioned_table_100 SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table_100';
-- Citus can also get the DDL events for the partitions as regular tables -- Citus can also get the DDL events for the partitions as regular tables
SELECT master_get_table_ddl_events('date_partition_2007_100'); SELECT master_get_table_ddl_events('date_partition_2007_100');
@ -132,7 +147,12 @@ SELECT worker_apply_inter_shard_ddl_command(referencing_shard:=100, referencing_
command:='ALTER TABLE date_partitioned_table DETACH PARTITION date_partition_2007' ); command:='ALTER TABLE date_partitioned_table DETACH PARTITION date_partition_2007' );
-- the hierarcy is successfully broken -- the hierarcy is successfully broken
\d+ date_partitioned_table_100 SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'date_partitioned_table_100';
-- now lets have some more complex partitioning hierarcies with -- now lets have some more complex partitioning hierarcies with
-- tables on different schemas and constraints on the tables -- tables on different schemas and constraints on the tables
@ -171,12 +191,22 @@ SELECT public.generate_alter_table_attach_partition_command('child_2');
SET search_path = 'partition_parent_schema'; SET search_path = 'partition_parent_schema';
-- detach and attach the partition by the command generated by us -- detach and attach the partition by the command generated by us
\d+ parent_table SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'parent_table';
SELECT public.detach_and_attach_partition('partition_child_1_schema.child_1', 'parent_table'); SELECT public.detach_and_attach_partition('partition_child_1_schema.child_1', 'parent_table');
-- check that both partitions are visiable -- check that both partitions are visiable
\d+ parent_table SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'parent_table';
-- some very simple checks that should error out -- some very simple checks that should error out
SELECT public.generate_alter_table_attach_partition_command('parent_table'); SELECT public.generate_alter_table_attach_partition_command('parent_table');

91
src/test/regress/sql/pg17.sql
View File

@ -449,7 +449,12 @@ SELECT create_distributed_table('partitioned_table', 'a');
CREATE TABLE pt_2 PARTITION OF partitioned_table FOR VALUES FROM (50) TO (1000); CREATE TABLE pt_2 PARTITION OF partitioned_table FOR VALUES FROM (50) TO (1000);
-- (1) The partitioned table has pt_1 and pt_2 as its partitions -- (1) The partitioned table has pt_1 and pt_2 as its partitions
\d+ partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
-- (2) The partitions have the same identity column as the parent table; -- (2) The partitions have the same identity column as the parent table;
-- This is PG17 behavior for support for identity in partitioned tables. -- This is PG17 behavior for support for identity in partitioned tables.
@ -460,7 +465,12 @@ CREATE TABLE pt_2 PARTITION OF partitioned_table FOR VALUES FROM (50) TO (1000);
CREATE TABLE pt_3 (a bigint not null, c int); CREATE TABLE pt_3 (a bigint not null, c int);
ALTER TABLE partitioned_table ATTACH PARTITION pt_3 FOR VALUES FROM (1000) TO (2000); ALTER TABLE partitioned_table ATTACH PARTITION pt_3 FOR VALUES FROM (1000) TO (2000);
\d+ partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
\d pt_3; \d pt_3;
-- Partition pt_4 has its own identity column, which is not allowed in PG17 -- Partition pt_4 has its own identity column, which is not allowed in PG17
@ -473,7 +483,12 @@ ALTER TABLE partitioned_table ATTACH PARTITION pt_4 FOR VALUES FROM (2000) TO (3
SET search_path TO pg17; SET search_path TO pg17;
-- Show that DDL for partitioned_table has correctly propagated to the worker node; -- Show that DDL for partitioned_table has correctly propagated to the worker node;
-- (1) The partitioned table has pt_1, pt_2 and pt_3 as its partitions -- (1) The partitioned table has pt_1, pt_2 and pt_3 as its partitions
\d+ partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
-- (2) The partititions have the same identity column as the parent table -- (2) The partititions have the same identity column as the parent table
\d pt_1; \d pt_1;
@ -488,14 +503,24 @@ ALTER TABLE partitioned_table DETACH PARTITION pt_3;
-- partitioned_table has pt_1, pt_2 as its partitions -- partitioned_table has pt_1, pt_2 as its partitions
-- and pt_3 does not have an identity column -- and pt_3 does not have an identity column
\d+ partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
\d pt_3; \d pt_3;
-- Verify that the detach has propagated to the worker node -- Verify that the detach has propagated to the worker node
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'partitioned_table';
\d pt_3; \d pt_3;
\c - - - :master_port \c - - - :master_port
@ -516,14 +541,24 @@ ALTER TABLE alt_test ADD COLUMN d bigint GENERATED BY DEFAULT AS IDENTITY (START
ALTER TABLE alt_test ALTER COLUMN a SET GENERATED BY DEFAULT SET INCREMENT BY 2 SET START WITH 75 RESTART; ALTER TABLE alt_test ALTER COLUMN a SET GENERATED BY DEFAULT SET INCREMENT BY 2 SET START WITH 75 RESTART;
-- Verify that the identity column was not added, on coordinator and worker nodes -- Verify that the identity column was not added, on coordinator and worker nodes
\d+ alt_test; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
\d alt_test_pt_1; \d alt_test_pt_1;
\d alt_test_pt_2; \d alt_test_pt_2;
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ alt_test; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
\d alt_test_pt_1; \d alt_test_pt_1;
\d alt_test_pt_2; \d alt_test_pt_2;
@ -545,14 +580,24 @@ CREATE TABLE alt_test_pt_2 PARTITION OF alt_test FOR VALUES FROM (50) TO (100);
ALTER TABLE alt_test ALTER COLUMN a DROP IDENTITY; ALTER TABLE alt_test ALTER COLUMN a DROP IDENTITY;
-- Verify that alt_test still has identity on column a -- Verify that alt_test still has identity on column a
\d+ alt_test; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
\d alt_test_pt_1; \d alt_test_pt_1;
\d alt_test_pt_2; \d alt_test_pt_2;
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ alt_test; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'alt_test';
\d alt_test_pt_1; \d alt_test_pt_1;
\d alt_test_pt_2 \d alt_test_pt_2
@ -577,7 +622,12 @@ CREATE TABLE lpt_3 (a bigint not null, c int);
ALTER TABLE local_partitioned_table ATTACH PARTITION lpt_3 FOR VALUES FROM (1000) TO (2000); ALTER TABLE local_partitioned_table ATTACH PARTITION lpt_3 FOR VALUES FROM (1000) TO (2000);
-- The partitions have the same identity column as the parent table, on coordinator and worker nodes -- The partitions have the same identity column as the parent table, on coordinator and worker nodes
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
\d lpt_1; \d lpt_1;
\d lpt_2; \d lpt_2;
\d lpt_3; \d lpt_3;
@ -585,7 +635,12 @@ ALTER TABLE local_partitioned_table ATTACH PARTITION lpt_3 FOR VALUES FROM (1000
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
\d lpt_1; \d lpt_1;
\d lpt_2; \d lpt_2;
\d lpt_3; \d lpt_3;
@ -596,13 +651,23 @@ SET search_path TO pg17;
-- Test detaching a partition with an identity column from a citus local table -- Test detaching a partition with an identity column from a citus local table
ALTER TABLE local_partitioned_table DETACH PARTITION lpt_3; ALTER TABLE local_partitioned_table DETACH PARTITION lpt_3;
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
\d lpt_3; \d lpt_3;
\c - - - :worker_1_port \c - - - :worker_1_port
SET search_path TO pg17; SET search_path TO pg17;
\d+ local_partitioned_table; SELECT child.relname AS partition_name,
pg_get_expr(child.relpartbound, child.oid) AS partition_bound
FROM pg_inherits
JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
JOIN pg_class child ON pg_inherits.inhrelid = child.oid
WHERE parent.relname = 'local_partitioned_table';
\d lpt_3; \d lpt_3;
\c - - - :master_port \c - - - :master_port