From 5cdec1b6ce61f75d886109d7daafd57b8064a4a6 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Wed, 8 May 2024 11:15:53 +0200 Subject: [PATCH 1/6] Fix typos in error messages Reported by Kyotaro Horiguchi --- src/backend/catalog/pg_constraint.c | 2 +- src/backend/commands/tablecmds.c | 3 +-- src/test/regress/expected/inherit.out | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 6b8496e085..12a73d5a30 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -758,7 +758,7 @@ AdjustNotNullInheritance1(Oid relid, AttrNumber attnum, int count, if (!allow_noinherit_change) ereport(ERROR, errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("cannot change NO INHERIT status of NOT NULL constraint \"%s\" in relation \"%s\"", + errmsg("cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\"", NameStr(conform->conname), get_rel_name(relid))); conform->connoinherit = false; diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 5bf5e69c5b..925978c35b 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -7905,11 +7905,10 @@ ATExecSetNotNull(List **wqueue, Relation rel, char *conName, char *colName, if (conForm->connoinherit && recurse) ereport(ERROR, errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot change NO INHERIT status of NOT NULL constraint \"%s\" in relation \"%s\"", + errmsg("cannot change NO INHERIT status of NOT NULL constraint \"%s\" on relation \"%s\"", NameStr(conForm->conname), RelationGetRelationName(rel))); - /* * If we find an appropriate constraint, we're almost done, but just * need to change some properties on it: if we're recursing, increment diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out index eaa65049c7..a621db0aa3 100644 --- a/src/test/regress/expected/inherit.out +++ b/src/test/regress/expected/inherit.out @@ -2280,9 +2280,9 @@ drop table inh_nn_parent, inh_nn_child, inh_nn_child2; CREATE TABLE inh_nn_parent (a int, NOT NULL a NO INHERIT); CREATE TABLE inh_nn_child() INHERITS (inh_nn_parent); ALTER TABLE inh_nn_parent ADD CONSTRAINT nna NOT NULL a; -ERROR: cannot change NO INHERIT status of NOT NULL constraint "inh_nn_parent_a_not_null" in relation "inh_nn_parent" +ERROR: cannot change NO INHERIT status of NOT NULL constraint "inh_nn_parent_a_not_null" on relation "inh_nn_parent" ALTER TABLE inh_nn_parent ALTER a SET NOT NULL; -ERROR: cannot change NO INHERIT status of NOT NULL constraint "inh_nn_parent_a_not_null" in relation "inh_nn_parent" +ERROR: cannot change NO INHERIT status of NOT NULL constraint "inh_nn_parent_a_not_null" on relation "inh_nn_parent" DROP TABLE inh_nn_parent cascade; NOTICE: drop cascades to table inh_nn_child -- Adding a PK at the top level of a hierarchy should cause all descendants -- 2.39.2