Allow use parameters in target list having aggregates in functions.

vadim4o · vadim4o · commit ac994a69d6b0 · 1997-07-30T04:42:26.000Z
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.28 1997/05/08 02:45:53 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.29 1997/07/30 04:42:26 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2369,7 +2369,8 @@ exprIsAggOrGroupCol(Node *expr, List *groupClause)
 {
     List *gl;
     
-    if ( expr == NULL || IsA (expr, Const) || IsA (expr, Aggreg) )
+    if ( expr == NULL || IsA (expr, Const) || 
+    		IsA (expr, Param) || IsA (expr, Aggreg) )
 	return TRUE;
 
     foreach (gl, groupClause)
@@ -2403,7 +2404,7 @@ tleIsAggOrGroupCol(TargetEntry *tle, List *groupClause)
     Node *expr = tle->expr;
     List *gl;
     
-    if ( expr == NULL || IsA (expr, Const) )
+    if ( expr == NULL || IsA (expr, Const) || IsA (expr, Param) )
 	return TRUE;
 	
     foreach (gl, groupClause)

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.28 1997/05/08 02:45:53 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.29 1997/07/30 04:42:26 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -2369,7 +2369,8 @@ exprIsAggOrGroupCol(Node expr, List groupClause)`
`2369`	`2369`	`{`
`2370`	`2370`	`List *gl;`
`2371`	`2371`
`2372`		`- if ( expr == NULL \|\| IsA (expr, Const) \|\| IsA (expr, Aggreg) )`
	`2372`	`+ if ( expr == NULL \|\| IsA (expr, Const) \|\|`
	`2373`	`+ IsA (expr, Param) \|\| IsA (expr, Aggreg) )`
`2373`	`2374`	`return TRUE;`
`2374`	`2375`
`2375`	`2376`	`foreach (gl, groupClause)`
`@@ -2403,7 +2404,7 @@ tleIsAggOrGroupCol(TargetEntry tle, List groupClause)`
`2403`	`2404`	`Node *expr = tle->expr;`
`2404`	`2405`	`List *gl;`
`2405`	`2406`
`2406`		`- if ( expr == NULL \|\| IsA (expr, Const) )`
	`2407`	`+ if ( expr == NULL \|\| IsA (expr, Const) \|\| IsA (expr, Param) )`
`2407`	`2408`	`return TRUE;`
`2408`	`2409`
`2409`	`2410`	`foreach (gl, groupClause)`