Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2216584

Browse files
committed
Reverse out BYTEA type coersion.
1 parentdf238b2 commit2216584

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

‎src/backend/parser/parse_coerce.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.38 2000/03/2004:02:45 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.39 2000/03/2015:42:45 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -320,7 +320,6 @@ TypeCategory(Oid inType)
320320
case (NAMEOID):
321321
case (BPCHAROID):
322322
case (VARCHAROID):
323-
case (BYTEAOID):
324323
case (TEXTOID):
325324
case (LZTEXTOID):
326325
result=STRING_TYPE;
@@ -551,7 +550,6 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2)
551550
{
552551
case (BPCHAROID):
553552
case (VARCHAROID):
554-
case (BYTEAOID):
555553
case (TEXTOID):
556554

557555
case (INT2OID):

‎src/backend/utils/adt/selfuncs.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*
1717
* IDENTIFICATION
18-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.59 2000/03/2004:26:01 momjian Exp $
18+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.60 2000/03/2015:42:46 momjian Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -536,7 +536,6 @@ convert_to_scalar(Datum value, Oid typid,
536536
}
537537
caseBPCHAROID:
538538
caseVARCHAROID:
539-
caseBYTEAOID:
540539
caseTEXTOID:
541540
if (VARSIZE(DatumGetPointer(value))>VARHDRSZ)
542541
{

‎src/include/parser/parse_coerce.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: parse_coerce.h,v 1.20 2000/03/2004:02:47 momjian Exp $
10+
* $Id: parse_coerce.h,v 1.21 2000/03/2015:42:47 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -45,7 +45,6 @@ typedef enum CATEGORY
4545
|| ((t) == BPCHAROID) \
4646
|| ((t) == VARCHAROID) \
4747
|| ((t) == TEXTOID) \
48-
|| ((t) == BYTEAOID) \
4948
|| ((t) == INT4OID) \
5049
|| ((t) == INT8OID) \
5150
|| ((t) == FLOAT8OID) \
@@ -82,16 +81,10 @@ typedef enum CATEGORY
8281
#defineIS_BINARY_COMPATIBLE(a,b) \
8382
(((a) == BPCHAROID && (b) == TEXTOID) \
8483
|| ((a) == BPCHAROID && (b) == VARCHAROID) \
85-
|| ((a) == BPCHAROID && (b) == BYTEAOID) \
8684
|| ((a) == VARCHAROID && (b) == TEXTOID) \
8785
|| ((a) == VARCHAROID && (b) == BPCHAROID) \
88-
|| ((a) == VARCHAROID && (b) == BYTEAOID) \
8986
|| ((a) == TEXTOID && (b) == BPCHAROID) \
9087
|| ((a) == TEXTOID && (b) == VARCHAROID) \
91-
|| ((a) == TEXTOID && (b) == BYTEAOID) \
92-
|| ((a) == BYTEAOID && (b) == BPCHAROID) \
93-
|| ((a) == BYTEAOID && (b) == VARCHAROID) \
94-
|| ((a) == BYTEAOID && (b) == TEXTOID) \
9588
|| ((a) == OIDOID && (b) == INT4OID) \
9689
|| ((a) == OIDOID && (b) == REGPROCOID) \
9790
|| ((a) == INT4OID && (b) == OIDOID) \

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp