Back out BYTEA binary compatibility changes.

bmomjian · bmomjian · commit 06f6404c42ad · 2001-06-24T02:41:21.000Z
diff --git 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
@@ -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
@@ -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) \

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.68 2001/06/23 22:23:49 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.69 2001/06/24 02:41:21 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -56,7 +56,7 @@ transformTargetEntry(ParseState *pstate,`
`56`	`56`	`expr = transformExpr(pstate, node, EXPR_COLUMN_FIRST);`
`57`	`57`
`58`	`58`	`if (IsA(expr, Ident) && ((Ident *)expr)->isRel)`
`59`		`- elog(ERROR,"You can't use relation names alone in the target list, try relation.*.");`
	`59`	`+ elog(ERROR,"You can't use relation names alone in the target list, try relation.*.");`
`60`	`60`
`61`	`61`	`type_id = exprType(expr);`
`62`	`62`	`type_mod = exprTypmod(expr);`
`@@ -311,9 +311,7 @@ CoerceTargetExpr(ParseState *pstate,`
`311`	`311`	`* string hacks to get transparent conversions w/o explicit`
`312`	`312`	`* conversions`
`313`	`313`	`*/`
`314`		`- else if (attrtype == BPCHAROID \|\|`
`315`		`- attrtype == VARCHAROID \|\|`
`316`		`- attrtype == BYTEAOID)`
	`314`	`+ else if ((attrtype == BPCHAROID) \|\| (attrtype == VARCHAROID))`
`317`	`315`	`{`
`318`	`316`	`Oid text_id = TEXTOID;`
`319`	`317`