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 b7b4491213c0cf37813b0683033a83838cad9dae..c3ff499ff560e2b8e3024a2017f765457833960c 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -4377,11 +4377,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 cf2fdc087a884b34e8d69c0ed215a905ff4f12be..83170eca65cac0647488df1bf9bbdb66c1cdd664 100644 (file)
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -3938,8 +3938,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));