From 902a6a0a4bc62d619a5ccd1ef0ff7fb3a5d897f1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 11 Apr 2002 20:00:18 +0000 Subject: Restructure representation of aggregate functions so that they have pg_proc entries, per pghackers discussion. This fixes aggregates to live in namespaces, and also simplifies/speeds up lookup in parse_func.c. Also, add a 'proimplicit' flag to pg_proc that controls whether a type coercion function may be invoked implicitly, or only explicitly. The current settings of these flags are more permissive than I would like, but we will need to debate and refine the behavior; for now, I avoided breaking regression tests as much as I could. --- src/backend/parser/parse_target.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/backend/parser/parse_target.c') diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 83c53de5d1d..9f97ab0f4cb 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.83 2002/04/09 20:35:53 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.84 2002/04/11 20:00:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -290,7 +290,8 @@ updateTargetListEntry(ParseState *pstate, if (type_id != attrtype) { tle->expr = CoerceTargetExpr(pstate, tle->expr, type_id, - attrtype, attrtypmod); + attrtype, attrtypmod, + false); if (tle->expr == NULL) elog(ERROR, "column \"%s\" is of type '%s'" " but expression is of type '%s'" @@ -327,10 +328,12 @@ CoerceTargetExpr(ParseState *pstate, Node *expr, Oid type_id, Oid attrtype, - int32 attrtypmod) + int32 attrtypmod, + bool isExplicit) { - if (can_coerce_type(1, &type_id, &attrtype)) - expr = coerce_type(pstate, expr, type_id, attrtype, attrtypmod); + if (can_coerce_type(1, &type_id, &attrtype, isExplicit)) + expr = coerce_type(pstate, expr, type_id, attrtype, attrtypmod, + isExplicit); #ifndef DISABLE_STRING_HACKS @@ -345,8 +348,9 @@ CoerceTargetExpr(ParseState *pstate, if (type_id == TEXTOID) { } - else if (can_coerce_type(1, &type_id, &text_id)) - expr = coerce_type(pstate, expr, type_id, text_id, attrtypmod); + else if (can_coerce_type(1, &type_id, &text_id, isExplicit)) + expr = coerce_type(pstate, expr, type_id, text_id, attrtypmod, + isExplicit); else expr = NULL; } -- cgit v1.2.3