From 93324355eb9506512acfaca10f6958cdd3ccf77e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 17 Mar 2010 16:52:38 +0000 Subject: Pass incompletely-transformed aggregate argument lists as separate parameters to transformAggregateCall, instead of abusing fields in Aggref to carry them temporarily. No change in functionality but hopefully the code is a bit clearer now. Per gripe from Gokulakannan Somasundaram. --- src/backend/parser/parse_func.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/backend/parser/parse_func.c') diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index dffc24c09e..8a2663c232 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.222 2010/02/26 02:00:52 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.223 2010/03/17 16:52:38 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -381,10 +381,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, aggref->aggfnoid = funcid; aggref->aggtype = rettype; - /* args and aggorder will be modified by transformAggregateCall */ - aggref->args = fargs; - aggref->aggorder = agg_order; - /* aggdistinct will be set by transformAggregateCall */ + /* args, aggorder, aggdistinct will be set by transformAggregateCall */ aggref->aggstar = agg_star; /* agglevelsup will be set by transformAggregateCall */ aggref->location = location; @@ -419,7 +416,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, parser_errposition(pstate, location))); /* parse_agg.c does additional aggregate-specific processing */ - transformAggregateCall(pstate, aggref, agg_distinct); + transformAggregateCall(pstate, aggref, fargs, agg_order, agg_distinct); retval = (Node *) aggref; } -- cgit v1.2.1