Query: Factories used during compilation time should take QueryCompilationContext as argument

smitpatel · smitpatel · commit 3a76639ddde6 · 2020-03-26T17:26:25.000-07:00
Part of #18923
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs
@@ -36,16 +36,16 @@ public class CosmosQueryableMethodTranslatingExpressionVisitor : QueryableMethod
         /// </summary>
         public CosmosQueryableMethodTranslatingExpressionVisitor(
             [NotNull] QueryableMethodTranslatingExpressionVisitorDependencies dependencies,
-            [NotNull] IModel model,
+            [NotNull] QueryCompilationContext queryCompilationContext,
             [NotNull] ISqlExpressionFactory sqlExpressionFactory,
             [NotNull] IMemberTranslatorProvider memberTranslatorProvider,
             [NotNull] IMethodCallTranslatorProvider methodCallTranslatorProvider)
             : base(dependencies, subquery: false)
         {
-            _model = model;
+            _model = queryCompilationContext.Model;
             _sqlExpressionFactory = sqlExpressionFactory;
             _sqlTranslator = new CosmosSqlTranslatingExpressionVisitor(
-                model,
+                _model,
                 sqlExpressionFactory,
                 memberTranslatorProvider,
                 methodCallTranslatorProvider);
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -53,13 +53,13 @@ public 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>
-        public virtual QueryableMethodTranslatingExpressionVisitor Create(IModel model)
+        public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         {
-            Check.NotNull(model, nameof(model));
+            Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));
 
             return new CosmosQueryableMethodTranslatingExpressionVisitor(
                 _dependencies,
-                model,
+                queryCompilationContext,
                 _sqlExpressionFactory,
                 _memberTranslatorProvider,
                 _methodCallTranslatorProvider);
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs
@@ -12,7 +12,6 @@
 using Microsoft.EntityFrameworkCore.InMemory.Internal;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -30,13 +29,13 @@ public class InMemoryQueryableMethodTranslatingExpressionVisitor : QueryableMeth
 
         public InMemoryQueryableMethodTranslatingExpressionVisitor(
             [NotNull] QueryableMethodTranslatingExpressionVisitorDependencies dependencies,
-            [NotNull] IModel model)
+            [NotNull] QueryCompilationContext queryCompilationContext)
             : base(dependencies, subquery: false)
         {
-            _expressionTranslator = new InMemoryExpressionTranslatingExpressionVisitor(this, model);
+            _expressionTranslator = new InMemoryExpressionTranslatingExpressionVisitor(this, queryCompilationContext.Model);
             _weakEntityExpandingExpressionVisitor = new WeakEntityExpandingExpressionVisitor(_expressionTranslator);
             _projectionBindingExpressionVisitor = new InMemoryProjectionBindingExpressionVisitor(this, _expressionTranslator);
-            _model = model;
+            _model = queryCompilationContext.Model;
         }
 
         protected InMemoryQueryableMethodTranslatingExpressionVisitor(
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -32,11 +32,11 @@ public InMemoryQueryableMethodTranslatingExpressionVisitorFactory(
             _dependencies = dependencies;
         }
 
-        public virtual QueryableMethodTranslatingExpressionVisitor Create(IModel model)
+        public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         {
-            Check.NotNull(model, nameof(model));
+            Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));
 
-            return new InMemoryQueryableMethodTranslatingExpressionVisitor(_dependencies, model);
+            return new InMemoryQueryableMethodTranslatingExpressionVisitor(_dependencies, queryCompilationContext);
         }
     }
 }
diff --git a/src/EFCore.Relational/Query/IRelationalSqlTranslatingExpressionVisitorFactory.cs b/src/EFCore.Relational/Query/IRelationalSqlTranslatingExpressionVisitorFactory.cs
@@ -20,7 +20,7 @@ namespace Microsoft.EntityFrameworkCore.Query
     public interface IRelationalSqlTranslatingExpressionVisitorFactory
     {
         RelationalSqlTranslatingExpressionVisitor Create(
-            [NotNull] IModel model,
+            [NotNull] QueryCompilationContext queryCompilationContext,
             [NotNull] QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor);
     }
 }
diff --git a/src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs b/src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs
@@ -23,7 +23,6 @@ public class RelationalProjectionBindingExpressionVisitor : ExpressionVisitor
 
         private SelectExpression _selectExpression;
         private bool _clientEval;
-        private readonly IModel _model;
 
         private readonly IDictionary<ProjectionMember, Expression> _projectionMapping
             = new Dictionary<ProjectionMember, Expression>();
@@ -32,12 +31,10 @@ private readonly IDictionary<ProjectionMember, Expression> _projectionMapping
 
         public RelationalProjectionBindingExpressionVisitor(
             [NotNull] RelationalQueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor,
-            [NotNull] RelationalSqlTranslatingExpressionVisitor sqlTranslatingExpressionVisitor,
-            [NotNull] IModel model)
+            [NotNull] RelationalSqlTranslatingExpressionVisitor sqlTranslatingExpressionVisitor)
         {
             _queryableMethodTranslatingExpressionVisitor = queryableMethodTranslatingExpressionVisitor;
             _sqlTranslator = sqlTranslatingExpressionVisitor;
-            _model = model;
         }
 
         public virtual Expression Translate([NotNull] SelectExpression selectExpression, [NotNull] Expression expression)
diff --git a/src/EFCore.Relational/Query/Internal/RelationalQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Relational/Query/Internal/RelationalQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -31,14 +31,14 @@ public RelationalQueryableMethodTranslatingExpressionVisitorFactory(
             _relationalDependencies = relationalDependencies;
         }
 
-        public virtual QueryableMethodTranslatingExpressionVisitor Create(IModel model)
+        public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         {
-            Check.NotNull(model, nameof(model));
+            Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));
 
             return new RelationalQueryableMethodTranslatingExpressionVisitor(
                 _dependencies,
                 _relationalDependencies,
-                model);
+                queryCompilationContext);
         }
     }
 }
diff --git a/src/EFCore.Relational/Query/Internal/RelationalSqlTranslatingExpressionVisitorFactory.cs b/src/EFCore.Relational/Query/Internal/RelationalSqlTranslatingExpressionVisitorFactory.cs
@@ -18,15 +18,15 @@ public RelationalSqlTranslatingExpressionVisitorFactory(
         }
 
         public virtual RelationalSqlTranslatingExpressionVisitor Create(
-            IModel model,
+            QueryCompilationContext queryCompilationContext,
             QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)
         {
-            Check.NotNull(model, nameof(model));
+            Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));
             Check.NotNull(queryableMethodTranslatingExpressionVisitor, nameof(queryableMethodTranslatingExpressionVisitor));
 
             return new RelationalSqlTranslatingExpressionVisitor(
                 _dependencies,
-                model,
+                queryCompilationContext,
                 queryableMethodTranslatingExpressionVisitor);
         }
     }
diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -29,20 +29,20 @@ public class RelationalQueryableMethodTranslatingExpressionVisitor : QueryableMe
         public RelationalQueryableMethodTranslatingExpressionVisitor(
             [NotNull] QueryableMethodTranslatingExpressionVisitorDependencies dependencies,
             [NotNull] RelationalQueryableMethodTranslatingExpressionVisitorDependencies relationalDependencies,
-            [NotNull] IModel model)
+            [NotNull] QueryCompilationContext queryCompilationContext)
             : base(dependencies, subquery: false)
         {
             Check.NotNull(dependencies, nameof(dependencies));
             Check.NotNull(relationalDependencies, nameof(relationalDependencies));
-            Check.NotNull(model, nameof(model));
+            Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));
 
             RelationalDependencies = relationalDependencies;
 
             var sqlExpressionFactory = relationalDependencies.SqlExpressionFactory;
-            _sqlTranslator = relationalDependencies.RelationalSqlTranslatingExpressionVisitorFactory.Create(model, this);
+            _model = queryCompilationContext.Model;
+            _sqlTranslator = relationalDependencies.RelationalSqlTranslatingExpressionVisitorFactory.Create(queryCompilationContext, this);
             _weakEntityExpandingExpressionVisitor = new WeakEntityExpandingExpressionVisitor(_sqlTranslator, sqlExpressionFactory);
-            _projectionBindingExpressionVisitor = new RelationalProjectionBindingExpressionVisitor(this, _sqlTranslator, model);
-            _model = model;
+            _projectionBindingExpressionVisitor = new RelationalProjectionBindingExpressionVisitor(this, _sqlTranslator);
             _sqlExpressionFactory = sqlExpressionFactory;
             _subquery = false;
         }
@@ -57,7 +57,7 @@ protected RelationalQueryableMethodTranslatingExpressionVisitor(
             _model = parentVisitor._model;
             _sqlTranslator = parentVisitor._sqlTranslator;
             _weakEntityExpandingExpressionVisitor = parentVisitor._weakEntityExpandingExpressionVisitor;
-            _projectionBindingExpressionVisitor = new RelationalProjectionBindingExpressionVisitor(this, _sqlTranslator, _model);
+            _projectionBindingExpressionVisitor = new RelationalProjectionBindingExpressionVisitor(this, _sqlTranslator);
             _sqlExpressionFactory = parentVisitor._sqlExpressionFactory;
             _subquery = true;
         }
diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
@@ -9,7 +9,6 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
@@ -27,17 +26,17 @@ public class RelationalSqlTranslatingExpressionVisitor : ExpressionVisitor
 
         public RelationalSqlTranslatingExpressionVisitor(
             [NotNull] RelationalSqlTranslatingExpressionVisitorDependencies dependencies,
-            [NotNull] IModel model,
+            [NotNull] QueryCompilationContext queryCompilationContext,
             [NotNull] QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)
         {
             Check.NotNull(dependencies, nameof(dependencies));
-            Check.NotNull(model, nameof(model));
+            Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));
             Check.NotNull(queryableMethodTranslatingExpressionVisitor, nameof(queryableMethodTranslatingExpressionVisitor));
 
             Dependencies = dependencies;
             SqlExpressionFactory = dependencies.SqlExpressionFactory;
 
-            _model = model;
+            _model = queryCompilationContext.Model;
             _queryableMethodTranslatingExpressionVisitor = queryableMethodTranslatingExpressionVisitor;
             _sqlTypeMappingVerifyingExpressionVisitor = new SqlTypeMappingVerifyingExpressionVisitor();
         }
diff --git a/src/EFCore.SqlServer/Query/Internal/SqlServerSqlTranslatingExpressionVisitor.cs b/src/EFCore.SqlServer/Query/Internal/SqlServerSqlTranslatingExpressionVisitor.cs
@@ -35,9 +35,9 @@ private static readonly HashSet<ExpressionType> _arithmeticOperatorTypes
 
         public SqlServerSqlTranslatingExpressionVisitor(
             [NotNull] RelationalSqlTranslatingExpressionVisitorDependencies dependencies,
-            [NotNull] IModel model,
+            [NotNull] QueryCompilationContext queryCompilationContext,
             [NotNull] QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)
-            : base(dependencies, model, queryableMethodTranslatingExpressionVisitor)
+            : base(dependencies, queryCompilationContext, queryableMethodTranslatingExpressionVisitor)
         {
         }
 
diff --git a/src/EFCore.SqlServer/Query/Internal/SqlServerSqlTranslatingExpressionVisitorFactory.cs b/src/EFCore.SqlServer/Query/Internal/SqlServerSqlTranslatingExpressionVisitorFactory.cs
@@ -18,11 +18,11 @@ public SqlServerSqlTranslatingExpressionVisitorFactory(
         }
 
         public virtual RelationalSqlTranslatingExpressionVisitor Create(
-            IModel model,
+            QueryCompilationContext queryCompilationContext,
             QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)
             => new SqlServerSqlTranslatingExpressionVisitor(
                 _dependencies,
-                model,
+                queryCompilationContext,
                 queryableMethodTranslatingExpressionVisitor);
     }
 }
diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitor.cs
@@ -19,8 +19,8 @@ public class SqliteQueryableMethodTranslatingExpressionVisitor : RelationalQuery
         public SqliteQueryableMethodTranslatingExpressionVisitor(
             [NotNull] QueryableMethodTranslatingExpressionVisitorDependencies dependencies,
             [NotNull] RelationalQueryableMethodTranslatingExpressionVisitorDependencies relationalDependencies,
-            [NotNull] IModel model)
-            : base(dependencies, relationalDependencies, model)
+            [NotNull] QueryCompilationContext queryCompilationContext)
+            : base(dependencies, relationalDependencies, queryCompilationContext)
         {
         }
 
diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -21,11 +21,11 @@ public SqliteQueryableMethodTranslatingExpressionVisitorFactory(
             _relationalDependencies = relationalDependencies;
         }
 
-        public virtual QueryableMethodTranslatingExpressionVisitor Create(IModel model)
+        public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         {
-            Check.NotNull(model, nameof(model));
+            Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));
 
-            return new SqliteQueryableMethodTranslatingExpressionVisitor(_dependencies, _relationalDependencies, model);
+            return new SqliteQueryableMethodTranslatingExpressionVisitor(_dependencies, _relationalDependencies, queryCompilationContext);
         }
     }
 }
diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitor.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitor.cs
@@ -80,9 +80,9 @@ private static readonly IReadOnlyDictionary<ExpressionType, IReadOnlyCollection<
 
         public SqliteSqlTranslatingExpressionVisitor(
             [NotNull] RelationalSqlTranslatingExpressionVisitorDependencies dependencies,
-            [NotNull] IModel model,
+            [NotNull] QueryCompilationContext queryCompilationContext,
             [NotNull] QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)
-            : base(dependencies, model, queryableMethodTranslatingExpressionVisitor)
+            : base(dependencies, queryCompilationContext, queryableMethodTranslatingExpressionVisitor)
         {
         }
 
diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitorFactory.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitorFactory.cs
@@ -18,11 +18,11 @@ public SqliteSqlTranslatingExpressionVisitorFactory(
         }
 
         public virtual RelationalSqlTranslatingExpressionVisitor Create(
-            IModel model,
+            QueryCompilationContext queryCompilationContext,
             QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)
             => new SqliteSqlTranslatingExpressionVisitor(
                 _dependencies,
-                model,
+                queryCompilationContext,
                 queryableMethodTranslatingExpressionVisitor);
     }
 }
diff --git a/src/EFCore/Query/IQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore/Query/IQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -19,6 +19,6 @@ namespace Microsoft.EntityFrameworkCore.Query
     /// </summary>
     public interface IQueryableMethodTranslatingExpressionVisitorFactory
     {
-        QueryableMethodTranslatingExpressionVisitor Create([NotNull] IModel model);
+        QueryableMethodTranslatingExpressionVisitor Create([NotNull] QueryCompilationContext queryCompilationContext);
     }
 }
diff --git a/src/EFCore/Query/QueryCompilationContext.cs b/src/EFCore/Query/QueryCompilationContext.cs
@@ -73,7 +73,7 @@ public virtual Func<QueryContext, TResult> CreateQueryExecutor<TResult>([NotNull
 
             query = _queryTranslationPreprocessorFactory.Create(this).Process(query);
             // Convert EntityQueryable to ShapedQueryExpression
-            query = _queryableMethodTranslatingExpressionVisitorFactory.Create(Model).Visit(query);
+            query = _queryableMethodTranslatingExpressionVisitorFactory.Create(this).Visit(query);
             query = _queryTranslationPostprocessorFactory.Create(this).Process(query);
 
             // Inject actual entity materializer

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ public InMemoryQueryableMethodTranslatingExpressionVisitorFactory(`
`32`	`32`	`_dependencies = dependencies;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public virtual QueryableMethodTranslatingExpressionVisitor Create(IModel model)`
	`35`	`+ public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)`
`36`	`36`	`{`
`37`		`- Check.NotNull(model, nameof(model));`
	`37`	`+ Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));`
`38`	`38`
`39`		`- return new InMemoryQueryableMethodTranslatingExpressionVisitor(_dependencies, model);`
	`39`	`+ return new InMemoryQueryableMethodTranslatingExpressionVisitor(_dependencies, queryCompilationContext);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace Microsoft.EntityFrameworkCore.Query`
`20`	`20`	`public interface IRelationalSqlTranslatingExpressionVisitorFactory`
`21`	`21`	`{`
`22`	`22`	`RelationalSqlTranslatingExpressionVisitor Create(`
`23`		`- [NotNull] IModel model,`
	`23`	`+ [NotNull] QueryCompilationContext queryCompilationContext,`
`24`	`24`	`[NotNull] QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor);`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,14 @@ public RelationalQueryableMethodTranslatingExpressionVisitorFactory(`
`31`	`31`	`_relationalDependencies = relationalDependencies;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public virtual QueryableMethodTranslatingExpressionVisitor Create(IModel model)`
	`34`	`+ public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)`
`35`	`35`	`{`
`36`		`- Check.NotNull(model, nameof(model));`
	`36`	`+ Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));`
`37`	`37`
`38`	`38`	`return new RelationalQueryableMethodTranslatingExpressionVisitor(`
`39`	`39`	`_dependencies,`
`40`	`40`	`_relationalDependencies,`
`41`		`- model);`
	`41`	`+ queryCompilationContext);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ public RelationalSqlTranslatingExpressionVisitorFactory(`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public virtual RelationalSqlTranslatingExpressionVisitor Create(`
`21`		`- IModel model,`
	`21`	`+ QueryCompilationContext queryCompilationContext,`
`22`	`22`	`QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)`
`23`	`23`	`{`
`24`		`- Check.NotNull(model, nameof(model));`
	`24`	`+ Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));`
`25`	`25`	`Check.NotNull(queryableMethodTranslatingExpressionVisitor, nameof(queryableMethodTranslatingExpressionVisitor));`
`26`	`26`
`27`	`27`	`return new RelationalSqlTranslatingExpressionVisitor(`
`28`	`28`	`_dependencies,`
`29`		`- model,`
	`29`	`+ queryCompilationContext,`
`30`	`30`	`queryableMethodTranslatingExpressionVisitor);`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ private static readonly HashSet<ExpressionType> _arithmeticOperatorTypes`
`35`	`35`
`36`	`36`	`public SqlServerSqlTranslatingExpressionVisitor(`
`37`	`37`	`[NotNull] RelationalSqlTranslatingExpressionVisitorDependencies dependencies,`
`38`		`- [NotNull] IModel model,`
	`38`	`+ [NotNull] QueryCompilationContext queryCompilationContext,`
`39`	`39`	`[NotNull] QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)`
`40`		`- : base(dependencies, model, queryableMethodTranslatingExpressionVisitor)`
	`40`	`+ : base(dependencies, queryCompilationContext, queryableMethodTranslatingExpressionVisitor)`
`41`	`41`	`{`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ public SqlServerSqlTranslatingExpressionVisitorFactory(`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public virtual RelationalSqlTranslatingExpressionVisitor Create(`
`21`		`- IModel model,`
	`21`	`+ QueryCompilationContext queryCompilationContext,`
`22`	`22`	`QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)`
`23`	`23`	`=> new SqlServerSqlTranslatingExpressionVisitor(`
`24`	`24`	`_dependencies,`
`25`		`- model,`
	`25`	`+ queryCompilationContext,`
`26`	`26`	`queryableMethodTranslatingExpressionVisitor);`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public class SqliteQueryableMethodTranslatingExpressionVisitor : RelationalQuery`
`19`	`19`	`public SqliteQueryableMethodTranslatingExpressionVisitor(`
`20`	`20`	`[NotNull] QueryableMethodTranslatingExpressionVisitorDependencies dependencies,`
`21`	`21`	`[NotNull] RelationalQueryableMethodTranslatingExpressionVisitorDependencies relationalDependencies,`
`22`		`- [NotNull] IModel model)`
`23`		`- : base(dependencies, relationalDependencies, model)`
	`22`	`+ [NotNull] QueryCompilationContext queryCompilationContext)`
	`23`	`+ : base(dependencies, relationalDependencies, queryCompilationContext)`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ public SqliteQueryableMethodTranslatingExpressionVisitorFactory(`
`21`	`21`	`_relationalDependencies = relationalDependencies;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public virtual QueryableMethodTranslatingExpressionVisitor Create(IModel model)`
	`24`	`+ public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)`
`25`	`25`	`{`
`26`		`- Check.NotNull(model, nameof(model));`
	`26`	`+ Check.NotNull(queryCompilationContext, nameof(queryCompilationContext));`
`27`	`27`
`28`		`- return new SqliteQueryableMethodTranslatingExpressionVisitor(_dependencies, _relationalDependencies, model);`
	`28`	`+ return new SqliteQueryableMethodTranslatingExpressionVisitor(_dependencies, _relationalDependencies, queryCompilationContext);`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ private static readonly IReadOnlyDictionary<ExpressionType, IReadOnlyCollection<`
`80`	`80`
`81`	`81`	`public SqliteSqlTranslatingExpressionVisitor(`
`82`	`82`	`[NotNull] RelationalSqlTranslatingExpressionVisitorDependencies dependencies,`
`83`		`- [NotNull] IModel model,`
	`83`	`+ [NotNull] QueryCompilationContext queryCompilationContext,`
`84`	`84`	`[NotNull] QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)`
`85`		`- : base(dependencies, model, queryableMethodTranslatingExpressionVisitor)`
	`85`	`+ : base(dependencies, queryCompilationContext, queryableMethodTranslatingExpressionVisitor)`
`86`	`86`	`{`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ public SqliteSqlTranslatingExpressionVisitorFactory(`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public virtual RelationalSqlTranslatingExpressionVisitor Create(`
`21`		`- IModel model,`
	`21`	`+ QueryCompilationContext queryCompilationContext,`
`22`	`22`	`QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)`
`23`	`23`	`=> new SqliteSqlTranslatingExpressionVisitor(`
`24`	`24`	`_dependencies,`
`25`		`- model,`
	`25`	`+ queryCompilationContext,`
`26`	`26`	`queryableMethodTranslatingExpressionVisitor);`
`27`	`27`	`}`
`28`	`28`	`}`