Fixed: Projection when using offset paging (#2476)

ChilliCream · Oct 25, 2020 · 4ac43f5 · 4ac43f5
1 parent 0de8364
commit 4ac43f5
Show file tree

Hide file tree

Showing 18 changed files with 294 additions and 1 deletion.
diff --git a/src/HotChocolate/Data/src/Data/Projections/ProjectionVisitor.cs b/src/HotChocolate/Data/src/Data/Projections/ProjectionVisitor.cs
@@ -134,7 +134,8 @@ protected override ISelectionVisitorAction Visit(IOutputField field, TContext co
 
                 foreach (var selection in selections)
                 {
-                    if (selection.Field.Name.Value is "nodes" &&
+                    if ((selection.Field.Name.Value is "nodes" ||
+                        selection.Field.Name.Value is "items") &&
                         selection.SyntaxNode.SelectionSet is not null)
                     {
                         context.SelectionSetNodes.Push(

diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/ProjectionVisitorTestBase.cs b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/ProjectionVisitorTestBase.cs
@@ -50,6 +50,7 @@ public class ProjectionVisitorTestBase
             ProjectionProvider? provider = null,
             Action<ModelBuilder>? onModelCreating = null,
             bool usePaging = false,
+            bool useOffsetPaging = false,
             ObjectType<TEntity>? objectType = null)
             where TEntity : class
         {
@@ -86,6 +87,11 @@ public class ProjectionVisitorTestBase
                                 descriptor.UsePaging<ObjectType<TEntity>>();
                             }
 
+                            if (useOffsetPaging)
+                            {
+                                descriptor.UseOffsetPaging<ObjectType<TEntity>>();
+                            }
+
                             descriptor
                                 .Use(
                                     next => async context =>

diff --git a/...e/Data/test/Data.Projections.SqlServer.Tests/QueryableProjectionVisitorPagingTests.css.cs b/...e/Data/test/Data.Projections.SqlServer.Tests/QueryableProjectionVisitorPagingTests.css.cs
@@ -276,6 +276,133 @@ public async Task Create_Projection_Should_Stop_When_UsePagingEncountered()
             res1.MatchSqlSnapshot();
         }
 
+        [Fact]
+        public async Task CreateOffsetPaging_ProjectsTwoProperties_Items_WithArgs()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema(
+                _fooEntities,
+                useOffsetPaging: true);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root(take:10, skip:1){ items { bar baz } }}")
+                    .Create());
+
+            res1.MatchSqlSnapshot();
+        }
+
+        [Fact]
+        public async Task CreateOffsetPaging_ProjectsTwoProperties_Items()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema(
+                _fooEntities,
+                useOffsetPaging: true);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root{ items { bar baz } }}")
+                    .Create());
+
+            res1.MatchSqlSnapshot();
+        }
+
+        [Fact]
+        public async Task CreateOffsetPaging_ProjectsOneProperty_Items()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema(
+                _fooEntities,
+                useOffsetPaging: true);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root{ items { baz } }}")
+                    .Create());
+
+            res1.MatchSqlSnapshot();
+        }
+
+
+        [Fact]
+        public async Task CreateOffsetPagingNullable_ProjectsTwoProperties_Items()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema(
+                _fooNullableEntities,
+                useOffsetPaging: true);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root{ items { bar baz } }}")
+                    .Create());
+
+            res1.MatchSqlSnapshot();
+        }
+
+        [Fact]
+        public async Task CreateOffsetPagingNullable_ProjectsOneProperty_Items()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema(
+                _fooNullableEntities,
+                useOffsetPaging: true);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root{ items { baz } }}")
+                    .Create());
+
+            res1.MatchSqlSnapshot();
+        }
+
+        [Fact]
+        public async Task CreateOffsetPaging_Projection_Should_Stop_When_UseProjectionEncountered()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema(
+                _fooEntities,
+                useOffsetPaging: true);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root{ items{ bar list { barBaz } } }}")
+                    .Create());
+
+            res1.MatchSqlSnapshot();
+        }
+
+        [Fact]
+        public async Task CreateOffsetPaging_Projection_Should_Stop_When_UsePagingEncountered()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema(
+                _fooEntities,
+                useOffsetPaging: true);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root{ items{ bar paging { nodes {barBaz }} } }}")
+                    .Create());
+
+            res1.MatchSqlSnapshot();
+        }
+
         public class Foo
         {
             public int Id { get; set; }

diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/SchemaCache.cs b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/SchemaCache.cs
@@ -17,6 +17,7 @@ public class SchemaCache
             T[] entities,
             Action<ModelBuilder>? onModelCreating = null,
             bool usePaging = false,
+            bool useOffsetPaging = false,
             ObjectType<T>? objectType = null)
             where T : class
         {
@@ -26,6 +27,7 @@ public class SchemaCache
                 k => base.CreateSchema(
                     entities,
                     usePaging: usePaging,
+                    useOffsetPaging: useOffsetPaging,
                     onModelCreating: onModelCreating,
                     objectType: objectType));
         }

diff --git a/...bleProjectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsOneProperty_Items.snap b/...bleProjectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsOneProperty_Items.snap
@@ -0,0 +1,17 @@
+{
+  "data": {
+    "root": {
+      "items": [
+        {
+          "baz": "a"
+        },
+        {
+          "baz": null
+        },
+        {
+          "baz": "c"
+        }
+      ]
+    }
+  }
+}
diff --git a/...ojectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsOneProperty_Items__sql.snap b/...ojectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsOneProperty_Items__sql.snap
@@ -0,0 +1,2 @@
+SELECT "d"."Baz"
+FROM "Data" AS "d"
diff --git a/...eProjectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsTwoProperties_Items.snap b/...eProjectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsTwoProperties_Items.snap
@@ -0,0 +1,20 @@
+{
+  "data": {
+    "root": {
+      "items": [
+        {
+          "bar": true,
+          "baz": "a"
+        },
+        {
+          "bar": null,
+          "baz": null
+        },
+        {
+          "bar": false,
+          "baz": "c"
+        }
+      ]
+    }
+  }
+}
diff --git a/...ectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsTwoProperties_Items__sql.snap b/...ectionVisitorPagingTests.CreateOffsetPagingNullable_ProjectsTwoProperties_Items__sql.snap
@@ -0,0 +1,2 @@
+SELECT "d"."Bar", "d"."Baz"
+FROM "Data" AS "d"
diff --git a/...sitorPagingTests.CreateOffsetPaging_Projection_Should_Stop_When_UsePagingEncountered.snap b/...sitorPagingTests.CreateOffsetPaging_Projection_Should_Stop_When_UsePagingEncountered.snap
@@ -0,0 +1,34 @@
+{
+  "data": {
+    "root": {
+      "items": [
+        {
+          "bar": true,
+          "paging": {
+            "nodes": [
+              {
+                "barBaz": "a_a"
+              },
+              {
+                "barBaz": "a_b"
+              }
+            ]
+          }
+        },
+        {
+          "bar": false,
+          "paging": {
+            "nodes": [
+              {
+                "barBaz": "a_a"
+              },
+              {
+                "barBaz": "a_b"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/...PagingTests.CreateOffsetPaging_Projection_Should_Stop_When_UsePagingEncountered__sql.snap b/...PagingTests.CreateOffsetPaging_Projection_Should_Stop_When_UsePagingEncountered__sql.snap
@@ -0,0 +1,2 @@
+SELECT "d"."Bar"
+FROM "Data" AS "d"
diff --git a/...rPagingTests.CreateOffsetPaging_Projection_Should_Stop_When_UseProjectionEncountered.snap b/...rPagingTests.CreateOffsetPaging_Projection_Should_Stop_When_UseProjectionEncountered.snap
@@ -0,0 +1,30 @@
+{
+  "data": {
+    "root": {
+      "items": [
+        {
+          "bar": true,
+          "list": [
+            {
+              "barBaz": "a_a"
+            },
+            {
+              "barBaz": "a_b"
+            }
+          ]
+        },
+        {
+          "bar": false,
+          "list": [
+            {
+              "barBaz": "a_a"
+            },
+            {
+              "barBaz": "a_b"
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/...ngTests.CreateOffsetPaging_Projection_Should_Stop_When_UseProjectionEncountered__sql.snap b/...ngTests.CreateOffsetPaging_Projection_Should_Stop_When_UseProjectionEncountered__sql.snap
@@ -0,0 +1,2 @@
+SELECT "d"."Bar"
+FROM "Data" AS "d"
diff --git a/..._/QueryableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsOneProperty_Items.snap b/..._/QueryableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsOneProperty_Items.snap
@@ -0,0 +1,14 @@
+{
+  "data": {
+    "root": {
+      "items": [
+        {
+          "baz": "a"
+        },
+        {
+          "baz": "b"
+        }
+      ]
+    }
+  }
+}
diff --git a/...ryableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsOneProperty_Items__sql.snap b/...ryableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsOneProperty_Items__sql.snap
@@ -0,0 +1,2 @@
+SELECT "d"."Baz"
+FROM "Data" AS "d"
diff --git a/...QueryableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items.snap b/...QueryableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items.snap
@@ -0,0 +1,16 @@
+{
+  "data": {
+    "root": {
+      "items": [
+        {
+          "bar": true,
+          "baz": "a"
+        },
+        {
+          "bar": false,
+          "baz": "b"
+        }
+      ]
+    }
+  }
+}
diff --git a/...ProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items_WithArgs.snap b/...ProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items_WithArgs.snap
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "root": {
+      "items": [
+        {
+          "bar": false,
+          "baz": "b"
+        }
+      ]
+    }
+  }
+}
diff --git a/...ctionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items_WithArgs__sql.snap b/...ctionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items_WithArgs__sql.snap
@@ -0,0 +1,2 @@
+SELECT "d"."Bar", "d"."Baz"
+FROM "Data" AS "d"
diff --git a/...ableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items__sql.snap b/...ableProjectionVisitorPagingTests.CreateOffsetPaging_ProjectsTwoProperties_Items__sql.snap
@@ -0,0 +1,2 @@
+SELECT "d"."Bar", "d"."Baz"
+FROM "Data" AS "d"