database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Back out BYTEA binary compatibility changes.

Browse Source
This commit is contained in:
Bruce Momjian
2001-06-24 02:41:21 +00:00
parent aea3283cb4
commit 06f6404c42
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/parser/parse_coerce.c
View File

@@ -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):

8
src/backend/parser/parse_target.c
View File

@@ -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;