Back out BYTEA binary compatibility changes.

diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 52ba418401daed03dd2e92346ee47f8e1fedf446..5f769a81eacfe5e33fa3eb14a987ed7f1070ab33 100644 (file)
--- 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.59 2001/06/23 22:23:49 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.60 2001/06/24 02:41:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -470,7 +470,6 @@ TypeCategory(Oid inType)
 
                case (CHAROID):
                case (NAMEOID):
-               case (BYTEAOID):
                case (BPCHAROID):
                case (VARCHAROID):
                case (TEXTOID):
@@ -615,7 +614,6 @@ PromoteTypeToNext(Oid inType)
                        result = VARCHAROID;
                        break;
 
-               case (BYTEAOID):
                case (VARCHAROID):
                        result = TEXTOID;
                        break;
@@ -710,7 +708,6 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2)
                        case (CHAROID):
                                switch (*arg2)
                                {
-                                       case (BYTEAOID):
                                        case (BPCHAROID):
                                        case (VARCHAROID):
                                        case (TEXTOID):
@@ -775,7 +772,6 @@ 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 88a69b4c2b97a0e9497ed79df9e309a6b3029120..bc8d508b58698c84111e55b3146d24cb19f1c402 100644 (file)
--- 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.68 2001/06/23 22:23:49 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.69 2001/06/24 02:41:21 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,9 +311,7 @@ CoerceTargetExpr(ParseState *pstate,
         * string hacks to get transparent conversions w/o explicit
         * conversions
         */
-       else if (attrtype == BPCHAROID ||
-                        attrtype == VARCHAROID ||
-                        attrtype == BYTEAOID)
+       else if ((attrtype == BPCHAROID) || (attrtype == VARCHAROID))
        {
                Oid                     text_id = TEXTOID;
 

diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index f0b0607cd6c8e6b4a81c0265530fb2834d6eecd9..6634dbfc294ad520d8d4d878366eb6a55c3c5fac 100644 (file)
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_coerce.h,v 1.30 2001/06/23 22:23:49 momjian Exp $
+ * $Id: parse_coerce.h,v 1.31 2001/06/24 02:41:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,6 @@ typedef enum CATEGORY
                || ((t) == BPCHAROID) \
                || ((t) == VARCHAROID) \
                || ((t) == TEXTOID) \
-               || ((t) == BYTEAOID) \
                || ((t) == INT4OID) \
                || ((t) == INT8OID) \
                || ((t) == FLOAT8OID) \
@@ -86,16 +85,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) \