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

Commit94f42ed

Browse files
author
Thomas G. Lockhart
committed
Include OID as a built-in type.
1 parent58e9267 commit94f42ed

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

‎src/backend/parser/parse_coerce.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.3 1998/07/08 14:04:10 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.4 1998/08/14 16:06:52 thomas Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -271,6 +271,7 @@ TypeCategory(Oid inType)
271271
result=STRING_TYPE;
272272
break;
273273

274+
case (OIDOID):
274275
case (INT2OID):
275276
case (INT4OID):
276277
case (INT8OID):
@@ -338,7 +339,10 @@ PreferredType(CATEGORY category, Oid type)
338339
break;
339340

340341
case (NUMERIC_TYPE):
341-
result=FLOAT8OID;
342+
if (type==OIDOID)
343+
result=OIDOID;
344+
else
345+
result=FLOAT8OID;
342346
break;
343347

344348
case (DATETIME_TYPE):

‎src/include/parser/parse_coerce.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: parse_coerce.h,v 1.3 1998/07/08 14:18:45 thomas Exp $
9+
* $Id: parse_coerce.h,v 1.4 1998/08/14 16:07:00 thomas Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -34,7 +34,8 @@ typedef enum CATEGORY {
3434
* - thomas 1998-05-13
3535
*/
3636
#defineIS_BUILTIN_TYPE(t) \
37-
(((t) == BOOLOID) \
37+
(((t) == OIDOID) \
38+
|| ((t) == BOOLOID) \
3839
|| ((t) == BPCHAROID) \
3940
|| ((t) == VARCHAROID) \
4041
|| ((t) == TEXTOID) \
@@ -69,12 +70,15 @@ typedef enum CATEGORY {
6970
|| ((a) == VARCHAROID && (b) == BPCHAROID) \
7071
|| ((a) == TEXTOID && (b) == BPCHAROID) \
7172
|| ((a) == TEXTOID && (b) == VARCHAROID) \
73+
|| ((a) == OIDOID && (b) == INT4OID) \
74+
|| ((a) == INT4OID && (b) == TIMESTAMPOID) \
7275
|| ((a) == DATETIMEOID && (b) == FLOAT8OID) \
7376
|| ((a) == FLOAT8OID && (b) == DATETIMEOID) \
7477
|| ((a) == ABSTIMEOID && (b) == TIMESTAMPOID) \
7578
|| ((a) == ABSTIMEOID && (b) == INT4OID) \
7679
|| ((a) == TIMESTAMPOID && (b) == ABSTIMEOID) \
7780
|| ((a) == TIMESTAMPOID && (b) == INT4OID) \
81+
|| ((a) == INT4OID && (b) == OIDOID) \
7882
|| ((a) == INT4OID && (b) == ABSTIMEOID) \
7983
|| ((a) == INT4OID && (b) == TIMESTAMPOID) \
8084
|| ((a) == RELTIMEOID && (b) == INT4OID) \

0 commit comments

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