diff options
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/parse_coerce.c | 6 | ||||
| -rw-r--r-- | src/backend/parser/parse_target.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 283fd302407..52ba418401d 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.58 2001/06/19 22:39:11 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.59 2001/06/23 22:23:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -470,6 +470,7 @@ TypeCategory(Oid inType) case (CHAROID): case (NAMEOID): + case (BYTEAOID): case (BPCHAROID): case (VARCHAROID): case (TEXTOID): @@ -614,6 +615,7 @@ PromoteTypeToNext(Oid inType) result = VARCHAROID; break; + case (BYTEAOID): case (VARCHAROID): result = TEXTOID; break; @@ -708,6 +710,7 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2) case (CHAROID): switch (*arg2) { + case (BYTEAOID): case (BPCHAROID): case (VARCHAROID): case (TEXTOID): @@ -772,6 +775,7 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2) case (CHAROID): switch (*arg2) { + case (BYTEAOID): case (BPCHAROID): case (VARCHAROID): case (TEXTOID): diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index be48c899ddb..88a69b4c2b9 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.67 2001/05/21 18:42:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.68 2001/06/23 22:23:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,7 +56,7 @@ transformTargetEntry(ParseState *pstate, expr = transformExpr(pstate, node, EXPR_COLUMN_FIRST); if (IsA(expr, Ident) && ((Ident *)expr)->isRel) - elog(ERROR,"You can't use relation names alone in the target list, try relation.*."); + elog(ERROR,"You can't use relation names alone in the target list, try relation.*."); type_id = exprType(expr); type_mod = exprTypmod(expr); @@ -311,7 +311,9 @@ CoerceTargetExpr(ParseState *pstate, * string hacks to get transparent conversions w/o explicit * conversions */ - else if ((attrtype == BPCHAROID) || (attrtype == VARCHAROID)) + else if (attrtype == BPCHAROID || + attrtype == VARCHAROID || + attrtype == BYTEAOID) { Oid text_id = TEXTOID; |