Query: Full support for entity splitting

Resolves #620
dotnet · Sep 15, 2022 · d9518a5 · d9518a5
1 parent 20442c4
commit d9518a5
Show file tree

Hide file tree

Showing 21 changed files with 5,126 additions and 1,599 deletions.
diff --git a/src/EFCore.Relational/Metadata/Internal/RelationalEntityTypeExtensions.cs b/src/EFCore.Relational/Metadata/Internal/RelationalEntityTypeExtensions.cs
@@ -91,7 +91,13 @@ public static IEnumerable<IProperty> GetNonPrincipalSharedNonPkProperties(this I
                 continue;
             }
 
-            var propertyMappings = table.FindColumn(property)!.PropertyMappings;
+            var column = table.FindColumn(property);
+            if (column == null)
+            {
+                continue;
+            }
+
+            var propertyMappings = column.PropertyMappings;
             if (propertyMappings.Count() > 1
                 && propertyMappings.Any(pm => principalEntityTypes.Contains(pm.TableMapping.EntityType)))
             {

diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
diff --git a/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.cs b/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.cs
diff --git a/test/EFCore.Relational.Specification.Tests/Query/EntitySplittingQueryFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/EntitySplittingQueryFixtureBase.cs