From 6594c2257fda5e571d3d7a70fc9a436abe6ad794 Mon Sep 17 00:00:00 2001 From: jian he Date: Mon, 25 Aug 2025 10:17:00 +0800 Subject: [PATCH v2 1/1] fix wholerow as partition key reference If the partition key contains wholerow reference, individual columns cannot be altered. discussion: https://postgr.es/m/CACJufxG5wLiATocRTaC=z+kw4mUaasC-50+q9K=fOdAr3=OGRw@mail.gmail.com --- src/backend/catalog/partition.c | 13 +++++++++++++ src/test/regress/expected/alter_table.out | 15 +++++++++++++++ src/test/regress/sql/alter_table.sql | 8 ++++++++ 3 files changed, 36 insertions(+) diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c index 93d72157a46..f8cb40d1423 100644 --- a/src/backend/catalog/partition.c +++ b/src/backend/catalog/partition.c @@ -290,6 +290,19 @@ has_partition_attrs(Relation rel, Bitmapset *attnums, bool *used_in_expr) /* Find all attributes referenced */ pull_varattnos(expr, 1, &expr_attrs); + + /* + * If partition expression contains wholerow reference, then any + * column is indirect part of the expression now. unconditionally + * set used_in_expr to true. + */ + if (bms_is_member(0 - FirstLowInvalidHeapAttributeNumber, expr_attrs)) + { + if (used_in_expr) + *used_in_expr = true; + return true; + } + partexprs_item = lnext(partexprs, partexprs_item); if (bms_overlap(attnums, expr_attrs)) diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index b33e06a0d3d..9dd896418dc 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -3987,6 +3987,21 @@ LINE 1: ALTER TABLE partitioned ALTER COLUMN b TYPE char(5); ALTER TABLE partitioned SET (fillfactor=100); ERROR: cannot specify storage parameters for a partitioned table HINT: Specify storage parameters for its leaf partitions instead. +-- if partition expression contain whole row reference, +-- alter invidual column data type, drop invidual column is not supported +CREATE TABLE partitioned1(a int, b int) PARTITION BY list((partitioned1)); +ALTER TABLE partitioned1 DROP COLUMN a; --error +ERROR: cannot drop column "a" because it is part of the partition key of relation "partitioned1" +ALTER TABLE partitioned1 DROP COLUMN b; --error +ERROR: cannot drop column "b" because it is part of the partition key of relation "partitioned1" +ALTER TABLE partitioned1 ALTER COLUMN a TYPE text; --error +ERROR: cannot alter column "a" because it is part of the partition key of relation "partitioned1" +LINE 1: ALTER TABLE partitioned1 ALTER COLUMN a TYPE text; + ^ +ALTER TABLE partitioned1 ALTER COLUMN b TYPE text; --error +ERROR: cannot alter column "b" because it is part of the partition key of relation "partitioned1" +LINE 1: ALTER TABLE partitioned1 ALTER COLUMN b TYPE text; + ^ -- partitioned table cannot participate in regular inheritance CREATE TABLE nonpartitioned ( a int, diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql index 90bf5c17682..445e90707cc 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -2392,6 +2392,14 @@ ALTER TABLE partitioned ALTER COLUMN b TYPE char(5); -- specifying storage parameters for partitioned tables is not supported ALTER TABLE partitioned SET (fillfactor=100); +-- if partition expression contain whole row reference, +-- alter invidual column data type, drop invidual column is not supported +CREATE TABLE partitioned1(a int, b int) PARTITION BY list((partitioned1)); +ALTER TABLE partitioned1 DROP COLUMN a; --error +ALTER TABLE partitioned1 DROP COLUMN b; --error +ALTER TABLE partitioned1 ALTER COLUMN a TYPE text; --error +ALTER TABLE partitioned1 ALTER COLUMN b TYPE text; --error + -- partitioned table cannot participate in regular inheritance CREATE TABLE nonpartitioned ( a int, -- 2.34.1