From d721f208afeac72a943dc88d072ff3df05f53fef Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 20 Jul 2012 12:33:34 -0400 Subject: connoinherit may be true only for CHECK constraints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The code was setting it true for other constraints, which is bogus. Doing so caused bogus catalog entries for such constraints, and in particular caused an error to be raised when trying to drop a constraint of types other than CHECK from a table that has children, such as reported in bug #6712. In 9.2, additionally ignore connoinherit=true for other constraint types, to avoid having to force initdb; existing databases might already contain bogus catalog entries. Includes a catversion bump (in HEAD only). Bug report from Miroslav Šulc Analysis from Amit Kapila and Noah Misch; Amit also contributed the patch. --- src/backend/commands/tablecmds.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/backend/commands/tablecmds.c') diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 70e408cb6ea..6ff08a29cc1 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -6039,7 +6039,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel, NULL, true, /* islocal */ 0, /* inhcount */ - false); /* isnoinherit */ + true); /* isnoinherit */ /* * Create the triggers that will enforce the constraint. @@ -6947,6 +6947,16 @@ ATExecDropConstraint(Relation rel, const char *constrName, is_no_inherit_constraint = con->connoinherit; + /* + * XXX as a special hack, we turn on no-inherit here unconditionally + * except for CHECK constraints. This is because 9.2 until beta2 + * contained a bug that marked it false for all constraints, even + * though it was only supported false for CHECK constraints. + * See bug #6712. + */ + if (con->contype != CONSTRAINT_CHECK) + is_no_inherit_constraint = true; + /* * Perform the actual constraint deletion */ -- cgit v1.2.3