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

CORE-5972: Fix working external triggers with computed fields

Browse Source 
Now it works not only with simple expressions, but with subqueries too.
This commit is contained in:
Artyom Smirnov 2019-12-09 15:20:29 +03:00 committed by Adriano dos Santos Fernandes
parent bc2b202b62
commit f931b0b0b1
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jrd/ExtEngineManager.cpp
View File

@ -952,6 +952,8 @@ void ExtEngineManager::Trigger::execute(thread_db* tdbb, jrd_req* request, unsig
void ExtEngineManager::Trigger::setupComputedFields(thread_db* tdbb, MemoryPool& pool, CompilerScratch* csb)
{
SET_TDBB(tdbb);
USHORT varId = 0;
fb_assert(NEW_CONTEXT_VALUE == OLD_CONTEXT_VALUE + 1);
@ -984,18 +986,7 @@ void ExtEngineManager::Trigger::setupComputedFields(thread_db* tdbb, MemoryPool&
csb->csb_variables = vec<DeclareVariableNode*>::newVector(
*tdbb->getDefaultPool(), csb->csb_variables, varId);
ValueExprNode* exprNode = field->fld_computation;
if (context == NEW_CONTEXT_VALUE)
{
StreamType map[1];
map[OLD_CONTEXT_VALUE] = NEW_CONTEXT_VALUE; // map context 0 (OLD) to 1 (NEW)
AutoSetRestore<USHORT> autoRemapVariable(&csb->csb_remap_variable,
(csb->csb_variables ? csb->csb_variables->count() : 0) + 1);
exprNode = NodeCopier::copy(tdbb, csb, exprNode, map);
}
ValueExprNode* exprNode = FB_NEW_POOL(*tdbb->getDefaultPool()) FieldNode(*tdbb->getDefaultPool(), context, i, true);
VariableNode* varNode = FB_NEW_POOL(pool) VariableNode(pool);
varNode->varId = varId;