Accept the noise-word ALL in aggregate function invocations for SQL92

tglsfdc · tglsfdc · commit bd43ae0ecd60 · 2000-02-19T19:37:21.000Z
compliance.  Wish they were all that easy...
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.145 2000/02/19 08:25:49 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.146 2000/02/19 19:37:21 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -4546,6 +4546,19 @@ c_expr:  attr
 					n->agg_distinct = false;
 					$$ = (Node *)n;
 				}
+		| func_name '(' ALL expr_list ')'
+				{
+					FuncCall *n = makeNode(FuncCall);
+					n->funcname = $1;
+					n->args = $4;
+					n->agg_star = false;
+					n->agg_distinct = false;
+					/* Ideally we'd mark the FuncCall node to indicate
+					 * "must be an aggregate", but there's no provision
+					 * for that in FuncCall at the moment.
+					 */
+					$$ = (Node *)n;
+				}
 		| func_name '(' DISTINCT expr_list ')'
 				{
 					FuncCall *n = makeNode(FuncCall);

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.145 2000/02/19 08:25:49 thomas Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.146 2000/02/19 19:37:21 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -4546,6 +4546,19 @@ c_expr: attr`
`4546`	`4546`	`n->agg_distinct = false;`
`4547`	`4547`	`$$ = (Node *)n;`
`4548`	`4548`	`}`
	`4549`	`+ \| func_name '(' ALL expr_list ')'`
	`4550`	`+ {`
	`4551`	`+ FuncCall *n = makeNode(FuncCall);`
	`4552`	`+ n->funcname = $1;`
	`4553`	`+ n->args = $4;`
	`4554`	`+ n->agg_star = false;`
	`4555`	`+ n->agg_distinct = false;`
	`4556`	`+ /* Ideally we'd mark the FuncCall node to indicate`
	`4557`	`+ * "must be an aggregate", but there's no provision`
	`4558`	`+ * for that in FuncCall at the moment.`
	`4559`	`+ */`
	`4560`	`+ $$ = (Node *)n;`
	`4561`	`+ }`
`4549`	`4562`	`\| func_name '(' DISTINCT expr_list ')'`
`4550`	`4563`	`{`
`4551`	`4564`	`FuncCall *n = makeNode(FuncCall);`