Fixes:

scrappy · scrappy · commit ab22b34891b9 · 1996-08-06T16:27:59.000Z
While a normal SELECT statement can contain a GROUP BY clause, a cursor
declaration cannot. This was not the case in PG-1.0. Was there a good
reason why this was changed? Are cursors being phased out? Is there any way
to get data with just a SELECT (and without a DECLARE CURSOR ...)?

The patch below seems to fix things. If anyone can see a problem with it,
please let me know. Thanks.

Submitted by:  David Smith &lt;dasmith@perseus.tufts.edu&gt;
diff --git a/src/backend/nodes/parsenodes.h b/src/backend/nodes/parsenodes.h
@@ -6,7 +6,7 @@
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -462,6 +462,7 @@ typedef struct CursorStmt {
     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;    
 
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -509,6 +509,10 @@ transformCursorStmt(ParseState *pstate, CursorStmt *stmt)
     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)
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * 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
@@ -1349,7 +1349,7 @@ ReplaceStmt:  UPDATE relation_name
 
 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);
 
@@ -1370,7 +1370,8 @@ CursorStmt:  DECLARE name opt_binary CURSOR FOR
 		    n->targetList = $8;
 		    n->fromClause = $9;
 		    n->whereClause = $10;
-		    n->orderClause = $11;
+		    n->groupClause = $11;
+		    n->orderClause = $12;
 		    $$ = (Node *)n;
 		}
 	;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: parsenodes.h,v 1.1.1.1 1996/07/09 06:21:33 scrappy Exp $`
	`9`	`+ * $Id: parsenodes.h,v 1.2 1996/08/06 16:27:48 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -462,6 +462,7 @@ typedef struct CursorStmt {`
`462`	`462`	`List targetList; / the target list (of ResTarget) */`
`463`	`463`	`List fromClause; / the from clause */`
`464`	`464`	`Node whereClause; / qualifications */`
	`465`	`+ List groupClause; / group by clause */`
`465`	`466`	`List orderClause; / sort clause (a list of SortBy's) */`
`466`	`467`	`} CursorStmt;`
`467`	`468`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.3 1996/07/20 07:58:04 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.4 1996/08/06 16:27:56 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -509,6 +509,10 @@ transformCursorStmt(ParseState pstate, CursorStmt stmt)`
`509`	`509`	`qry->sortClause = transformSortClause(stmt->orderClause,`
`510`	`510`	`qry->targetList,`
`511`	`511`	`qry->uniqueFlag);`
	`512`	`+ /* fix group by clause */`
	`513`	`+ qry->groupClause = transformGroupClause(pstate,`
	`514`	`+ stmt->groupClause);`
	`515`	`+`
`512`	`516`	`qry->rtable = pstate->p_rtable;`
`513`	`517`
`514`	`518`	`if (pstate->p_numAgg > 0)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.2 1996/07/23 02:23:33 scrappy Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.3 1996/08/06 16:27:59 scrappy Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHOR DATE MAJOR EVENT`
`@@ -1349,7 +1349,7 @@ ReplaceStmt: UPDATE relation_name`
`1349`	`1349`
`1350`	`1350`	`CursorStmt: DECLARE name opt_binary CURSOR FOR`
`1351`	`1351`	`SELECT opt_unique res_target_list2`
`1352`		`- from_clause where_clause sort_clause`
	`1352`	`+ from_clause where_clause group_clause sort_clause`
`1353`	`1353`	`{`
`1354`	`1354`	`CursorStmt *n = makeNode(CursorStmt);`
`1355`	`1355`
`@@ -1370,7 +1370,8 @@ CursorStmt: DECLARE name opt_binary CURSOR FOR`
`1370`	`1370`	`n->targetList = $8;`
`1371`	`1371`	`n->fromClause = $9;`
`1372`	`1372`	`n->whereClause = $10;`
`1373`		`- n->orderClause = $11;`
	`1373`	`+ n->groupClause = $11;`
	`1374`	`+ n->orderClause = $12;`
`1374`	`1375`	`$$ = (Node *)n;`
`1375`	`1376`	`}`
`1376`	`1377`	`;`