Fixed cross-entity column comparisons using <> and IS NOT DISTINCT FROM

Fixes #486
MarkMpn · Jun 18, 2024 · d96542b · d96542b
1 parent 5c3f108
commit d96542b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/BaseDataNode.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/BaseDataNode.cs
@@ -600,8 +600,8 @@ private bool TranslateFetchXMLCriteria(NodeCompilationContext context, DataSourc
                                 },
                                 new condition
                                 {
-                                    entityname = StandardizeAlias(entityAlias, targetEntityAlias, items),
-                                    attribute = RemoveAttributeAlias(attrName2, entityAlias, targetEntityAlias, items),
+                                    entityname = StandardizeAlias(entityAlias2, targetEntityAlias, items),
+                                    attribute = RemoveAttributeAlias(attrName2, entityAlias2, targetEntityAlias, items),
                                     @operator = @operator.notnull
                                 }
                             }
@@ -611,7 +611,7 @@ private bool TranslateFetchXMLCriteria(NodeCompilationContext context, DataSourc
                     else if (op == @operator.eq && type == BooleanComparisonType.IsNotDistinctFrom)
                     {
                         // FetchXML eq operator does not match records where both fields are null.
-                        // This matches the logic for =, but IS DISTINCT FROM also allows nulls to match
+                        // This matches the logic for =, but IS NOT DISTINCT FROM also allows nulls to match
                         filter = new filter
                         {
                             type = filterType.or,
@@ -631,8 +631,8 @@ private bool TranslateFetchXMLCriteria(NodeCompilationContext context, DataSourc
                                         },
                                         new condition
                                         {
-                                            entityname = StandardizeAlias(entityAlias, targetEntityAlias, items),
-                                            attribute = RemoveAttributeAlias(attrName2, entityAlias, targetEntityAlias, items),
+                                            entityname = StandardizeAlias(entityAlias2, targetEntityAlias, items),
+                                            attribute = RemoveAttributeAlias(attrName2, entityAlias2, targetEntityAlias, items),
                                             @operator = @operator.@null
                                         }
                                     }