From 6407538f0bfd3eb56f5a4574d8893f9494f2a810 Mon Sep 17 00:00:00 2001 From: Karina Litskevich Date: Fri, 14 Oct 2022 17:48:27 +0300 Subject: [PATCH v2 2/2] better error message for setting parameters for partitioned table --- src/backend/access/common/reloptions.c | 13 ++++++------- src/test/regress/expected/alter_table.out | 3 ++- src/test/regress/expected/create_table.out | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 6458a9c276..75d6ff5040 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -1984,13 +1984,12 @@ build_local_reloptions(local_relopts *relopts, Datum options, bool validate) bytea * partitioned_table_reloptions(Datum reloptions, bool validate) { - /* - * There are no options for partitioned tables yet, but this is able to do - * some validation. - */ - return (bytea *) build_reloptions(reloptions, validate, - RELOPT_KIND_PARTITIONED, - 0, NULL, 0); + if (validate && reloptions) + ereport(ERROR, + errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("cannot specify storage parameters for a partitioned table"), + errhint("specify storage parameters on leaf partitions instead")); + return NULL; } /* diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index cec7bfa1f1..a719ef22c7 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -3803,7 +3803,8 @@ ALTER TABLE partitioned ALTER COLUMN b TYPE char(5); ERROR: cannot alter column "b" because it is part of the partition key of relation "partitioned" -- specifying storage parameters for partitioned tables is not supported ALTER TABLE partitioned SET (fillfactor=100); -ERROR: unrecognized parameter "fillfactor" +ERROR: cannot specify storage parameters for a partitioned table +HINT: specify storage parameters on leaf partitions instead -- partitioned table cannot participate in regular inheritance CREATE TABLE nonpartitioned ( a int, diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 45c1a0a23e..f16be87729 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -989,7 +989,8 @@ Number of partitions: 0 DROP TABLE parted_col_comment; -- specifying storage parameters for partitioned tables is not supported CREATE TABLE parted_col_comment (a int, b text) PARTITION BY LIST (a) WITH (fillfactor=100); -ERROR: unrecognized parameter "fillfactor" +ERROR: cannot specify storage parameters for a partitioned table +HINT: specify storage parameters on leaf partitions instead -- list partitioning on array type column CREATE TABLE arrlp (a int[]) PARTITION BY LIST (a); CREATE TABLE arrlp12 PARTITION OF arrlp FOR VALUES IN ('{1}', '{2}'); -- 2.25.1