diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/parser/parse_coerce.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/adt/selfuncs.c | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 35312eaadf0..8ff54677ef6 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.37 2000/03/19 00:15:39 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.38 2000/03/20 04:02:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -129,7 +129,7 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, /* safety check that we got the right thing */ if (exprType(result) != targetTypeId) elog(ERROR, "coerce_type: conversion function %s produced %s", - typeTypeName(targetType), + typeTypeName(targetType), typeidTypeName(exprType(result))); /* @@ -320,6 +320,7 @@ TypeCategory(Oid inType) case (NAMEOID): case (BPCHAROID): case (VARCHAROID): + case (BYTEAOID): case (TEXTOID): case (LZTEXTOID): result = STRING_TYPE; @@ -550,6 +551,7 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2) { case (BPCHAROID): case (VARCHAROID): + case (BYTEAOID): case (TEXTOID): case (INT2OID): @@ -614,6 +616,7 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2) { case (BPCHAROID): case (VARCHAROID): + case (BYTEA): case (TEXTOID): case (INT2OID): diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index ff5ec332ea2..76211e688b9 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.57 2000/02/26 23:03:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.58 2000/03/20 04:02:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -536,6 +536,7 @@ convert_to_scalar(Datum value, Oid typid, } case BPCHAROID: case VARCHAROID: + case BYTEA: case TEXTOID: if (VARSIZE(DatumGetPointer(value)) > VARHDRSZ) { @@ -595,7 +596,7 @@ convert_to_scalar(Datum value, Oid typid, return true; case TINTERVALOID: { - TimeInterval interval = (TimeInterval) DatumGetPointer(value); + TimeInterval interval = (TimeInterval) DatumGetPointer(value); if (interval->status != 0) { |