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

Additional fix for CORE-2274 : MERGE non-standard behaviour, accepts multiple matches.

Browse Source 
Take into account naturally updatable VIEW WITH CHECK OPTION.
Thanks to Pavel Zotov.
This commit is contained in:
hvlad 2020-06-07 15:21:12 +03:00
parent 6141d3b7d3
commit b7c00f7100
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dsql/StmtNodes.cpp
View File

@ -2519,6 +2519,7 @@ void EraseNode::pass1Erase(thread_db* tdbb, CompilerScratch* csb, EraseNode* nod
EraseNode* viewNode = FB_NEW_POOL(*tdbb->getDefaultPool()) EraseNode(*tdbb->getDefaultPool());
viewNode->stream = node->stream;
viewNode->marks = node->marks & (StmtNode::MARK_POSITIONED | StmtNode::MARK_MERGE);
node->subStatement = viewNode;
@ -4955,6 +4956,7 @@ string ForNode::internalPrint(NodePrinter& printer) const
NODE_PRINT(printer, cursor);
NODE_PRINT(printer, parBlrBeginCnt);
NODE_PRINT(printer, forUpdate);
NODE_PRINT(printer, isMerge);
NODE_PRINT(printer, withLock);
return "ForNode";
@ -6471,6 +6473,7 @@ void ModifyNode::pass1Modify(thread_db* tdbb, CompilerScratch* csb, ModifyNode*
ModifyNode* viewNode = FB_NEW_POOL(*tdbb->getDefaultPool()) ModifyNode(*tdbb->getDefaultPool());
viewNode->statement = pass1ExpandView(tdbb, csb, viewStream, newStream, true);
viewNode->marks = node->marks & (StmtNode::MARK_POSITIONED | StmtNode::MARK_MERGE);
node->subMod = viewNode;