Fix projection of fragment spreads in connection node fields (items/edges/node)

Author: gbiellem

src/GraphQL.EntityFramework/IncludeAppender.cs

@@ -441,7 +441,7 @@ void ProcessConnectionNodeFields(
             return;
         }
 
-        foreach (var selection in selectionSet.Selections.OfType<GraphQLField>())
+        foreach (var selection in EnumerateFields(selectionSet, context))
         {
             var fieldName = selection.Name.StringValue;
             if (IsConnectionNodeName(fieldName))

src/Tests/IntegrationTests/IntegrationTests.Connection_edges_node_with_fragment_spread.verified.txt

@@ -0,0 +1,42 @@
+{
+  target: {
+    Data: {
+      parentEntitiesConnection: {
+        totalCount: 8,
+        edges: [
+          {
+            cursor: 1,
+            node: {
+              property: Value1
+            }
+          },
+          {
+            cursor: 2,
+            node: {
+              property: Value2
+            }
+          }
+        ]
+      }
+    }
+  },
+  sql: [
+    {
+      Text:
+select COUNT(*)
+from   ParentEntities as p
+    },
+    {
+      Text:
+select   p.Id,
+         p.Property
+from     ParentEntities as p
+order by p.Property
+offset @p rows fetch next @p1 rows only,
+      Parameters: {
+        @p: 1,
+        @p1: 2
+      }
+    }
+  ]
+}

src/Tests/IntegrationTests/IntegrationTests.Connection_items_with_fragment_spread.verified.txt

@@ -0,0 +1,36 @@
+{
+  target: {
+    Data: {
+      parentEntitiesConnection: {
+        totalCount: 8,
+        items: [
+          {
+            property: Value1
+          },
+          {
+            property: Value2
+          }
+        ]
+      }
+    }
+  },
+  sql: [
+    {
+      Text:
+select COUNT(*)
+from   ParentEntities as p
+    },
+    {
+      Text:
+select   p.Id,
+         p.Property
+from     ParentEntities as p
+order by p.Property
+offset @p rows fetch next @p1 rows only,
+      Parameters: {
+        @p: 1,
+        @p1: 2
+      }
+    }
+  ]
+}

src/Tests/IntegrationTests/IntegrationTests.Connection_items_with_fragment_spread_and_children.verified.txt

@@ -0,0 +1,49 @@
+{
+  target: {
+    Data: {
+      parentEntitiesConnection: {
+        totalCount: 2,
+        items: [
+          {
+            property: Value4,
+            children: [
+              {
+                property: Value5
+              }
+            ]
+          }
+        ]
+      }
+    }
+  },
+  sql: [
+    {
+      Text:
+select COUNT(*)
+from   ParentEntities as p
+    },
+    {
+      Text:
+select   p0.Id,
+         p0.Property,
+         c.Id,
+         c.ParentId,
+         c.Property
+from     (select   p.Id,
+                   p.Property
+          from     ParentEntities as p
+          order by p.Property
+          offset @p rows fetch next @p1 rows only) as p0
+         left outer join
+         ChildEntities as c
+         on p0.Id = c.ParentId
+order by p0.Property,
+         p0.Id,
+         c.Id,
+      Parameters: {
+        @p: 1,
+        @p1: 2
+      }
+    }
+  ]
+}

src/Tests/IntegrationTests/IntegrationTests.Connection_items_with_inline_fields.verified.txt

@@ -0,0 +1,36 @@
+{
+  target: {
+    Data: {
+      parentEntitiesConnection: {
+        totalCount: 8,
+        items: [
+          {
+            property: Value1
+          },
+          {
+            property: Value2
+          }
+        ]
+      }
+    }
+  },
+  sql: [
+    {
+      Text:
+select COUNT(*)
+from   ParentEntities as p
+    },
+    {
+      Text:
+select   p.Id,
+         p.Property
+from     ParentEntities as p
+order by p.Property
+offset @p rows fetch next @p1 rows only,
+      Parameters: {
+        @p: 1,
+        @p1: 2
+      }
+    }
+  ]
+}

src/Tests/IntegrationTests/IntegrationTests.Connection_items_with_inline_fragment.verified.txt

@@ -0,0 +1,36 @@
+{
+  target: {
+    Data: {
+      parentEntitiesConnection: {
+        totalCount: 8,
+        items: [
+          {
+            property: Value1
+          },
+          {
+            property: Value2
+          }
+        ]
+      }
+    }
+  },
+  sql: [
+    {
+      Text:
+select COUNT(*)
+from   ParentEntities as p
+    },
+    {
+      Text:
+select   p.Id,
+         p.Property
+from     ParentEntities as p
+order by p.Property
+offset @p rows fetch next @p1 rows only,
+      Parameters: {
+        @p: 1,
+        @p1: 2
+      }
+    }
+  ]
+}

src/Tests/IntegrationTests/IntegrationTests_connection_fragment_projection.cs

@@ -0,0 +1,144 @@
+public partial class IntegrationTests
+{
+    [Fact]
+    public async Task Connection_items_with_inline_fields()
+    {
+        var query =
+            """
+            {
+              parentEntitiesConnection(first:2, after: "0") {
+                totalCount
+                items {
+                  property
+                }
+              }
+            }
+            """;
+        var entities = BuildEntities(8);
+
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, entities.ToArray());
+    }
+
+    [Fact]
+    public async Task Connection_items_with_fragment_spread()
+    {
+        var query =
+            """
+            {
+              parentEntitiesConnection(first:2, after: "0") {
+                totalCount
+                items {
+                  ...parentFields
+                }
+              }
+            }
+
+            fragment parentFields on Parent {
+              property
+            }
+            """;
+        var entities = BuildEntities(8);
+
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, entities.ToArray());
+    }
+
+    [Fact]
+    public async Task Connection_edges_node_with_fragment_spread()
+    {
+        var query =
+            """
+            {
+              parentEntitiesConnection(first:2, after: "0") {
+                totalCount
+                edges {
+                  cursor
+                  node {
+                    ...parentFields
+                  }
+                }
+              }
+            }
+
+            fragment parentFields on Parent {
+              property
+            }
+            """;
+        var entities = BuildEntities(8);
+
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, entities.ToArray());
+    }
+
+    [Fact]
+    public async Task Connection_items_with_inline_fragment()
+    {
+        var query =
+            """
+            {
+              parentEntitiesConnection(first:2, after: "0") {
+                totalCount
+                items {
+                  ... on Parent {
+                    property
+                  }
+                }
+              }
+            }
+            """;
+        var entities = BuildEntities(8);
+
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, entities.ToArray());
+    }
+
+    [Fact]
+    public async Task Connection_items_with_fragment_spread_and_children()
+    {
+        var query =
+            """
+            {
+              parentEntitiesConnection(first:2, after: "0") {
+                totalCount
+                items {
+                  ...parentWithChildren
+                }
+              }
+            }
+
+            fragment parentWithChildren on Parent {
+              property
+              children {
+                property
+              }
+            }
+            """;
+        var entity1 = new ParentEntity
+        {
+            Property = "Value1"
+        };
+        var entity2 = new ChildEntity
+        {
+            Property = "Value2"
+        };
+        var entity3 = new ChildEntity
+        {
+            Property = "Value3"
+        };
+        entity1.Children.Add(entity2);
+        entity1.Children.Add(entity3);
+        var entity4 = new ParentEntity
+        {
+            Property = "Value4"
+        };
+        var entity5 = new ChildEntity
+        {
+            Property = "Value5"
+        };
+        entity4.Children.Add(entity5);
+
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, [entity1, entity2, entity3, entity4, entity5]);
+    }
+}