firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Fixed some inconsistencies with aggregate functions with more than one parameter

Browse Source
This commit is contained in:
asfernandes 2010-02-18 16:55:38 +00:00
parent 01aba16055
commit 2097e9a485
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dsql/AggNodes.cpp
View File

@ -144,7 +144,9 @@ bool AggNode::dsqlAggregateFinder(AggregateFinder& visitor)
aggregate = true;
else
{
// Check also for a nested aggregate that could belong to this context
// Check also for a nested aggregate that could belong to this context. Example:
// select (select count(count(outer.n)) from inner) from outer
AutoSetRestore<USHORT> autoDeepestLevel(&visitor.deepestLevel, localDeepestLevel);
for (dsql_nod*** i = dsqlChildNodes.begin(); i != dsqlChildNodes.end(); ++i)

24
src/dsql/ExprNodes.cpp
View File

@ -434,7 +434,9 @@ bool OverNode::dsqlAggregateFinder(AggregateFinder& visitor)
AggNode* aggNode = ExprNode::as<AggNode>(dsqlAggExpr);
fb_assert(aggNode);
aggregate |= visitor.visit(&aggNode->dsqlArg);
Array<dsql_nod**>& exprChildren = aggNode->dsqlChildNodes;
for (dsql_nod*** i = exprChildren.begin(); i != exprChildren.end(); ++i)
aggregate |= visitor.visit(*i);
}
else
aggregate |= visitor.visit(&dsqlAggExpr);
@ -514,13 +516,16 @@ bool OverNode::dsqlFieldRemapper(FieldRemapper& visitor)
AggNode* aggNode = ExprNode::as<AggNode>(copy);
fb_assert(aggNode);
dsql_nod*& aggExpr = aggNode->dsqlArg;
Array<dsql_nod**>& exprChildren = aggNode->dsqlChildNodes;
if (Aggregate2Finder::find(visitor.context->ctx_scope_level, FIELD_MATCH_TYPE_EQUAL,
true, aggExpr))
for (dsql_nod*** i = exprChildren.begin(); i != exprChildren.end(); ++i)
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
Arg::Gds(isc_dsql_agg_nested_err));
if (Aggregate2Finder::find(visitor.context->ctx_scope_level, FIELD_MATCH_TYPE_EQUAL,
true, **i))
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
Arg::Gds(isc_dsql_agg_nested_err));
}
}
AggregateFinder aggFinder(dsqlScratch, false);
@ -531,12 +536,13 @@ bool OverNode::dsqlFieldRemapper(FieldRemapper& visitor)
{
if (!visitor.window)
{
if (copy->nod_count)
{
{ // scope
AutoSetRestore<dsql_nod*> autoPartitionNode2(&visitor.partitionNode, NULL);
AutoSetRestore<dsql_nod*> autoOrderNode2(&visitor.orderNode, NULL);
visitor.visit(&aggExpr);
Array<dsql_nod**>& exprChildren = aggNode->dsqlChildNodes;
for (dsql_nod*** i = exprChildren.begin(); i != exprChildren.end(); ++i)
visitor.visit(*i);
}
if (dsqlPartition)