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

Correction for CORE-3090

Browse Source
This commit is contained in:
asfernandes 2010-08-07 02:43:29 +00:00
parent 361727d549
commit a539537002
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dsql/pass1.cpp
View File

@ -4644,6 +4644,8 @@ static dsql_nod* pass1_derived_table(DsqlCompilerScratch* dsqlScratch, dsql_nod*
if (query->nod_type == nod_query_spec) if (query->nod_type == nod_query_spec)
foundSubSelect = SubSelectFinder::find(query->nod_arg[e_qry_list]); foundSubSelect = SubSelectFinder::find(query->nod_arg[e_qry_list]);
int unionContexts = 0;
if (foundSubSelect) if (foundSubSelect)
{ {
DsqlContextStack::const_iterator baseUnion(dsqlScratch->unionContext); DsqlContextStack::const_iterator baseUnion(dsqlScratch->unionContext);
@ -4658,6 +4660,7 @@ static dsql_nod* pass1_derived_table(DsqlCompilerScratch* dsqlScratch, dsql_nod*
++i) ++i)
{ {
temp.push(i.object()); temp.push(i.object());
++unionContexts;
} }
} }
else else
@ -4670,10 +4673,14 @@ static dsql_nod* pass1_derived_table(DsqlCompilerScratch* dsqlScratch, dsql_nod*
// Also add the used contexts into the childs stack. // Also add the used contexts into the childs stack.
while (temp.hasData() && (temp.object() != baseContext)) while (temp.hasData() && (temp.object() != baseContext))
{ {
dsql_ctx* childCtx = temp.object(); dsql_ctx* childCtx = temp.pop();
// Do not put the just pushed union contexts in derivedContext. Otherwise duplicate
// records will appear in RDB$VIEW_RELATIONS.
if (--unionContexts < 0)
dsqlScratch->derivedContext.push(childCtx); dsqlScratch->derivedContext.push(childCtx);
context->ctx_childs_derived_table.push(temp.pop());
context->ctx_childs_derived_table.push(childCtx);
// Collect contexts that will be used for blr_derived_expr generation. // Collect contexts that will be used for blr_derived_expr generation.
// We want all child contexts with minimum ctx_in_outer_join. // We want all child contexts with minimum ctx_in_outer_join.