From 2216584bcf8d6e09e8214d1c0eb77705d78599d9 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 20 Mar 2000 15:42:47 +0000 Subject: [PATCH] Reverse out BYTEA type coersion. --- src/backend/parser/parse_coerce.c | 4 +--- src/backend/utils/adt/selfuncs.c | 3 +-- src/include/parser/parse_coerce.h | 9 +-------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 8ff54677ef..c7cbcd37d4 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.38 2000/03/20 04:02:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.39 2000/03/20 15:42:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -320,7 +320,6 @@ TypeCategory(Oid inType) case (NAMEOID): case (BPCHAROID): case (VARCHAROID): - case (BYTEAOID): case (TEXTOID): case (LZTEXTOID): result = STRING_TYPE; @@ -551,7 +550,6 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2) { case (BPCHAROID): case (VARCHAROID): - case (BYTEAOID): case (TEXTOID): case (INT2OID): diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 70c82b4946..61ff43b3e9 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.59 2000/03/20 04:26:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.60 2000/03/20 15:42:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -536,7 +536,6 @@ convert_to_scalar(Datum value, Oid typid, } case BPCHAROID: case VARCHAROID: - case BYTEAOID: case TEXTOID: if (VARSIZE(DatumGetPointer(value)) > VARHDRSZ) { diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 0549386a39..19dd42c977 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.20 2000/03/20 04:02:47 momjian Exp $ + * $Id: parse_coerce.h,v 1.21 2000/03/20 15:42:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,7 +45,6 @@ typedef enum CATEGORY || ((t) == BPCHAROID) \ || ((t) == VARCHAROID) \ || ((t) == TEXTOID) \ - || ((t) == BYTEAOID) \ || ((t) == INT4OID) \ || ((t) == INT8OID) \ || ((t) == FLOAT8OID) \ @@ -82,16 +81,10 @@ typedef enum CATEGORY #define IS_BINARY_COMPATIBLE(a,b) \ (((a) == BPCHAROID && (b) == TEXTOID) \ || ((a) == BPCHAROID && (b) == VARCHAROID) \ - || ((a) == BPCHAROID && (b) == BYTEAOID) \ || ((a) == VARCHAROID && (b) == TEXTOID) \ || ((a) == VARCHAROID && (b) == BPCHAROID) \ - || ((a) == VARCHAROID && (b) == BYTEAOID) \ || ((a) == TEXTOID && (b) == BPCHAROID) \ || ((a) == TEXTOID && (b) == VARCHAROID) \ - || ((a) == TEXTOID && (b) == BYTEAOID) \ - || ((a) == BYTEAOID && (b) == BPCHAROID) \ - || ((a) == BYTEAOID && (b) == VARCHAROID) \ - || ((a) == BYTEAOID && (b) == TEXTOID) \ || ((a) == OIDOID && (b) == INT4OID) \ || ((a) == OIDOID && (b) == REGPROCOID) \ || ((a) == INT4OID && (b) == OIDOID) \ -- 2.11.0