Fix problem with MERGE and DLTT

Author: asfernandes

src/dsql/StmtNodes.cpp

@@ -7560,7 +7560,7 @@ StmtNode* MergeNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
 	auto& pool = dsqlScratch->getPool();
 
 	RecordSourceNode* source = usingClause;		// USING
-	RelationSourceNode* target = relation;		// INTO
+	RecordSourceNode* target = relation;		// INTO
 
 	// Build a join between USING and INTO tables.
 	const auto join = FB_NEW_POOL(pool) RseNode(pool);
@@ -7599,7 +7599,7 @@ StmtNode* MergeNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
 	// Get the already processed relations.
 	const auto processedRse = nodeAs<RseNode>(mergeNode->rse->dsqlStreams->items[0]);
 	source = processedRse->dsqlStreams->items[0];
-	target = nodeAs<RelationSourceNode>(processedRse->dsqlStreams->items[1]);
+	target = processedRse->dsqlStreams->items[1];
 
 	mergeNode->oldContext = dsqlGetContext(target);
 

src/dsql/pass1.cpp

@@ -1405,7 +1405,6 @@ void PASS1_expand_select_node(DsqlCompilerScratch* dsqlScratch, ExprNode* node,
 {
 	FieldNode* fieldNode;
 
-	//// TODO: LocalTableSourceNode
 	if (auto rseNode = nodeAs<RseNode>(node))
 	{
 		ValueListNode* sub_items = rseNode->dsqlSelectList;
@@ -1497,6 +1496,33 @@ void PASS1_expand_select_node(DsqlCompilerScratch* dsqlScratch, ExprNode* node,
 			}
 		}
 	}
+	else if (auto localTableNode = nodeAs<LocalTableSourceNode>(node))
+	{
+		dsql_ctx* context = localTableNode->dsqlContext;
+
+		if (context->ctx_relation)
+		{
+			for (dsql_fld* field = context->ctx_relation->rel_fields; field; field = field->fld_next)
+			{
+				DEV_BLKCHK(field, dsql_type_fld);
+
+				NestConst<ValueExprNode> select_item = nullptr;
+
+				if (!hide_using || context->getImplicitJoinField(field->fld_name, select_item))
+				{
+					if (!select_item)
+					{
+						if (context->ctx_flags & CTX_null)
+							select_item = NullNode::instance();
+						else
+							select_item = MAKE_field(context, field, nullptr);
+					}
+
+					list->add(select_item);
+				}
+			}
+		}
+	}
 	else if ((fieldNode = nodeAs<FieldNode>(node)))
 	{
 		RecordSourceNode* recSource = NULL;

src/jrd/optimizer/OuterJoin.cpp

@@ -57,7 +57,7 @@ OuterJoin::OuterJoin(thread_db* aTdbb, Optimizer* opt,
 		auto& joinStream = joinStreams[pos];
 		joinStream.node = node;
 
-		if (nodeIs<RelationSourceNode>(node) || nodeIs<LocalTableSourceNode>(node))
+		if (nodeIs<RelationSourceNode>(node))
 		{
 			const auto stream = node->getStream();
 			fb_assert(!(csb->csb_rpt[stream].csb_flags & csb_active));