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

Fix #8224: SubQueryConversion = true -- wrong resultset with FIRST/SKIP clauses inside the outer query

Browse Source
This commit is contained in:
Dmitry Yemanov 2024-08-23 19:08:23 +03:00
parent e40e45020c
commit 604555f1f0
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jrd/RecordSourceNodes.cpp
View File

@ -3216,7 +3216,7 @@ RecordSource* RseNode::compile(thread_db* tdbb, Optimizer* opt, bool innerSubStr
RseNode* RseNode::processPossibleJoins(thread_db* tdbb, CompilerScratch* csb)
{
if (rse_jointype != blr_inner || !rse_boolean)
if (rse_jointype != blr_inner || !rse_boolean || rse_plan)
return nullptr;
const auto dbb = tdbb->getDatabase();
@ -3234,7 +3234,14 @@ RseNode* RseNode::processPossibleJoins(thread_db* tdbb, CompilerScratch* csb)
fb_assert(rseStack.hasData() && booleanStack.hasData());
fb_assert(rseStack.getCount() == booleanStack.getCount());
// Create joins between the original node and detected joinable nodes
// Create joins between the original node and detected joinable nodes.
// Preserve FIRST/SKIP nodes at their original position, i.e. outside semi-joins.
const auto first = rse_first;
rse_first = nullptr;
const auto skip = rse_skip;
rse_skip = nullptr;
auto rse = this;
while (rseStack.hasData())
@ -3251,6 +3258,19 @@ RseNode* RseNode::processPossibleJoins(thread_db* tdbb, CompilerScratch* csb)
rse = newRse;
}
if (first || skip)
{
const auto newRse = FB_NEW_POOL(*tdbb->getDefaultPool())
RseNode(*tdbb->getDefaultPool());
newRse->rse_relations.add(rse);
newRse->rse_jointype = blr_inner;
newRse->rse_first = first;
newRse->rse_skip = skip;
rse = newRse;
}
return rse;
}