database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fix using GroupBy/non-GroupBy expressions in HAVING.

Browse Source
This commit is contained in:
Vadim B. Mikheev
1998-09-09 03:48:17 +00:00
parent 04abb54197
commit 9a2949e5dd
3 changed files with 6 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/optimizer/plan/planner.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.34 1998/09/08 02:50:20 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.35 1998/09/09 03:48:01 vadim Exp $
*
*-------------------------------------------------------------------------
*/
@ -185,9 +185,6 @@ union_planner(Query *parse)
*/
if (parse->hasAggs)
{
int old_length = 0,
new_length = 0;
result_plan = (Plan *) make_agg(tlist, result_plan);
/*
@ -256,31 +253,10 @@ union_planner(Query *parse)
*/
foreach(clause, ((Agg *) result_plan)->plan.qual)
{
/*
* Make sure there are aggregates in the havingQual if so,
* the list must be longer after
* check_having_qual_for_aggs
*/
old_length = length(((Agg *) result_plan)->aggs);
((Agg *) result_plan)->aggs = nconc(((Agg *) result_plan)->aggs,
check_having_qual_for_aggs((Node *) lfirst(clause),
((Agg *) result_plan)->plan.lefttree->targetlist,
((List *) parse->groupClause)));
/*
* Have a look at the length of the returned list. If
* there is no difference, no aggregates have been found
* and that means, that the Qual belongs to the where
* clause
*/
if (((new_length = length(((Agg *) result_plan)->aggs)) == old_length) ||
(new_length == 0))
{
elog(ERROR, "This could have been done in a where clause!!");
return (Plan *) NIL;
}
}
PlannerVarParam = lnext(PlannerVarParam);
if (vpm != NULL)