Message style improvement

Backpatch the part of edee0c621de that applies to a90bdd7a44d, which
was also backpatched.  That way, the message is consistent in all
branches.

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index ff2b36d669984d7972947f2da8eadb1fcd4bc2d2..7964e1016e4c2c2b442643b782365ebaf539f0bf 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -9310,7 +9310,7 @@ CloneFkReferencing(List **wqueue, Relation parentRel, Relation partRel)
        if (fk->confrelid == RelationGetRelid(partRel))
            ereport(ERROR,
                    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                    errmsg("can't attach table \"%s\" as a partition which is referenced by foreign key \"%s\"",
+                    errmsg("cannot attach table \"%s\" as a partition because it is referenced by foreign key \"%s\"",
                            RelationGetRelationName(partRel),
                            get_constraint_name(fk->conoid))));
 

diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index a4ec915e153917cbf6c6ab829b31b6fbfadd5850..620011e3e2285766bf8e872609926b37c06f6011 100644 (file)
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -1901,7 +1901,7 @@ ALTER TABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_2
 CREATE TABLE fk_partitioned_pk_6 (a int PRIMARY KEY);
 CREATE TABLE fk_partitioned_fk_6 (a int REFERENCES fk_partitioned_pk_6) PARTITION BY LIST (a);
 ALTER TABLE fk_partitioned_fk_6 ATTACH PARTITION fk_partitioned_pk_6 FOR VALUES IN (1);
-ERROR:  can't attach table "fk_partitioned_pk_6" as a partition which is referenced by foreign key "fk_partitioned_fk_6_a_fkey"
+ERROR:  cannot attach table "fk_partitioned_pk_6" as a partition because it is referenced by foreign key "fk_partitioned_fk_6_a_fkey"
 DROP TABLE fk_partitioned_pk_6, fk_partitioned_fk_6;
 -- This case is similar to above, but the referenced relation is one level
 -- lower in the hierarchy.  This one fails in a different way as the above,