*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.92 2010/02/26 02:00:49 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.93 2010/03/17 16:52:38 tgl Exp $
*
*-------------------------------------------------------------------------
*/
* transformAggregateCall -
* Finish initial transformation of an aggregate call
*
- * parse_func.c has recognized the function as an aggregate, and has set
- * up all the fields of the Aggref except aggdistinct and agglevelsup.
- * However, the args list is just bare expressions, and the aggorder list
- * hasn't been transformed at all.
+ * parse_func.c has recognized the function as an aggregate, and has set up
+ * all the fields of the Aggref except args, aggorder, aggdistinct and
+ * agglevelsup. The passed-in args list has been through standard expression
+ * transformation, while the passed-in aggorder list hasn't been transformed
+ * at all.
*
* Here we convert the args list into a targetlist by inserting TargetEntry
* nodes, and then transform the aggorder and agg_distinct specifications to
* pstate level.
*/
void
-transformAggregateCall(ParseState *pstate, Aggref *agg, bool agg_distinct)
+transformAggregateCall(ParseState *pstate, Aggref *agg,
+ List *args, List *aggorder, bool agg_distinct)
{
List *tlist;
List *torder;
*/
tlist = NIL;
attno = 1;
- foreach(lc, agg->args)
+ foreach(lc, args)
{
Expr *arg = (Expr *) lfirst(lc);
TargetEntry *tle = makeTargetEntry(arg, attno++, NULL, false);
pstate->p_next_resno = attno;
torder = transformSortClause(pstate,
- agg->aggorder,
+ aggorder,
&tlist,
true /* fix unknowns */ ,
true /* force SQL99 rules */ );
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
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;
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;
}
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/parser/parse_agg.h,v 1.42 2010/02/26 02:01:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_agg.h,v 1.43 2010/03/17 16:52:38 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "parser/parse_node.h"
extern void transformAggregateCall(ParseState *pstate, Aggref *agg,
+ List *args, List *aggorder,
bool agg_distinct);
extern void transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc,
WindowDef *windef);