aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands/tablecmds.c
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2017-04-28 14:48:38 -0400
committerRobert Haas <rhaas@postgresql.org>2017-04-28 14:52:20 -0400
commit93a07a68eed76d36519ff17eb9bedc376f38e8c5 (patch)
tree6f1adb6b86f276714fb08daa3feefd3f6f551fff /src/backend/commands/tablecmds.c
parentb6ecf26ccc2b3e3895979c8fa08d21e8175b81cc (diff)
downloadpostgresql-93a07a68eed76d36519ff17eb9bedc376f38e8c5.tar.gz
postgresql-93a07a68eed76d36519ff17eb9bedc376f38e8c5.zip
Fix VALIDATE CONSTRAINT to consider NO INHERIT attribute.
Currently, trying to validate a NO INHERIT constraint on the parent will search for the constraint in child tables (where it is not supposed to exist), wrongly causing a "constraint does not exist" error. Amit Langote, per a report from Hans Buschmann. Discussion: http://postgr.es/m/20170421184012.24362.19@wrigleys.postgresql.org
Diffstat (limited to 'src/backend/commands/tablecmds.c')
-rw-r--r--src/backend/commands/tablecmds.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 468aa1c44fc..f17fbc7e36f 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -6540,9 +6540,10 @@ ATExecValidateConstraint(Relation rel, char *constrName, bool recurse,
/*
* If we're recursing, the parent has already done this, so skip
- * it.
+ * it. Also, if the constraint is a NO INHERIT constraint, we
+ * shouldn't try to look for it in the children.
*/
- if (!recursing)
+ if (!recursing && !con->connoinherit)
children = find_all_inheritors(RelationGetRelid(rel),
lockmode, NULL);