diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-06-25 21:30:34 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-06-25 21:30:34 +0000 |
| commit | 111d8e522b61169393e2698924db07586fdd847f (patch) | |
| tree | a62b7f9640246a64003131f472793a295417051f /src/backend/parser/parse_coerce.c | |
| parent | 621691d816c45396ab9f8f9486ee9eb2a037795c (diff) | |
| download | postgresql-111d8e522b61169393e2698924db07586fdd847f.tar.gz postgresql-111d8e522b61169393e2698924db07586fdd847f.zip | |
Back out array mega-patch.
Joe Conway
Diffstat (limited to 'src/backend/parser/parse_coerce.c')
| -rw-r--r-- | src/backend/parser/parse_coerce.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 7fd831ca916..987d129027f 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.99 2003/06/25 04:32:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.100 2003/06/25 21:30:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -859,11 +859,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types, /* Get the element type based on the array type, if we have one */ if (OidIsValid(array_typeid)) { - if (array_typeid != ANYARRAYOID) - array_typelem = get_element_type(array_typeid); - else - array_typelem = ANYELEMENTOID; - + array_typelem = get_element_type(array_typeid); if (!OidIsValid(array_typelem)) elog(ERROR, "Argument declared ANYARRAY is not an array: %s", format_type_be(array_typeid)); @@ -923,11 +919,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types, { if (!OidIsValid(array_typeid)) { - if (elem_typeid != ANYELEMENTOID) - array_typeid = get_array_type(elem_typeid); - else - array_typeid = ANYARRAYOID; - + array_typeid = get_array_type(elem_typeid); if (!OidIsValid(array_typeid)) elog(ERROR, "Cannot find array type for datatype %s", format_type_be(elem_typeid)); @@ -1178,11 +1170,6 @@ IsBinaryCoercible(Oid srctype, Oid targettype) if (srctype == targettype) return true; - /* Last of the fast-paths: check for matching polymorphic arrays */ - if (targettype == ANYARRAYOID) - if (get_element_type(srctype) != InvalidOid) - return true; - /* Else look in pg_cast */ tuple = SearchSysCache(CASTSOURCETARGET, ObjectIdGetDatum(srctype), |