Relational: Implement split query for non-include collections

Resolves #21234 Resolves #22283
dotnet · Apr 21, 2021 · 6e4f0f2 · 6e4f0f2
1 parent f9c4e71
commit 6e4f0f2
Show file tree

Hide file tree

Showing 20 changed files with 550 additions and 648 deletions.
diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs
diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx
@@ -748,9 +748,6 @@
   <data name="UnableToBindMemberToEntityProjection" xml:space="preserve">
     <value>Unable to bind '{memberType}.{member}' to an entity projection of '{entityType}'.</value>
   </data>
-  <data name="UnableToSplitCollectionProjectionInSplitQuery" xml:space="preserve">
-    <value>The query has been configured to use '{splitQueryEnumValue}', but contains a collection in the 'Select' call which could not be split into a separate query. Remove '{splitQueryMethodName}' if applied, or add '{singleQueryMethodName}' to the query.</value>
-  </data>
   <data name="UnhandledExpressionInVisitor" xml:space="preserve">
     <value>Unhandled expression '{expression}' of type '{expressionType}' encountered in '{visitor}'.</value>
   </data>

diff --git a/src/EFCore.Relational/Query/Internal/SplitIncludeRewritingExpressionVisitor.cs b/src/EFCore.Relational/Query/Internal/SplitIncludeRewritingExpressionVisitor.cs
diff --git a/src/EFCore.Relational/Query/RelationalQueryTranslationPreprocessor.cs b/src/EFCore.Relational/Query/RelationalQueryTranslationPreprocessor.cs
@@ -44,15 +44,5 @@ public override Expression NormalizeQueryableMethod(Expression expression)
 
             return expression;
         }
-
-        /// <inheritdoc />
-        public override Expression Process(Expression query)
-        {
-            query = base.Process(query);
-
-            return _relationalQueryCompilationContext.QuerySplittingBehavior == QuerySplittingBehavior.SplitQuery
-                ? new SplitIncludeRewritingExpressionVisitor().Visit(query)
-                : query;
-        }
     }
 }
diff --git a/src/EFCore.Relational/Query/SqlExpressions/FromSqlExpression.cs b/src/EFCore.Relational/Query/SqlExpressions/FromSqlExpression.cs
@@ -17,7 +17,7 @@ namespace Microsoft.EntityFrameworkCore.Query.SqlExpressions
     ///         not used in application code.
     ///     </para>
     /// </summary>
-    public class FromSqlExpression : TableExpressionBase
+    public class FromSqlExpression : TableExpressionBase, ICloneable
     {
         /// <summary>
         ///     Creates a new instance of the <see cref="FromSqlExpression" /> class.
@@ -95,6 +95,9 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
             return this;
         }
 
+        /// <inheritdoc />
+        public virtual object Clone() => new FromSqlExpression(Alias, Sql, Arguments);
+
         /// <inheritdoc />
         protected override void Print(ExpressionPrinter expressionPrinter)
         {