Only add not-null filter to hash join sources based on join type

Fixes #516
MarkMpn · Jul 16, 2024 · 2cbb845 · 2cbb845
1 parent 538e508
commit 2cbb845
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine.Tests/ExecutionPlanTests.cs b/MarkMpn.Sql4Cds.Engine.Tests/ExecutionPlanTests.cs
@@ -8038,5 +8038,35 @@ FROM account as a
   </entity>
 </fetch>");
         }
+
+        [TestMethod]
+        public void MetadataOuterJoin()
+        {
+            var query = @"
+SELECT a.entitylogicalname,
+       a.attributetypename,
+       a.logicalname,
+       a.targets,
+       p.logicalname
+FROM   metadata.attribute AS a
+       LEFT OUTER JOIN
+       metadata.entity AS p
+       ON a.targets = p.logicalname
+WHERE  a.entitylogicalname IN ('team')";
+
+            var planBuilder = new ExecutionPlanBuilder(_localDataSources.Values, this);
+
+            var plans = planBuilder.Build(query, null, out _);
+
+            Assert.AreEqual(1, plans.Length);
+
+            var select = AssertNode<SelectNode>(plans[0]);
+            var join = AssertNode<HashJoinNode>(select.Source);
+            Assert.AreEqual(QualifiedJoinType.RightOuter, join.JoinType);
+            var metadata_p = AssertNode<MetadataQueryNode>(join.LeftSource);
+            Assert.AreEqual("p", metadata_p.EntityAlias);
+            var metadata_a = AssertNode<MetadataQueryNode>(join.RightSource);
+            Assert.AreEqual("a", metadata_a.AttributeAlias);
+        }
     }
 }
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/HashJoinNode.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/HashJoinNode.cs
@@ -152,8 +152,11 @@ public override IDataExecutionPlanNodeInternal FoldQuery(NodeCompilationContext
 
             // Make sure the join keys are not null - the SqlType classes override == to prevent NULL = NULL
             // but .Equals used by the hash table allows them to match
-            LeftSource = AddNotNullFilter(LeftSource, LeftAttribute, context, hints, true);
-            RightSource = AddNotNullFilter(RightSource, RightAttribute, context, hints, true);
+            if (JoinType == QualifiedJoinType.Inner || JoinType == QualifiedJoinType.RightOuter)
+                LeftSource = AddNotNullFilter(LeftSource, LeftAttribute, context, hints, true);
+
+            if (JoinType == QualifiedJoinType.Inner || JoinType == QualifiedJoinType.LeftOuter)
+                RightSource = AddNotNullFilter(RightSource, RightAttribute, context, hints, true);
 
             return this;
         }