Query: Remove extension methods on IAsyncEnumerable

Remove test for #15950 Remove ToLookup API for #15916 Resolves #15924
dotnet · Jun 6, 2019 · e9fb676 · e9fb676
1 parent 9e0fb47
commit e9fb676
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 659 deletions.
diff --git a/src/EFCore/EntityFrameworkEnumerableExtensions.cs b/src/EFCore/EntityFrameworkEnumerableExtensions.cs
diff --git a/src/EFCore/EntityFrameworkQueryableExtensions.cs b/src/EFCore/EntityFrameworkQueryableExtensions.cs
diff --git a/src/EFCore/Query/Internal/QueryCompiler.cs b/src/EFCore/Query/Internal/QueryCompiler.cs
@@ -105,7 +105,7 @@ public virtual Func<QueryContext, TResult> CompileQueryCore<TResult>(
             IModel model,
             bool async)
         {
-            return database.CompileQuery2<TResult>(query, async);
+            return database.CompileQuery<TResult>(query, async);
         }
 
         /// <summary>

diff --git a/src/EFCore/Storage/Database.cs b/src/EFCore/Storage/Database.cs
@@ -67,7 +67,7 @@ public abstract Task<int> SaveChangesAsync(
             IList<IUpdateEntry> entries,
             CancellationToken cancellationToken = default);
 
-        public virtual Func<QueryContext, TResult> CompileQuery2<TResult>(Expression query, bool async)
+        public virtual Func<QueryContext, TResult> CompileQuery<TResult>(Expression query, bool async)
         {
             return Dependencies.QueryCompilationContextFactory
                 .Create(async)

diff --git a/src/EFCore/Storage/IDatabase.cs b/src/EFCore/Storage/IDatabase.cs
@@ -50,6 +50,6 @@ Task<int> SaveChangesAsync(
             [NotNull] IList<IUpdateEntry> entries,
             CancellationToken cancellationToken = default);
 
-        Func<QueryContext, TResult> CompileQuery2<TResult>([NotNull] Expression query, bool async);
+        Func<QueryContext, TResult> CompileQuery<TResult>([NotNull] Expression query, bool async);
     }
 }
diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs
@@ -698,11 +698,6 @@ await AssertQuery<Gear>(
             await AssertQuery<Gear>(
                 isAsync,
                 gs => gs.Where(g => ((short)g.Rank & (short)1) == 1));
-
-            // Issue#15950
-            //await AssertQuery<Gear>(
-            //    isAsync,
-            //    gs => gs.Where(g => ((char)g.Rank & '\x0001') == '\x0001'));
         }
 
         [ConditionalTheory]

diff --git a/test/EFCore.Specification.Tests/TestUtilities/QueryableExtensions.cs b/test/EFCore.Specification.Tests/TestUtilities/QueryableExtensions.cs
@@ -18,5 +18,16 @@ public static Task<List<TSource>> ToListAsync<TSource>(this IQueryable source, C
         {
             return ((IQueryable<TSource>)source).ToListAsync(cancellationToken);
         }
+
+        public static async Task<List<TSource>> ToListAsync<TSource>(this IAsyncEnumerable<TSource> source, CancellationToken cancellationToken = default)
+        {
+            var list = new List<TSource>();
+            await foreach (var element in source.WithCancellation(cancellationToken))
+            {
+                list.Add(element);
+            }
+
+            return list;
+        }
     }
 }
diff --git a/test/EFCore.Tests/Extensions/QueryableExtensionsTest.cs b/test/EFCore.Tests/Extensions/QueryableExtensionsTest.cs
@@ -305,13 +305,6 @@ public async Task Extension_methods_throw_on_non_async_source()
             await SourceNonAsyncEnumerableTest<int>(() => Source().ToDictionaryAsync(e => e, e => e, ReferenceEqualityComparer.Instance));
             await SourceNonAsyncEnumerableTest<int>(
                 () => Source().ToDictionaryAsync(e => e, e => e, ReferenceEqualityComparer.Instance, new CancellationToken()));
-            await SourceNonAsyncEnumerableTest<int>(() => Source().ToLookupAsync(e => e));
-            await SourceNonAsyncEnumerableTest<int>(() => Source().ToLookupAsync(e => e, e => e));
-            await SourceNonAsyncEnumerableTest<int>(() => Source().ToLookupAsync(e => e, ReferenceEqualityComparer.Instance));
-            await SourceNonAsyncEnumerableTest<int>(() => Source().ToLookupAsync(e => e, ReferenceEqualityComparer.Instance));
-            await SourceNonAsyncEnumerableTest<int>(() => Source().ToLookupAsync(e => e, e => e, ReferenceEqualityComparer.Instance));
-            await SourceNonAsyncEnumerableTest<int>(
-                () => Source().ToLookupAsync(e => e, e => e, ReferenceEqualityComparer.Instance, new CancellationToken()));
             await SourceNonAsyncEnumerableTest<int>(() => Source().ToListAsync());
 
             Assert.Equal(