Remove IEntityQueryProvider

It adds nothing to the contract of IAsyncQueryProvider, so use this instead.

Author: ajcvickers

src/EntityFramework.Core/EntityFramework.Core.csproj

@@ -280,7 +280,6 @@
     <Compile Include="Query\IQueryCompilationContextFactory.cs" />
     <Compile Include="Query\ExpressionVisitors\NavigationRewritingExpressionVisitor.cs" />
     <Compile Include="Query\Internal\ExpressionPrinter.cs" />
-    <Compile Include="Query\IEntityQueryProvider.cs" />
     <Compile Include="Query\IIncludableQueryable.cs" />
     <Compile Include="Query\Internal\IExpressionPrinter.cs" />
     <Compile Include="Query\IQueryOptimizer.cs" />

src/EntityFramework.Core/EntityFrameworkServiceCollectionExtensions.cs

@@ -124,7 +124,7 @@ private static IServiceCollection AddQuery(this IServiceCollection serviceCollec
             return serviceCollection
                 .AddSingleton<IMemoryCache, MemoryCache>()
                 .AddSingleton<ICompiledQueryCache, CompiledQueryCache>()
-                .AddScoped<IEntityQueryProvider, EntityQueryProvider>()
+                .AddScoped<IAsyncQueryProvider, EntityQueryProvider>()
                 .AddScoped<IQueryCompiler, QueryCompiler>()
                 .AddScoped<IQueryAnnotationExtractor, QueryAnnotationExtractor>()
                 .AddScoped<IQueryOptimizer, QueryOptimizer>()

src/EntityFramework.Core/Internal/InternalDbSet.cs

@@ -31,7 +31,7 @@ public InternalDbSet([NotNull] DbContext context)
             // set is used and services will be obtained from the correctly scoped container when this happens.
             _entityQueryable
                 = new LazyRef<EntityQueryable<TEntity>>(
-                    () => new EntityQueryable<TEntity>(_context.GetService<IEntityQueryProvider>()));
+                    () => new EntityQueryable<TEntity>(_context.GetService<IAsyncQueryProvider>()));
         }
 
         public InternalDbSet([NotNull] IQueryable<TEntity> source, [NotNull] DbSet<TEntity> dbSet)

src/EntityFramework.Core/Query/EntityQueryable`.cs

@@ -12,12 +12,12 @@ namespace Microsoft.Data.Entity.Query
     public class EntityQueryable<TResult>
         : QueryableBase<TResult>, IAsyncEnumerable<TResult>
     {
-        public EntityQueryable([NotNull] IEntityQueryProvider provider)
+        public EntityQueryable([NotNull] IAsyncQueryProvider provider)
             : base(Check.NotNull(provider, nameof(provider)))
         {
         }
 
-        public EntityQueryable([NotNull] IEntityQueryProvider provider, [NotNull] Expression expression)
+        public EntityQueryable([NotNull] IAsyncQueryProvider provider, [NotNull] Expression expression)
             : base(
                 Check.NotNull(provider, nameof(provider)),
                 Check.NotNull(expression, nameof(expression)))

src/EntityFramework.Core/Query/ExpressionVisitors/NavigationRewritingExpressionVisitor.cs

@@ -69,7 +69,7 @@ private void Remove(NavigationJoin navigationJoin)
                 => RemoveNavigationJoin(NavigationJoins, navigationJoin);
         }
 
-        private IEntityQueryProvider _entityQueryProvider;
+        private IAsyncQueryProvider _entityQueryProvider;
 
         public NavigationRewritingExpressionVisitor([NotNull] EntityQueryModelVisitor queryModelVisitor)
         {
@@ -79,7 +79,7 @@ public NavigationRewritingExpressionVisitor([NotNull] EntityQueryModelVisitor qu
         }
 
         private NavigationRewritingExpressionVisitor(
-            EntityQueryModelVisitor queryModelVisitor, IEntityQueryProvider entityQueryProvider)
+            EntityQueryModelVisitor queryModelVisitor, IAsyncQueryProvider entityQueryProvider)
             : this(queryModelVisitor)
         {
             _entityQueryProvider = entityQueryProvider;
@@ -128,7 +128,7 @@ protected override Expression VisitConstant(ConstantExpression constantExpressio
             if (_entityQueryProvider == null)
             {
                 _entityQueryProvider
-                    = (constantExpression.Value as IQueryable)?.Provider as IEntityQueryProvider;
+                    = (constantExpression.Value as IQueryable)?.Provider as IAsyncQueryProvider;
             }
 
             return constantExpression;
@@ -398,7 +398,7 @@ private static readonly MethodInfo _createEntityQueryableMethod
                 .GetTypeInfo().GetDeclaredMethod(nameof(_CreateEntityQueryable));
 
         [UsedImplicitly]
-        private static EntityQueryable<TResult> _CreateEntityQueryable<TResult>(IEntityQueryProvider entityQueryProvider)
+        private static EntityQueryable<TResult> _CreateEntityQueryable<TResult>(IAsyncQueryProvider entityQueryProvider)
             => new EntityQueryable<TResult>(entityQueryProvider);
     }
 }

src/EntityFramework.Core/Query/IEntityQueryProvider.cs

@@ -12,7 +12,7 @@
 
 namespace Microsoft.Data.Entity.Query.Internal
 {
-    public class EntityQueryProvider : IEntityQueryProvider
+    public class EntityQueryProvider : IAsyncQueryProvider
     {
         private static readonly MethodInfo _genericCreateQueryMethod
             = typeof(EntityQueryProvider).GetRuntimeMethods()

src/EntityFramework.Core/Query/Internal/EntityQueryProvider.cs

@@ -93,7 +93,7 @@ public virtual void Services_wire_up_correctly()
             VerifySingleton<IMemoryCache>();
             VerifySingleton<ICompiledQueryCache>();
 
-            VerifyScoped<IEntityQueryProvider>();
+            VerifyScoped<IAsyncQueryProvider>();
             VerifyScoped<IQueryContextFactory>();
             VerifyScoped<IQueryCompiler>();
             VerifyScoped<IQueryCompilationContextFactory>();