Improved folding CTE to FetchXML

MarkMpn · Oct 22, 2023 · a74a25b · a74a25b
1 parent 41a0e3e
commit a74a25b
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine.Tests/FakeXrmEasyTestsBase.cs b/MarkMpn.Sql4Cds.Engine.Tests/FakeXrmEasyTestsBase.cs
@@ -117,6 +117,9 @@ public FakeXrmEasyTestsBase()
 
             SetColumnNumber(_context);
             SetColumnNumber(_context2);
+
+            SetRelationships(_context);
+            SetRelationships(_context2);
         }
 
         private void SetPrimaryNameAttributes(XrmFakedContext context)
@@ -243,5 +246,19 @@ private void SetColumnNumber(XrmFakedContext context)
                 context.SetEntityMetadata(entity);
             }
         }
+
+        private void SetRelationships(XrmFakedContext context)
+        {
+            foreach (var entity in context.CreateMetadataQuery())
+            {
+                if (entity.OneToManyRelationships == null)
+                    typeof(EntityMetadata).GetProperty(nameof(EntityMetadata.OneToManyRelationships)).SetValue(entity, Array.Empty<OneToManyRelationshipMetadata>());
+
+                if (entity.ManyToOneRelationships == null)
+                    typeof(EntityMetadata).GetProperty(nameof(EntityMetadata.ManyToOneRelationships)).SetValue(entity, Array.Empty<OneToManyRelationshipMetadata>());
+
+                context.SetEntityMetadata(entity);
+            }
+        }
     }
 }
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/AliasNode.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/AliasNode.cs
@@ -165,6 +165,7 @@ internal void FoldToFetchXML(FetchXmlScan fetchXml)
             // Add the mappings to the FetchXML to produce the columns with the expected names, and hide all other possible columns
             var originalAlias = fetchXml.Alias.EscapeIdentifier();
             fetchXml.Alias = Alias;
+            fetchXml.ColumnMappings.Clear();
 
             var escapedAlias = Alias.EscapeIdentifier();
 

diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/IndexSpoolNode.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/IndexSpoolNode.cs
@@ -165,11 +165,34 @@ private IDataExecutionPlanNodeInternal FoldCTEToFetchXml(NodeCompilationContext
                 anchorFetchXml.Entity.name != spooledRecursiveFetchXml.Entity.name)
                 return this;
 
-            // TODO: Check for any other filters or link-entities
+            // Check for any other filters or link-entities
+            if (spooledRecursiveFetchXml.Entity.GetLinkEntities().Any() ||
+                spooledRecursiveFetchXml.Entity.Items != null && spooledRecursiveFetchXml.Entity.Items.OfType<filter>().Any())
+                return this;
+
+            // Check there are no extra calculated columns
+            if (initialDepthCompute.Columns.Count != 1 || incrementDepthCompute.Columns.Count != 1)
+                return this;
+
+            // Check all columns are consistent
+            var depthField = initialDepthCompute.Columns.Single().Key;
 
-            // TODO: Check all columns are consistent
+            for (var i = 0; i < concat.ColumnSet.Count; i++)
+            {
+                if (concat.ColumnSet[i].SourceColumns[0] == depthField)
+                    continue;
+
+                var anchorAttribute = concat.ColumnSet[i].SourceColumns[0];
+                var recurseAttribute = concat.ColumnSet[i].SourceColumns[1];
+                recurseAttribute = recurseLoop.DefinedValues[recurseAttribute];
 
-            // TODO: Check there are no extra calculated columns
+                // Ignore any differences in the aliases used for the anchor and recursive parts
+                anchorAttribute = anchorAttribute.ToColumnReference().MultiPartIdentifier.Identifiers.Last().Value;
+                recurseAttribute = recurseAttribute.ToColumnReference().MultiPartIdentifier.Identifiers.Last().Value;
+
+                if (anchorAttribute != recurseAttribute)
+                    return this;
+            }
 
             var metadata = context.DataSources[anchorFetchXml.DataSource].Metadata[anchorFetchXml.Entity.name];
             var hierarchicalRelationship = metadata.OneToManyRelationships.SingleOrDefault(r => r.IsHierarchical == true);
@@ -200,7 +223,6 @@ private IDataExecutionPlanNodeInternal FoldCTEToFetchXml(NodeCompilationContext
                 return this;
 
             // The depth counter is no longer generated or used, so remove it from the concat column list
-            var depthField = initialDepthCompute.Columns.Single().Key;
             var depthFieldConcatColumn = concat.ColumnSet.Single(c => c.SourceColumns[0] == depthField);
             concat.ColumnSet.Remove(depthFieldConcatColumn);