diff options
author | Robert Haas <rhaas@postgresql.org> | 2010-08-03 15:47:02 +0000 |
---|---|---|
committer | Robert Haas <rhaas@postgresql.org> | 2010-08-03 15:47:02 +0000 |
commit | 31b6fc06d83c6de3644c8f2921eb7de0eb92fac3 (patch) | |
tree | c27aed47f845d6931ad64f7ebf40edc5aea08187 /src | |
parent | 8c19d14be57225d52f0cbdce48a9c7e26aa74a27 (diff) | |
download | postgresql-31b6fc06d83c6de3644c8f2921eb7de0eb92fac3.tar.gz postgresql-31b6fc06d83c6de3644c8f2921eb7de0eb92fac3.zip |
Fix inheritance count tracking in ALTER TABLE .. ADD CONSTRAINT.
Without this patch, constraints inherited by children of a parent
table which itself has multiple inheritance parents can end up with
the wrong coninhcount. After dropping the constraint, the children
end up with a leftover copy of the constraint that is not dumped
and cannot be dropped. There is a similar problem with ALTER TABLE
.. ADD COLUMN, but that looks significantly more difficult to
resolve, so I'm committing this fix separately.
Back-patch to 8.4, which is the first release that has coninhcount.
Report by Hank Enting.
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/commands/tablecmds.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index b16232a0b52..2ab1cbedc7b 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.337 2010/07/29 19:23:20 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.338 2010/08/03 15:47:02 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -4891,6 +4891,15 @@ ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel, CommandCounterIncrement(); /* + * If the constraint got merged with an existing constraint, we're done. + * We mustn't recurse to child tables in this case, because they've already + * got the constraint, and visiting them again would lead to an incorrect + * value for coninhcount. + */ + if (newcons == NIL) + return; + + /* * Propagate to children as appropriate. Unlike most other ALTER * routines, we have to do this one level of recursion at a time; we can't * use find_all_inheritors to do it in one pass. |