Coercion sanity check in ri_HashCompareOp failed to allow for enums, as per

example from Rod Taylor.  On reflection the correct test here is for any
polymorphic type, not specifically ANYARRAY as in the original coding.

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index da4d91b7a218efcad223d6648828d4fdef23cbfb..39f33a83e46657038334d966044bcf8775c3fc34 100644 (file)
--- 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.242.2.2 2008/05/09 22:37:34 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.242.2.3 2008/05/19 04:14:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4139,11 +4139,11 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
                        /*
                         * Otherwise, look for an implicit cast from the FK type to the
                         * opcintype, and if found, use the primary equality operator.
-                        * This is a bit tricky because opcintype might be a generic type
-                        * such as ANYARRAY, and so what we have to test is whether the
-                        * two actual column types can be concurrently cast to that type.
-                        * (Otherwise, we'd fail to reject combinations such as int[] and
-                        * point[].)
+                        * This is a bit tricky because opcintype might be a polymorphic
+                        * type such as ANYARRAY or ANYENUM; so what we have to test is
+                        * whether the two actual column types can be concurrently cast to
+                        * that type.  (Otherwise, we'd fail to reject combinations such
+                        * as int[] and point[].)
                         */
                        Oid                     input_typeids[2];
                        Oid                     target_typeids[2];

diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index ce560054ceab1ade6e57541187f797bdb7860dce..acb1118f649ed1c7a14f6c7bc31982438c3457ba 100644 (file)
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -15,7 +15,7 @@
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.103.2.1 2008/02/18 23:00:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.103.2.2 2008/05/19 04:14:33 tgl Exp $
  *
  * ----------
  */
@@ -3933,8 +3933,12 @@ ri_HashCompareOp(Oid eq_opr, Oid typeid)
                        if (pathtype != COERCION_PATH_FUNC &&
                                pathtype != COERCION_PATH_RELABELTYPE)
                        {
-                               /* If target is ANYARRAY, assume it's OK, else punt. */
-                               if (lefttype != ANYARRAYOID)
+                               /*
+                                * The declared input type of the eq_opr might be a
+                                * polymorphic type such as ANYARRAY or ANYENUM.  If so,
+                                * assume the coercion is valid; otherwise complain.
+                                */
+                               if (!IsPolymorphicType(lefttype))
                                        elog(ERROR, "no conversion function from %s to %s",
                                                 format_type_be(typeid),
                                                 format_type_be(lefttype));