From 33dd5c444faa87c5265206bd3ae34d2b890c9f28 Mon Sep 17 00:00:00 2001 From: "Thomas G. Lockhart" Date: Wed, 8 Jul 1998 14:18:45 +0000 Subject: [PATCH] Include int8 as a built-in data type. Merge "resjunk" handling with automatic type conversion when selecting from another column. --- src/include/parser/parse_coerce.h | 5 +++-- src/include/parser/parse_target.h | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 39727e7964..3b12054b6e 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.2 1998/05/29 14:02:28 thomas Exp $ + * $Id: parse_coerce.h,v 1.3 1998/07/08 14:18:45 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -39,8 +39,9 @@ typedef enum CATEGORY { || ((t) == VARCHAROID) \ || ((t) == TEXTOID) \ || ((t) == INT4OID) \ - || ((t) == DATETIMEOID) \ + || ((t) == INT8OID) \ || ((t) == FLOAT8OID) \ + || ((t) == DATETIMEOID) \ || ((t) == TIMESTAMPOID) \ || ((t) == ABSTIMEOID) \ || ((t) == RELTIMEOID) \ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 2275c283ce..d270b6803b 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_target.h,v 1.7 1998/06/05 03:49:19 momjian Exp $ + * $Id: parse_target.h,v 1.8 1998/07/08 14:18:45 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -24,9 +24,16 @@ extern List *transformTargetList(ParseState *pstate, List *targetlist); extern List *makeTargetNames(ParseState *pstate, List *cols); -extern void transformTargetId(ParseState *pstate, Node *node, - TargetEntry *tent, char *resname, int16 resjunk); -extern Node *coerce_target_expr(ParseState *pstate, Node *expr, - Oid type_id, Oid attrtype); +extern TargetEntry * +transformTargetIdent(ParseState *pstate, + Node *node, + TargetEntry *tent, + char **resname, + char *refname, + char *colname, + int16 resjunk); +extern Node * +CoerceTargetExpr(ParseState *pstate, Node *expr, + Oid type_id, Oid attrtype); #endif /* PARSE_TARGET_H */