Apply limit to IQueryable in FirstOrDefault/SingleOrDefaultMiddleware

ChilliCream · Jan 17, 2024 · 5626eda · 5626eda
1 parent ea4430b
commit 5626eda
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 12 deletions.
diff --git a/src/HotChocolate/Data/src/Data/Projections/FirstOrDefaultMiddleware~1.cs b/src/HotChocolate/Data/src/Data/Projections/FirstOrDefaultMiddleware~1.cs
@@ -29,6 +29,14 @@ public async Task InvokeAsync(IMiddlewareContext context)
         {
             case IAsyncEnumerable<T> ae:
                 {
+                    // Apply limit.
+                    if (ae is IQueryable<T> q)
+                    {
+                        q = q.Take(1);
+
+                        ae = (IAsyncEnumerable<T>)q;
+                    }
+
                     await using var enumerator =
                         ae.GetAsyncEnumerator(context.RequestAborted);
 

diff --git a/src/HotChocolate/Data/src/Data/Projections/SingleOrDefaultMiddleware~1.cs b/src/HotChocolate/Data/src/Data/Projections/SingleOrDefaultMiddleware~1.cs
@@ -27,6 +27,14 @@ public async Task InvokeAsync(IMiddlewareContext context)
         {
             case IAsyncEnumerable<T> ae:
                 {
+                    // Apply limit.
+                    if (ae is IQueryable<T> q)
+                    {
+                        q = q.Take(2);
+
+                        ae = (IAsyncEnumerable<T>)q;
+                    }
+
                     await using var enumerator =
                         ae.GetAsyncEnumerator(context.RequestAborted);
 

diff --git a/src/HotChocolate/Data/test/Data.EntityFramework.Tests/IntegrationTests.cs b/src/HotChocolate/Data/test/Data.EntityFramework.Tests/IntegrationTests.cs
@@ -34,7 +34,7 @@ public async Task ExecuteAsync_Should_ReturnAllItems_When_ToListAsync()
                 x => x
                     .Name("Query")
                     .Field("executable")
-                    .Resolve(_authors.AsExecutable()))
+                    .Resolve(_authors))
             .BuildRequestExecutorAsync();
 
         // act
@@ -65,7 +65,7 @@ public async Task ExecuteAsync_Should_OnlyOneItem_When_SingleOrDefault()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.Take(1).AsExecutable())
+                    .Resolve(_authors.Take(1))
                     .UseSingleOrDefault())
             .BuildRequestExecutorAsync();
 
@@ -97,7 +97,7 @@ public async Task ExecuteAsync_Should_Fail_When_SingleOrDefaultMoreThanOne()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.AsExecutable())
+                    .Resolve(_authors)
                     .UseSingleOrDefault()
                     .UseProjection()
                     .UseFiltering()
@@ -132,7 +132,7 @@ public async Task ExecuteAsync_Should_ReturnNull_When_SingleOrDefaultZero()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.Take(0).AsExecutable())
+                    .Resolve(_authors.Take(0))
                     .UseSingleOrDefault()
                     .UseProjection()
                     .UseFiltering()
@@ -167,7 +167,7 @@ public async Task ExecuteAsync_Should_OnlyOneItem_When_FirstOrDefault()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.AsExecutable())
+                    .Resolve(_authors)
                     .UseFirstOrDefault())
             .BuildRequestExecutorAsync();
 
@@ -199,7 +199,7 @@ public async Task ExecuteAsync_Should_ReturnNull_When_FirstOrDefaultZero()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<ZeroAuthor>>()
-                    .Resolve(_zeroAuthors.Take(0).AsExecutable())
+                    .Resolve(_zeroAuthors.Take(0))
                     .UseFirstOrDefault()
                     .UseProjection()
                     .UseFiltering()

diff --git a/...napshots__/IntegrationTests.ExecuteAsync_Should_Fail_When_SingleOrDefaultMoreThanOne.snap b/...napshots__/IntegrationTests.ExecuteAsync_Should_Fail_When_SingleOrDefaultMoreThanOne.snap
@@ -2,6 +2,15 @@
   "errors": [
     {
       "message": "Sequence contains more than one element.",
+      "locations": [
+        {
+          "line": 3,
+          "column": 21
+        }
+      ],
+      "path": [
+        "executable"
+      ],
       "extensions": {
         "code": "HC0022"
       }

diff --git a/src/HotChocolate/Data/test/Data.Tests/IntegrationTests.cs b/src/HotChocolate/Data/test/Data.Tests/IntegrationTests.cs
@@ -31,7 +31,7 @@ public async Task ExecuteAsync_Should_ReturnAllItems_When_ToListAsync()
                 x => x
                     .Name("Query")
                     .Field("executable")
-                    .Resolve(_authors.AsExecutable())
+                    .Resolve(_authors)
                     .UseProjection()
                     .UseFiltering()
                     .UseSorting())
@@ -65,7 +65,7 @@ public async Task ExecuteAsync_Should_OnlyOneItem_When_SingleOrDefault()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.Take(1).AsExecutable())
+                    .Resolve(_authors.Take(1))
                     .UseSingleOrDefault()
                     .UseProjection()
                     .UseFiltering()
@@ -100,7 +100,7 @@ public async Task ExecuteAsync_Should_Fail_When_SingleOrDefaultMoreThanOne()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.AsExecutable())
+                    .Resolve(_authors)
                     .UseSingleOrDefault()
                     .UseProjection()
                     .UseFiltering()
@@ -135,7 +135,7 @@ public async Task ExecuteAsync_Should_Fail_When_SingleOrDefaultZero()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.Take(0).AsExecutable())
+                    .Resolve(_authors.Take(0))
                     .UseSingleOrDefault()
                     .UseProjection()
                     .UseFiltering()
@@ -170,7 +170,7 @@ public async Task ExecuteAsync_Should_OnlyOneItem_When_FirstOrDefault()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.AsExecutable())
+                    .Resolve(_authors)
                     .UseFirstOrDefault()
                     .UseProjection()
                     .UseFiltering()
@@ -205,7 +205,7 @@ public async Task ExecuteAsync_Should_OnlyOneItem_When_FirstOrDefaultZero()
                     .Name("Query")
                     .Field("executable")
                     .Type<ObjectType<Author>>()
-                    .Resolve(_authors.Take(0).AsExecutable())
+                    .Resolve(_authors.Take(0))
                     .UseFirstOrDefault()
                     .UseProjection()
                     .UseFiltering()

diff --git a/...napshots__/IntegrationTests.ExecuteAsync_Should_Fail_When_SingleOrDefaultMoreThanOne.snap b/...napshots__/IntegrationTests.ExecuteAsync_Should_Fail_When_SingleOrDefaultMoreThanOne.snap
@@ -2,6 +2,15 @@
   "errors": [
     {
       "message": "Sequence contains more than one element.",
+      "locations": [
+        {
+          "line": 2,
+          "column": 5
+        }
+      ],
+      "path": [
+        "executable"
+      ],
       "extensions": {
         "code": "HC0022"
       }