File tree 2 files changed +12
-4
lines changed 2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 7
7
*
8
8
*
9
9
* 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 $
11
11
*
12
12
*-------------------------------------------------------------------------
13
13
*/
@@ -271,6 +271,7 @@ TypeCategory(Oid inType)
271
271
result = STRING_TYPE ;
272
272
break ;
273
273
274
+ case (OIDOID ):
274
275
case (INT2OID ):
275
276
case (INT4OID ):
276
277
case (INT8OID ):
@@ -338,7 +339,10 @@ PreferredType(CATEGORY category, Oid type)
338
339
break ;
339
340
340
341
case (NUMERIC_TYPE ):
341
- result = FLOAT8OID ;
342
+ if (type == OIDOID )
343
+ result = OIDOID ;
344
+ else
345
+ result = FLOAT8OID ;
342
346
break ;
343
347
344
348
case (DATETIME_TYPE ):
Original file line number Diff line number Diff line change 6
6
*
7
7
* Copyright (c) 1994, Regents of the University of California
8
8
*
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 $
10
10
*
11
11
*-------------------------------------------------------------------------
12
12
*/
@@ -34,7 +34,8 @@ typedef enum CATEGORY {
34
34
* - thomas 1998-05-13
35
35
*/
36
36
#define IS_BUILTIN_TYPE (t ) \
37
- (((t) == BOOLOID) \
37
+ (((t) == OIDOID) \
38
+ || ((t) == BOOLOID) \
38
39
|| ((t) == BPCHAROID) \
39
40
|| ((t) == VARCHAROID) \
40
41
|| ((t) == TEXTOID) \
@@ -69,12 +70,15 @@ typedef enum CATEGORY {
69
70
|| ((a) == VARCHAROID && (b) == BPCHAROID) \
70
71
|| ((a) == TEXTOID && (b) == BPCHAROID) \
71
72
|| ((a) == TEXTOID && (b) == VARCHAROID) \
73
+ || ((a) == OIDOID && (b) == INT4OID) \
74
+ || ((a) == INT4OID && (b) == TIMESTAMPOID) \
72
75
|| ((a) == DATETIMEOID && (b) == FLOAT8OID) \
73
76
|| ((a) == FLOAT8OID && (b) == DATETIMEOID) \
74
77
|| ((a) == ABSTIMEOID && (b) == TIMESTAMPOID) \
75
78
|| ((a) == ABSTIMEOID && (b) == INT4OID) \
76
79
|| ((a) == TIMESTAMPOID && (b) == ABSTIMEOID) \
77
80
|| ((a) == TIMESTAMPOID && (b) == INT4OID) \
81
+ || ((a) == INT4OID && (b) == OIDOID) \
78
82
|| ((a) == INT4OID && (b) == ABSTIMEOID) \
79
83
|| ((a) == INT4OID && (b) == TIMESTAMPOID) \
80
84
|| ((a) == RELTIMEOID && (b) == INT4OID) \
You can’t perform that action at this time.
0 commit comments