Stop transforming complex property access to EF.Property

roji · roji · commit 047037fde84c · 2025-09-15T14:38:13.000+02:00
Fixes #36761
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPostprocessorFactory.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPostprocessorFactory.cs
@@ -25,6 +25,7 @@ public class CosmosQueryTranslationPostprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPostprocessor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosQueryTranslationPostprocessor(
             Dependencies,
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPreprocessorFactory.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPreprocessorFactory.cs
@@ -23,6 +23,7 @@ public class CosmosQueryTranslationPreprocessorFactory(QueryTranslationPreproces
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosQueryTranslationPreprocessor(Dependencies, (CosmosQueryCompilationContext)queryCompilationContext);
 }
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -28,6 +28,7 @@ public class CosmosQueryableMethodTranslatingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosQueryableMethodTranslatingExpressionVisitor(
             Dependencies,
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitorFactory.cs b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitorFactory.cs
@@ -28,6 +28,7 @@ public class CosmosShapedQueryCompilingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual ShapedQueryCompilingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosShapedQueryCompilingExpressionVisitor(
             Dependencies,
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryTranslationPreprocessorFactory.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryTranslationPreprocessorFactory.cs
@@ -32,6 +32,7 @@ public InMemoryQueryTranslationPreprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)
         => new InMemoryQueryTranslationPreprocessor(Dependencies, queryCompilationContext);
 }
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -32,6 +32,7 @@ public InMemoryQueryableMethodTranslatingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new InMemoryQueryableMethodTranslatingExpressionVisitor(Dependencies, queryCompilationContext);
 }
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryExpressionVisitorFactory.cs b/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryExpressionVisitorFactory.cs
@@ -32,6 +32,7 @@ public InMemoryShapedQueryCompilingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual ShapedQueryCompilingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new InMemoryShapedQueryCompilingExpressionVisitor(Dependencies, queryCompilationContext);
 }
diff --git a/src/EFCore.Relational/Query/Internal/RelationalQueryTranslationPostprocessorFactory.cs b/src/EFCore.Relational/Query/Internal/RelationalQueryTranslationPostprocessorFactory.cs
@@ -41,6 +41,7 @@ public RelationalQueryTranslationPostprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPostprocessor Create(QueryCompilationContext queryCompilationContext)
         => new RelationalQueryTranslationPostprocessor(
             Dependencies,
diff --git a/src/EFCore.Relational/Query/Internal/RelationalQueryTranslationPreprocessorFactory.cs b/src/EFCore.Relational/Query/Internal/RelationalQueryTranslationPreprocessorFactory.cs
@@ -41,6 +41,7 @@ public RelationalQueryTranslationPreprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)
         => new RelationalQueryTranslationPreprocessor(Dependencies, RelationalDependencies, queryCompilationContext);
 }
diff --git a/src/EFCore.Relational/Query/Internal/RelationalQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Relational/Query/Internal/RelationalQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -41,6 +41,7 @@ public RelationalQueryableMethodTranslatingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new RelationalQueryableMethodTranslatingExpressionVisitor(
             Dependencies,
diff --git a/src/EFCore.Relational/Query/Internal/RelationalShapedQueryCompilingExpressionVisitorFactory.cs b/src/EFCore.Relational/Query/Internal/RelationalShapedQueryCompilingExpressionVisitorFactory.cs
@@ -41,6 +41,7 @@ public RelationalShapedQueryCompilingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual ShapedQueryCompilingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new RelationalShapedQueryCompilingExpressionVisitor(
             Dependencies,
diff --git a/src/EFCore.SqlServer/Query/Internal/SqlServerQueryTranslationPostprocessorFactory.cs b/src/EFCore.SqlServer/Query/Internal/SqlServerQueryTranslationPostprocessorFactory.cs
@@ -41,6 +41,7 @@ public SqlServerQueryTranslationPostprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPostprocessor Create(QueryCompilationContext queryCompilationContext)
         => new SqlServerQueryTranslationPostprocessor(
             Dependencies, RelationalDependencies, (SqlServerQueryCompilationContext)queryCompilationContext);
diff --git a/src/EFCore.SqlServer/Query/Internal/SqlServerQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.SqlServer/Query/Internal/SqlServerQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -47,6 +47,7 @@ public SqlServerQueryableMethodTranslatingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new SqlServerQueryableMethodTranslatingExpressionVisitor(
             Dependencies, RelationalDependencies, (SqlServerQueryCompilationContext)queryCompilationContext, _sqlServerSingletonOptions);
diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryTranslationPostprocessorFactory.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryTranslationPostprocessorFactory.cs
@@ -41,6 +41,7 @@ public SqliteQueryTranslationPostprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPostprocessor Create(QueryCompilationContext queryCompilationContext)
         => new SqliteQueryTranslationPostprocessor(
             Dependencies,
diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -41,6 +41,7 @@ public SqliteQueryableMethodTranslatingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new SqliteQueryableMethodTranslatingExpressionVisitor(
             Dependencies, RelationalDependencies, (RelationalQueryCompilationContext)queryCompilationContext);
diff --git a/src/EFCore/Query/IQueryTranslationPreprocessorFactory.cs b/src/EFCore/Query/IQueryTranslationPreprocessorFactory.cs
@@ -25,5 +25,6 @@ public interface IQueryTranslationPreprocessorFactory
     /// </summary>
     /// <param name="queryCompilationContext">The query compilation context to use.</param>
     /// <returns>The created visitor.</returns>
+    [DebuggerStepThrough]
     QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext);
 }
diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
@@ -48,7 +48,7 @@ protected override Expression VisitExtension(Expression expression)
         protected override Expression VisitMember(MemberExpression memberExpression)
         {
             var innerExpression = Visit(memberExpression.Expression);
-            return TryExpandRelationship(innerExpression, MemberIdentity.Create(memberExpression.Member))
+            return TryExpandRelationship(innerExpression, MemberIdentity.Create(memberExpression.Member), memberExpression)
                 ?? memberExpression.Update(innerExpression);
         }
 
@@ -57,21 +57,21 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             if (methodCallExpression.TryGetEFPropertyArguments(out var source, out var navigationName))
             {
                 source = Visit(source);
-                return TryExpandRelationship(source, MemberIdentity.Create(navigationName))
+                return TryExpandRelationship(source, MemberIdentity.Create(navigationName), methodCallExpression)
                     ?? methodCallExpression.Update(null, [source, methodCallExpression.Arguments[1]]);
             }
 
             if (methodCallExpression.TryGetIndexerArguments(Model, out source, out navigationName))
             {
                 source = Visit(source);
-                return TryExpandRelationship(source, MemberIdentity.Create(navigationName))
+                return TryExpandRelationship(source, MemberIdentity.Create(navigationName), methodCallExpression)
                     ?? methodCallExpression.Update(source, [methodCallExpression.Arguments[0]]);
             }
 
             return base.VisitMethodCall(methodCallExpression);
         }
 
-        private Expression? TryExpandRelationship(Expression? root, MemberIdentity memberIdentity)
+        private Expression? TryExpandRelationship(Expression? root, MemberIdentity memberIdentity, Expression originalExpression)
         {
             if (root == null)
             {
@@ -130,7 +130,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                         : null;
                 if (complexProperty is not null)
                 {
-                    return new ComplexPropertyReference(root, complexProperty);
+                    return new ComplexPropertyReference(root, complexProperty, originalExpression);
                 }
 
                 var property = memberIdentity.MemberInfo != null
@@ -1020,8 +1020,14 @@ private sealed class ReducingExpressionVisitor : ExpressionVisitor
                     return Visit(queryablePropertyReference.Parent).CreateEFPropertyExpression(queryablePropertyReference.Property);
 
                 case ComplexPropertyReference complexPropertyReference:
-                    return Visit(complexPropertyReference.Parent).CreateEFPropertyExpression(
-                        complexPropertyReference.Property, makeNullable: false);
+                    return complexPropertyReference.OriginalExpression switch
+                    {
+                        MemberExpression e
+                            => e.Update(Visit(complexPropertyReference.Parent)),
+                        MethodCallExpression e when e.Method.IsEFPropertyMethod()
+                            => e.Update(@object: null, [Visit(complexPropertyReference.Parent), e.Arguments[1]]),
+                        _ => throw new UnreachableException()
+                    };
 
                 case IncludeExpression includeExpression:
                     var entityExpression = Visit(includeExpression.EntityExpression);
diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.Expressions.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.Expressions.cs
@@ -477,7 +477,7 @@ void IPrintableExpression.Print(ExpressionPrinter expressionPrinter)
     /// <summary>
     ///     Queryable properties are not expanded (similar to <see cref="OwnedNavigationReference" />.
     /// </summary>
-    private sealed class ComplexPropertyReference(Expression parent, IComplexProperty complexProperty)
+    private sealed class ComplexPropertyReference(Expression parent, IComplexProperty complexProperty, Expression originalExpression)
         : Expression, IPrintableExpression
     {
         protected override Expression VisitChildren(ExpressionVisitor visitor)
@@ -489,6 +489,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 
         public Expression Parent { get; private set; } = parent;
         public new IComplexProperty Property { get; } = complexProperty;
+        public Expression OriginalExpression { get; private set; } = originalExpression;
         public ComplexTypeReference ComplexTypeReference { get; } = new(complexProperty.ComplexType);
 
         public override Type Type
diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs
@@ -276,7 +276,7 @@ protected override Expression VisitMember(MemberExpression memberExpression)
             } complexPropertyReference
             && complexProperty.ComplexType.FindComplexProperty(memberExpression.Member) is { } nestedComplexProperty)
         {
-            return new ComplexPropertyReference(complexPropertyReference, nestedComplexProperty);
+            return new ComplexPropertyReference(complexPropertyReference, nestedComplexProperty, memberExpression);
         }
 
         // Convert ICollection<T>.Count to Count<T>()
diff --git a/src/EFCore/Query/Internal/QueryTranslationPostprocessorFactory.cs b/src/EFCore/Query/Internal/QueryTranslationPostprocessorFactory.cs
@@ -34,6 +34,7 @@ public QueryTranslationPostprocessorFactory(QueryTranslationPostprocessorDepende
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPostprocessor Create(QueryCompilationContext queryCompilationContext)
         => new(Dependencies, queryCompilationContext);
 }
diff --git a/src/EFCore/Query/Internal/QueryTranslationPreprocessorFactory.cs b/src/EFCore/Query/Internal/QueryTranslationPreprocessorFactory.cs
@@ -34,6 +34,7 @@ public QueryTranslationPreprocessorFactory(QueryTranslationPreprocessorDependenc
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)
         => new(Dependencies, queryCompilationContext);
 }
diff --git a/src/EFCore/Query/QueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore/Query/QueryableMethodTranslatingExpressionVisitor.cs
@@ -580,9 +580,11 @@ when QueryableMethods.IsSumWithSelector(method):
                         when genericMethod == QueryableMethods.Where:
                         return CheckTranslated(TranslateWhere(shapedQueryExpression, GetLambdaExpressionFromArgument(1)));
 
+                        [DebuggerStepThrough]
                         LambdaExpression GetLambdaExpressionFromArgument(int argumentIndex)
                             => methodCallExpression.Arguments[argumentIndex].UnwrapLambdaFromQuote();
 
+                        [DebuggerStepThrough]
                         Expression CheckTranslated(ShapedQueryExpression? translated)
                         {
                             if (translated is not null)
@@ -604,7 +606,8 @@ Expression CheckTranslated(ShapedQueryExpression? translated)
 
         // The method isn't a LINQ operator on Queryable/QueryableExtensions.
 
-        // Identify property access, e.g. primitive collection property (context.Blogs.Where(b => b.Tags.Contains(...)))
+        // Identify property access, i.e. primitive collection property (context.Blogs.Where(b => b.Tags.Contains(...))),
+        // complex collection property...
         if (IsMemberAccess(methodCallExpression, QueryCompilationContext.Model, out var propertyAccessSource, out var propertyName)
             && TranslateMemberAccess(propertyAccessSource, propertyName) is { } translation)
         {
@@ -619,6 +622,25 @@ Expression CheckTranslated(ShapedQueryExpression? translated)
                     CoreStrings.TranslationFailedWithDetails(methodCallExpression.Print(), TranslationErrorDetails));
     }
 
+    /// <inheritdoc />
+    protected override Expression VisitMember(MemberExpression memberExpression)
+    {
+        // Identify property access, i.e. primitive collection property (context.Blogs.Where(b => b.Tags.Contains(...))),
+        // complex collection property...
+        if (IsMemberAccess(memberExpression, QueryCompilationContext.Model, out var propertyAccessSource, out var propertyName)
+            && TranslateMemberAccess(propertyAccessSource, propertyName) is { } translation)
+        {
+            return translation;
+        }
+
+        return _subquery
+            ? QueryCompilationContext.NotTranslatedExpression
+            : TranslationErrorDetails is null
+                ? throw new InvalidOperationException(CoreStrings.TranslationFailed(memberExpression.Print()))
+                : throw new InvalidOperationException(
+                    CoreStrings.TranslationFailedWithDetails(memberExpression.Print(), TranslationErrorDetails));
+    }
+
     private sealed class EntityShaperNullableMarkingExpressionVisitor : ExpressionVisitor
     {
         protected override Expression VisitExtension(Expression extensionExpression)
diff --git a/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs
@@ -15,14 +15,6 @@ public ComplexTableSplittingProjectionRelationalTestBase(TFixture fixture, ITest
         Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
     }
 
-    // Collections are not supported with table splitting, only JSON
-    public override Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior)
-        => Assert.ThrowsAsync<InvalidOperationException>(() => base.Select_nested_collection_on_required_related(queryTrackingBehavior));
-
-    // Collections are not supported with table splitting, only JSON
-    public override Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior)
-        => Assert.ThrowsAsync<InvalidOperationException>(() => base.Select_nested_collection_on_optional_related(queryTrackingBehavior));
-
     // Collections are not supported with table splitting, only JSON
     public override Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior)
         => Assert.ThrowsAsync<InvalidOperationException>(() => base.SelectMany_related_collection(queryTrackingBehavior));
diff --git a/test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalFixture.cs
@@ -102,6 +102,7 @@ public class NonSqlGeneratingShapedQueryCompilingExpressionVisitorFactory(
         RelationalShapedQueryCompilingExpressionVisitorDependencies relationalDependencies)
         : IShapedQueryCompilingExpressionVisitorFactory
     {
+        [DebuggerStepThrough]
         public ShapedQueryCompilingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
             => new NonSqlGeneratingShapedQueryCompilingExpressionVisitor(
                 dependencies,
diff --git a/test/EFCore.Specification.Tests/Query/Associations/AssociationsModel.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsModel.cs
@@ -45,6 +45,8 @@ public class RelatedType : IEquatable<RelatedType>
     public required string String { get; set; }
     public required List<int> Ints { get; set; }
 
+    public int Unmapped => Int + 1;
+
     public required NestedType RequiredNested { get; set; }
     public NestedType? OptionalNested { get; set; }
     public List<NestedType> NestedCollection { get; set; } = null!;
diff --git a/test/EFCore.Specification.Tests/Query/Associations/AssociationsProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsProjectionTestBase.cs
diff --git a/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqlServerTest.cs
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqlServerTest.cs
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqlServerTest.cs
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public class CosmosQueryTranslationPreprocessorFactory(QueryTranslationPreproces`
`23`	`23`	`/// any release. You should only use it directly in your code with extreme caution and knowing that`
`24`	`24`	`/// doing so can result in application failures when updating to a new Entity Framework Core release.`
`25`	`25`	`/// </summary>`
	`26`	`+ [DebuggerStepThrough]`
`26`	`27`	`public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)`
`27`	`28`	`=> new CosmosQueryTranslationPreprocessor(Dependencies, (CosmosQueryCompilationContext)queryCompilationContext);`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public InMemoryQueryTranslationPreprocessorFactory(`
`32`	`32`	`/// any release. You should only use it directly in your code with extreme caution and knowing that`
`33`	`33`	`/// doing so can result in application failures when updating to a new Entity Framework Core release.`
`34`	`34`	`/// </summary>`
	`35`	`+ [DebuggerStepThrough]`
`35`	`36`	`public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)`
`36`	`37`	`=> new InMemoryQueryTranslationPreprocessor(Dependencies, queryCompilationContext);`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public InMemoryQueryableMethodTranslatingExpressionVisitorFactory(`
`32`	`32`	`/// any release. You should only use it directly in your code with extreme caution and knowing that`
`33`	`33`	`/// doing so can result in application failures when updating to a new Entity Framework Core release.`
`34`	`34`	`/// </summary>`
	`35`	`+ [DebuggerStepThrough]`
`35`	`36`	`public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)`
`36`	`37`	`=> new InMemoryQueryableMethodTranslatingExpressionVisitor(Dependencies, queryCompilationContext);`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public InMemoryShapedQueryCompilingExpressionVisitorFactory(`
`32`	`32`	`/// any release. You should only use it directly in your code with extreme caution and knowing that`
`33`	`33`	`/// doing so can result in application failures when updating to a new Entity Framework Core release.`
`34`	`34`	`/// </summary>`
	`35`	`+ [DebuggerStepThrough]`
`35`	`36`	`public virtual ShapedQueryCompilingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)`
`36`	`37`	`=> new InMemoryShapedQueryCompilingExpressionVisitor(Dependencies, queryCompilationContext);`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public RelationalQueryTranslationPreprocessorFactory(`
`41`	`41`	`/// any release. You should only use it directly in your code with extreme caution and knowing that`
`42`	`42`	`/// doing so can result in application failures when updating to a new Entity Framework Core release.`
`43`	`43`	`/// </summary>`
	`44`	`+ [DebuggerStepThrough]`
`44`	`45`	`public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)`
`45`	`46`	`=> new RelationalQueryTranslationPreprocessor(Dependencies, RelationalDependencies, queryCompilationContext);`
`46`	`47`	`}`