Commit63e98b5

committed

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 anypolymorphic type, not specifically ANYARRAY as in the original coding.

1 parent2dad10f commit63e98b5Copy full SHA for 63e98b5

File tree

+13

-9

lines changed

+13

-9

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.254 2008/05/16 23:36:04 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.255 2008/05/19 04:14:24 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -4377,11 +4377,11 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,`
`4377`	`4377`	`/*`
`4378`	`4378`	`* Otherwise, look for an implicit cast from the FK type to the`
`4379`	`4379`	`* opcintype, and if found, use the primary equality operator.`
`4380`		`- * This is a bit tricky because opcintype might be ageneric type`
`4381`		`- * such as ANYARRAY, andso what we have to test is whether the`
`4382`		`- * two actual column types can be concurrently cast to that type.`
`4383`		`- * (Otherwise, we'd fail to reject combinations such as int[] and`
`4384`		`- * point[].)`
	`4380`	`+ * This is a bit tricky because opcintype might be apolymorphic`
	`4381`	`+ *typesuch as ANYARRAY or ANYENUM;so what we have to test is`
	`4382`	`+ *whether thetwo actual column types can be concurrently cast to`
	`4383`	`+ *that type.(Otherwise, we'd fail to reject combinations such`
	`4384`	`+ *as int[] andpoint[].)`
`4385`	`4385`	`*/`
`4386`	`4386`	`Oidinput_typeids[2];`
`4387`	`4387`	`Oidtarget_typeids[2];`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`17`	`17`	`*`
`18`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.108 2008/05/12 20:02:02 alvherre Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.109 2008/05/19 04:14:24 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`* ----------`
`21`	`21`	`*/`
`@@ -3938,8 +3938,12 @@ ri_HashCompareOp(Oid eq_opr, Oid typeid)`
`3938`	`3938`	`if (pathtype!=COERCION_PATH_FUNC&&`
`3939`	`3939`	`pathtype!=COERCION_PATH_RELABELTYPE)`
`3940`	`3940`	`{`
`3941`		`-/* If target is ANYARRAY, assume it's OK, else punt. */`
`3942`		`-if (lefttype!=ANYARRAYOID)`
	`3941`	`+/*`
	`3942`	`+ * The declared input type of the eq_opr might be a`
	`3943`	`+ * polymorphic type such as ANYARRAY or ANYENUM. If so,`
	`3944`	`+ * assume the coercion is valid; otherwise complain.`
	`3945`	`+ */`
	`3946`	`+if (!IsPolymorphicType(lefttype))`
`3943`	`3947`	`elog(ERROR,"no conversion function from %s to %s",`
`3944`	`3948`	`format_type_be(typeid),`
`3945`	`3949`	`format_type_be(lefttype));`

Comments

(0)