Skip to content

Commit 33dd5c4

Browse files
author
Thomas G. Lockhart
committed
Include int8 as a built-in data type.
Merge "resjunk" handling with automatic type conversion when selecting from another column.
1 parent bad3398 commit 33dd5c4

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/include/parser/parse_coerce.h

Lines changed: 3 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.2 1998/05/29 14:02:28 thomas Exp $
9+
* $Id: parse_coerce.h,v 1.3 1998/07/08 14:18:45 thomas Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -39,8 +39,9 @@ typedef enum CATEGORY {
3939
|| ((t) == VARCHAROID) \
4040
|| ((t) == TEXTOID) \
4141
|| ((t) == INT4OID) \
42-
|| ((t) == DATETIMEOID) \
42+
|| ((t) == INT8OID) \
4343
|| ((t) == FLOAT8OID) \
44+
|| ((t) == DATETIMEOID) \
4445
|| ((t) == TIMESTAMPOID) \
4546
|| ((t) == ABSTIMEOID) \
4647
|| ((t) == RELTIMEOID) \

src/include/parser/parse_target.h

Lines changed: 12 additions & 5 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_target.h,v 1.7 1998/06/05 03:49:19 momjian Exp $
9+
* $Id: parse_target.h,v 1.8 1998/07/08 14:18:45 thomas Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -24,9 +24,16 @@
2424

2525
extern List *transformTargetList(ParseState *pstate, List *targetlist);
2626
extern List *makeTargetNames(ParseState *pstate, List *cols);
27-
extern void transformTargetId(ParseState *pstate, Node *node,
28-
TargetEntry *tent, char *resname, int16 resjunk);
29-
extern Node *coerce_target_expr(ParseState *pstate, Node *expr,
30-
Oid type_id, Oid attrtype);
27+
extern TargetEntry *
28+
transformTargetIdent(ParseState *pstate,
29+
Node *node,
30+
TargetEntry *tent,
31+
char **resname,
32+
char *refname,
33+
char *colname,
34+
int16 resjunk);
35+
extern Node *
36+
CoerceTargetExpr(ParseState *pstate, Node *expr,
37+
Oid type_id, Oid attrtype);
3138

3239
#endif /* PARSE_TARGET_H */

0 commit comments

Comments
 (0)