@@ -601,7 +601,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId)
601601 cooked -> skip_validation = false;
602602 cooked -> is_local = true; /* not used for defaults */
603603 cooked -> inhcount = 0 ; /* ditto */
604- cooked -> is_only = false;
604+ cooked -> is_no_inherit = false;
605605 cookedDefaults = lappend (cookedDefaults , cooked );
606606 descriptor -> attrs [attnum - 1 ]-> atthasdef = true;
607607 }
@@ -661,7 +661,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId)
661661 */
662662 if (rawDefaults || stmt -> constraints )
663663 AddRelationNewConstraints (rel , rawDefaults , stmt -> constraints ,
664- true, true, false );
664+ true, true);
665665
666666 /*
667667 * Clean up. We keep lock on new relation (although it shouldn't be
@@ -1655,7 +1655,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
16551655 Node * expr ;
16561656
16571657 /* ignore if the constraint is non-inheritable */
1658- if (check [i ].cconly )
1658+ if (check [i ].ccnoinherit )
16591659 continue ;
16601660
16611661 /* adjust varattnos of ccbin here */
@@ -1676,7 +1676,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
16761676 cooked -> skip_validation = false;
16771677 cooked -> is_local = false;
16781678 cooked -> inhcount = 1 ;
1679- cooked -> is_only = false;
1679+ cooked -> is_no_inherit = false;
16801680 constraints = lappend (constraints , cooked );
16811681 }
16821682 }
@@ -2399,7 +2399,7 @@ rename_constraint_internal(Oid myrelid,
23992399 constraintOid );
24002400 con = (Form_pg_constraint ) GETSTRUCT (tuple );
24012401
2402- if (myrelid && con -> contype == CONSTRAINT_CHECK && !con -> conisonly )
2402+ if (myrelid && con -> contype == CONSTRAINT_CHECK && !con -> connoinherit )
24032403 {
24042404 if (recurse )
24052405 {
@@ -4573,7 +4573,7 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
45734573 * This function is intended for CREATE TABLE, so it processes a
45744574 * _list_ of defaults, but we just do one.
45754575 */
4576- AddRelationNewConstraints (rel , list_make1 (rawEnt ), NIL , false, true, false );
4576+ AddRelationNewConstraints (rel , list_make1 (rawEnt ), NIL , false, true);
45774577
45784578 /* Make the additional catalog changes visible */
45794579 CommandCounterIncrement ();
@@ -5015,7 +5015,7 @@ ATExecColumnDefault(Relation rel, const char *colName,
50155015 * This function is intended for CREATE TABLE, so it processes a
50165016 * _list_ of defaults, but we just do one.
50175017 */
5018- AddRelationNewConstraints (rel , list_make1 (rawEnt ), NIL , false, true, false );
5018+ AddRelationNewConstraints (rel , list_make1 (rawEnt ), NIL , false, true);
50195019 }
50205020}
50215021
@@ -5680,16 +5680,11 @@ ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
56805680 * omitted from the returned list, which is what we want: we do not need
56815681 * to do any validation work. That can only happen at child tables,
56825682 * though, since we disallow merging at the top level.
5683- *
5684- * Note: we set is_only based on the recurse flag which is false when
5685- * interpretInhOption() of our statement returns false all the way up
5686- * in AlterTable and gets passed all the way down to here.
56875683 */
56885684 newcons = AddRelationNewConstraints (rel , NIL ,
56895685 list_make1 (copyObject (constr )),
5690- recursing , /* allow_merge */
5691- !recursing , /* is_local */
5692- !recurse && !recursing ); /* is_only */
5686+ recursing , /* allow_merge */
5687+ !recursing ); /* is_local */
56935688
56945689 /* Add each to-be-validated constraint to Phase 3's queue */
56955690 foreach (lcon , newcons )
@@ -5730,9 +5725,9 @@ ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
57305725 return ;
57315726
57325727 /*
5733- * Adding an ONLY constraint? No need to find our children
5728+ * Adding a NO INHERIT constraint? No need to find our children
57345729 */
5735- if (! recurse && ! recursing )
5730+ if (constr -> is_no_inherit )
57365731 return ;
57375732
57385733 /*
@@ -5742,6 +5737,16 @@ ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
57425737 */
57435738 children = find_inheritance_children (RelationGetRelid (rel ), lockmode );
57445739
5740+ /*
5741+ * Check if ONLY was specified with ALTER TABLE. If so, allow the
5742+ * contraint creation only if there are no children currently. Error out
5743+ * otherwise.
5744+ */
5745+ if (!recurse && children != NIL )
5746+ ereport (ERROR ,
5747+ (errcode (ERRCODE_INVALID_TABLE_DEFINITION ),
5748+ errmsg ("constraint must be added to child tables too" )));
5749+
57455750 foreach (child , children )
57465751 {
57475752 Oid childrelid = lfirst_oid (child );
@@ -6127,7 +6132,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
61276132 NULL ,
61286133 true, /* islocal */
61296134 0 , /* inhcount */
6130- false); /* isonly */
6135+ false); /* isnoinherit */
61316136
61326137 /*
61336138 * Create the triggers that will enforce the constraint.
@@ -6998,8 +7003,7 @@ ATExecDropConstraint(Relation rel, const char *constrName,
69987003 ScanKeyData key ;
69997004 HeapTuple tuple ;
70007005 bool found = false;
7001- bool is_check_constraint = false;
7002- bool is_only_constraint = false;
7006+ bool is_no_inherit_constraint = false;
70037007
70047008 /* At top level, permission check was done in ATPrepCmd, else do it */
70057009 if (recursing )
@@ -7033,15 +7037,7 @@ ATExecDropConstraint(Relation rel, const char *constrName,
70337037 errmsg ("cannot drop inherited constraint \"%s\" of relation \"%s\"" ,
70347038 constrName , RelationGetRelationName (rel ))));
70357039
7036- /* Right now only CHECK constraints can be inherited */
7037- if (con -> contype == CONSTRAINT_CHECK )
7038- is_check_constraint = true;
7039-
7040- if (con -> conisonly )
7041- {
7042- Assert (is_check_constraint );
7043- is_only_constraint = true;
7044- }
7040+ is_no_inherit_constraint = con -> connoinherit ;
70457041
70467042 /*
70477043 * Perform the actual constraint deletion
@@ -7084,7 +7080,7 @@ ATExecDropConstraint(Relation rel, const char *constrName,
70847080 * routines, we have to do this one level of recursion at a time; we can't
70857081 * use find_all_inheritors to do it in one pass.
70867082 */
7087- if (is_check_constraint && ! is_only_constraint )
7083+ if (! is_no_inherit_constraint )
70887084 children = find_inheritance_children (RelationGetRelid (rel ), lockmode );
70897085 else
70907086 children = NIL ;
@@ -9250,8 +9246,8 @@ MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel)
92509246 if (parent_con -> contype != CONSTRAINT_CHECK )
92519247 continue ;
92529248
9253- /* if the parent's constraint is marked ONLY , it's not inherited */
9254- if (parent_con -> conisonly )
9249+ /* if the parent's constraint is marked NO INHERIT , it's not inherited */
9250+ if (parent_con -> connoinherit )
92559251 continue ;
92569252
92579253 /* Search for a child constraint matching this one */
@@ -9281,8 +9277,8 @@ MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel)
92819277 RelationGetRelationName (child_rel ),
92829278 NameStr (parent_con -> conname ))));
92839279
9284- /* If the constraint is "only " then cannot merge */
9285- if (child_con -> conisonly )
9280+ /* If the constraint is "no inherit " then cannot merge */
9281+ if (child_con -> connoinherit )
92869282 ereport (ERROR ,
92879283 (errcode (ERRCODE_INVALID_OBJECT_DEFINITION ),
92889284 errmsg ("constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\"" ,
0 commit comments