Query: Allow providers to create subquery translating visitor

Fixes #17156
dotnet · Aug 20, 2019 · ba5c3f7 · ba5c3f7
1 parent 260fad1
commit ba5c3f7
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 39 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs
@@ -51,6 +51,31 @@ public CosmosQueryableMethodTranslatingExpressionVisitor(
             _projectionBindingExpressionVisitor = new CosmosProjectionBindingExpressionVisitor(_sqlTranslator);
         }
 
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     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>
+        protected CosmosQueryableMethodTranslatingExpressionVisitor(
+            CosmosQueryableMethodTranslatingExpressionVisitor parentVisitor)
+            : base(parentVisitor.Dependencies, subquery: true)
+        {
+            _model = parentVisitor._model;
+            _sqlExpressionFactory = parentVisitor._sqlExpressionFactory;
+            _sqlTranslator = parentVisitor._sqlTranslator;
+            _projectionBindingExpressionVisitor = new CosmosProjectionBindingExpressionVisitor(_sqlTranslator);
+        }
+
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     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>
+        protected override QueryableMethodTranslatingExpressionVisitor CreateSubqueryVisitor()
+            => new CosmosQueryableMethodTranslatingExpressionVisitor(this);
+
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -727,7 +752,7 @@ private SqlExpression TranslateLambdaExpression(
             return TranslateExpression(lambdaBody);
         }
 
-        private Expression RemapLambdaBody(Expression shaperBody, LambdaExpression lambdaExpression)
+        private static Expression RemapLambdaBody(Expression shaperBody, LambdaExpression lambdaExpression)
         {
             return ReplacingExpressionVisitor.Replace(lambdaExpression.Parameters.Single(), shaperBody, lambdaExpression.Body);
         }

diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs
@@ -29,25 +29,17 @@ public InMemoryQueryableMethodTranslatingExpressionVisitor(
             _model = model;
         }
 
-        public InMemoryQueryableMethodTranslatingExpressionVisitor(
-            QueryableMethodTranslatingExpressionVisitorDependencies dependencies,
-            IModel model,
-            InMemoryExpressionTranslatingExpressionVisitor expressionTranslator)
-            : base(dependencies, subquery: true)
+        protected InMemoryQueryableMethodTranslatingExpressionVisitor(
+            InMemoryQueryableMethodTranslatingExpressionVisitor parentVisitor)
+            : base(parentVisitor.Dependencies, subquery: true)
         {
-            _expressionTranslator = expressionTranslator;
-            _projectionBindingExpressionVisitor = new InMemoryProjectionBindingExpressionVisitor(this, expressionTranslator);
-            _model = model;
+            _expressionTranslator = parentVisitor._expressionTranslator;
+            _projectionBindingExpressionVisitor = new InMemoryProjectionBindingExpressionVisitor(this, _expressionTranslator);
+            _model = parentVisitor._model;
         }
 
-        public override ShapedQueryExpression TranslateSubquery(Expression expression)
-        {
-            return (ShapedQueryExpression)new InMemoryQueryableMethodTranslatingExpressionVisitor(
-                    Dependencies,
-                    _model,
-                    _expressionTranslator)
-                .Visit(expression);
-        }
+        protected override QueryableMethodTranslatingExpressionVisitor CreateSubqueryVisitor()
+            => new InMemoryQueryableMethodTranslatingExpressionVisitor(this);
 
         protected override ShapedQueryExpression CreateShapedQueryExpression(Type elementType)
         {

diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -44,20 +44,16 @@ public RelationalQueryableMethodTranslatingExpressionVisitor(
 
         protected virtual RelationalQueryableMethodTranslatingExpressionVisitorDependencies RelationalDependencies { get; }
 
-        private RelationalQueryableMethodTranslatingExpressionVisitor(
-            QueryableMethodTranslatingExpressionVisitorDependencies dependencies,
-            RelationalQueryableMethodTranslatingExpressionVisitorDependencies relationalDependencies,
-            IModel model,
-            RelationalSqlTranslatingExpressionVisitor sqlTranslator,
-            WeakEntityExpandingExpressionVisitor weakEntityExpandingExpressionVisitor,
-            ISqlExpressionFactory sqlExpressionFactory)
-            : base(dependencies, subquery: true)
+        protected RelationalQueryableMethodTranslatingExpressionVisitor(
+            RelationalQueryableMethodTranslatingExpressionVisitor parentVisitor)
+            : base(parentVisitor.Dependencies, subquery: true)
         {
-            _model = model;
-            _sqlTranslator = sqlTranslator;
-            _weakEntityExpandingExpressionVisitor = weakEntityExpandingExpressionVisitor;
-            _projectionBindingExpressionVisitor = new RelationalProjectionBindingExpressionVisitor(this, sqlTranslator);
-            _sqlExpressionFactory = sqlExpressionFactory;
+            RelationalDependencies = parentVisitor.RelationalDependencies;
+            _model = parentVisitor._model;
+            _sqlTranslator = parentVisitor._sqlTranslator;
+            _weakEntityExpandingExpressionVisitor = parentVisitor._weakEntityExpandingExpressionVisitor;
+            _projectionBindingExpressionVisitor = new RelationalProjectionBindingExpressionVisitor(this, _sqlTranslator);
+            _sqlExpressionFactory = parentVisitor._sqlExpressionFactory;
         }
 
         protected override Expression VisitMethodCall(MethodCallExpression methodCallExpression)
@@ -73,14 +69,8 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             return base.VisitMethodCall(methodCallExpression);
         }
 
-        public override ShapedQueryExpression TranslateSubquery(Expression expression)
-            => (ShapedQueryExpression)new RelationalQueryableMethodTranslatingExpressionVisitor(
-                Dependencies,
-                RelationalDependencies,
-                _model,
-                _sqlTranslator,
-                _weakEntityExpandingExpressionVisitor,
-                _sqlExpressionFactory).Visit(expression);
+        protected override QueryableMethodTranslatingExpressionVisitor CreateSubqueryVisitor()
+            => new RelationalQueryableMethodTranslatingExpressionVisitor(this);
 
         protected override ShapedQueryExpression CreateShapedQueryExpression(Type elementType)
         {

diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitor.cs
@@ -22,6 +22,15 @@ public SqliteQueryableMethodTranslatingExpressionVisitor(
         {
         }
 
+        protected SqliteQueryableMethodTranslatingExpressionVisitor(
+            SqliteQueryableMethodTranslatingExpressionVisitor parentVisitor)
+            : base(parentVisitor)
+        {
+        }
+
+        protected override QueryableMethodTranslatingExpressionVisitor CreateSubqueryVisitor()
+            => new SqliteQueryableMethodTranslatingExpressionVisitor(this);
+
         protected override ShapedQueryExpression TranslateOrderBy(ShapedQueryExpression source, LambdaExpression keySelector, bool ascending)
         {
             var translation = base.TranslateOrderBy(source, keySelector, ascending);

diff --git a/src/EFCore/Query/QueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore/Query/QueryableMethodTranslatingExpressionVisitor.cs
@@ -491,6 +491,11 @@ private static Expression AccessInnerTransparentField(
             return Expression.Field(targetExpression, fieldInfo);
         }
 
+        public virtual ShapedQueryExpression TranslateSubquery(Expression expression)
+            => (ShapedQueryExpression)CreateSubqueryVisitor().Visit(expression);
+
+        protected abstract QueryableMethodTranslatingExpressionVisitor CreateSubqueryVisitor();
+
         protected abstract ShapedQueryExpression CreateShapedQueryExpression(Type elementType);
         protected abstract ShapedQueryExpression TranslateAll(ShapedQueryExpression source, LambdaExpression predicate);
         protected abstract ShapedQueryExpression TranslateAny(ShapedQueryExpression source, LambdaExpression predicate);
@@ -528,6 +533,5 @@ private static Expression AccessInnerTransparentField(
         protected abstract ShapedQueryExpression TranslateThenBy(ShapedQueryExpression source, LambdaExpression keySelector, bool ascending);
         protected abstract ShapedQueryExpression TranslateUnion(ShapedQueryExpression source1, ShapedQueryExpression source2);
         protected abstract ShapedQueryExpression TranslateWhere(ShapedQueryExpression source, LambdaExpression predicate);
-        public abstract ShapedQueryExpression TranslateSubquery(Expression expression);
     }
 }