*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parsenodes.h,v 1.1.1.1 1996/07/09 06:21:33 scrappy Exp $
+ * $Id: parsenodes.h,v 1.2 1996/08/06 16:27:48 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
List *targetList; /* the target list (of ResTarget) */
List *fromClause; /* the from clause */
Node *whereClause; /* qualifications */
+ List *groupClause; /* group by clause */
List *orderClause; /* sort clause (a list of SortBy's) */
} CursorStmt;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.3 1996/07/20 07:58:04 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.4 1996/08/06 16:27:56 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
qry->sortClause = transformSortClause(stmt->orderClause,
qry->targetList,
qry->uniqueFlag);
+ /* fix group by clause */
+ qry->groupClause = transformGroupClause(pstate,
+ stmt->groupClause);
+
qry->rtable = pstate->p_rtable;
if (pstate->p_numAgg > 0)
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.2 1996/07/23 02:23:33 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.3 1996/08/06 16:27:59 scrappy Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
CursorStmt: DECLARE name opt_binary CURSOR FOR
SELECT opt_unique res_target_list2
- from_clause where_clause sort_clause
+ from_clause where_clause group_clause sort_clause
{
CursorStmt *n = makeNode(CursorStmt);
n->targetList = $8;
n->fromClause = $9;
n->whereClause = $10;
- n->orderClause = $11;
+ n->groupClause = $11;
+ n->orderClause = $12;
$$ = (Node *)n;
}
;