Fix an ancient oversight in change_varattnos_of_a_node: it neglected to update

varoattno along with varattno.  This resulted in having Vars that were not
seen as equal(), causing inheritance of the "same" constraint from different
parent relations to fail.  An example is

create table pp1 (f1 int check (f1>0));
create table cc1 (f2 text, f3 int) inherits (pp1);
create table cc2(f4 float) inherits(pp1,cc1);

Backpatch as far as 7.4.  (The test case still fails in 7.4, for reasons
that I don't feel like investigating at the moment.)

This is a backpatch commit only.  The fix will be applied in HEAD as part
of the upcoming pg_constraint patch.

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index ee195c6d04d41b9128484f80597fbb6cb207e6f2..952875c8dbb4972837dd2cfae08cb54a3757ac6d 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -1084,7 +1084,7 @@ change_varattnos_walker(Node *node, const AttrNumber *newattno)
                         * currently.
                         */
                        Assert(newattno[var->varattno - 1] > 0);
-                       var->varattno = newattno[var->varattno - 1];
+                       var->varattno = var->varoattno = newattno[var->varattno - 1];
                }
                return false;
        }