git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Convert elog() to ereport() and do some wordsmithing.

author Robert Haas <rhaas@postgresql.org>

2016年12月21日 16:47:13 +0000 (11:47 -0500)

committer Robert Haas <rhaas@postgresql.org>

2016年12月21日 16:47:50 +0000 (11:47 -0500)

It's not entirely clear that we should log a message here at all, but
it's certainly wrong to use elog() for a message that should clearly
be translatable.

Amit Langote

src/backend/commands/tablecmds.c patch | blob | blame | history

src/test/regress/expected/alter_table.out patch | blob | blame | history

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c

index 1c219b03dd92f6ea2b62f87e0c3ab93a14fd2f3b..115b98313e350d0916ff5c79521d12effc30b3f0 100644 (file)

--- a/src/backend/commands/tablecmds.c

+++ b/src/backend/commands/tablecmds.c

@@ -13297,8 +13297,11 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)

}

+ /* It's safe to skip the validation scan after all */

if (skip_validate)

- elog(NOTICE, "skipping scan to validate partition constraint");

+ ereport(INFO,

+ (errmsg("partition constraint for table \"%s\" is implied by existing constraints",

+ RelationGetRelationName(attachRel))));

* Set up to have the table to be scanned to validate the partition

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out

index 99e20eb922b7ddd6d4c14956c259ccc8d62feb24..62e18961d3820f7d20c266901384a6584a1df53b 100644 (file)

--- a/src/test/regress/expected/alter_table.out

+++ b/src/test/regress/expected/alter_table.out

@@ -3179,7 +3179,7 @@ ALTER TABLE list_parted2 ATTACH PARTITION part_3_4 FOR VALUES IN (3, 4);

ALTER TABLE list_parted2 DETACH PARTITION part_3_4;

ALTER TABLE part_3_4 ALTER a SET NOT NULL;

ALTER TABLE list_parted2 ATTACH PARTITION part_3_4 FOR VALUES IN (3, 4);

-NOTICE: skipping scan to validate partition constraint

+INFO: partition constraint for table "part_3_4" is implied by existing constraints

-- check validation when attaching range partitions

CREATE TABLE range_parted (

a int,

@@ -3204,7 +3204,7 @@ CREATE TABLE part2 (

b int NOT NULL CHECK (b >= 10 AND b < 18)

);

ALTER TABLE range_parted ATTACH PARTITION part2 FOR VALUES FROM (1, 10) TO (1, 20);

-NOTICE: skipping scan to validate partition constraint

+INFO: partition constraint for table "part2" is implied by existing constraints

-- check that leaf partitions are scanned when attaching a partitioned

-- table

CREATE TABLE part_5 (

@@ -3219,7 +3219,7 @@ ERROR: partition constraint is violated by some row

DELETE FROM part_5_a WHERE a NOT IN (3);

ALTER TABLE part_5 ADD CONSTRAINT check_a CHECK (a IN (5)), ALTER a SET NOT NULL;

ALTER TABLE list_parted2 ATTACH PARTITION part_5 FOR VALUES IN (5);

-NOTICE: skipping scan to validate partition constraint

+INFO: partition constraint for table "part_5" is implied by existing constraints

-- check that the table being attached is not already a partition

ALTER TABLE list_parted2 ATTACH PARTITION part_2 FOR VALUES IN (2);

ERROR: "part_2" is already a partition

This is the main PostgreSQL git repository.

RSS Atom