Merge pull request #157 from octokit/query-builder-error

Fixing another query builder aliasing error

Author: grokys

Octokit.GraphQL.Core.UnitTests/QueryBuilderTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Octokit.GraphQL.Core.Builders;
 using Octokit.GraphQL.Core.UnitTests.Models;
 using Xunit;
@@ -668,9 +669,9 @@ public void Repository_Select_Object()
         {
             var expected = @"query {
   repository(owner: ""foo"", name: ""bar"") {
-    forkCount
-    name
-    description
+    intField1: forkCount
+    stringField1: name
+    stringField2: description
   }
 }";
 
@@ -724,9 +725,9 @@ public void Repository_Select_Object_Fragment()
   }
 }
 fragment repositoryName on Repository {
-  forkCount
-  name
-  description
+  intField1: forkCount
+  stringField1: name
+  stringField2: description
 }";
 
             var fragment = new Fragment<Repository, TestModelObject>("repositoryName", repository => new TestModelObject
@@ -786,9 +787,9 @@ public void Repository_Select_Use_Object_Fragment_Twice()
   }
 }
 fragment repositoryName on Repository {
-  forkCount
-  name
-  description
+  intField1: forkCount
+  stringField1: name
+  stringField2: description
 }";
 
             var repositoryName = new Fragment<Repository, TestModelObject>("repositoryName", repository => new TestModelObject
@@ -877,12 +878,92 @@ fragment issueTitle on Issue {
             Assert.Equal(expected, query.ToString(2), ignoreLineEndingDifferences: true);
         }
 
+        [Fact]
+        public void Issue_Select_Two_In_Anon_Object()
+        {
+            var expected = @"query {
+  repository(owner: ""foo"", name: ""bar"") {
+    someData: issues(labels: [""asdf""]) {
+      nodes {
+        title
+      }
+    }
+    someData2: issues(labels: [""asdf""]) {
+      nodes {
+        title
+      }
+    }
+  }
+}";
+
+            Arg<IEnumerable<string>>? labels = new[] { "asdf" };
+
+            var expression = new Query().Repository("foo", "bar").Select(repository => new
+            {
+                SomeData = repository.Issues(null, null, null, null, labels)
+                    .Nodes
+                    .Select(issue => new { issue.Title })
+                    .ToList(),
+                SomeData2 = repository.Issues(null, null, null, null, labels)
+                    .Nodes
+                    .Select(issue => new { issue.Title })
+                    .ToList(),
+            });
+
+            var query = expression.Compile();
+
+            Assert.Equal(expected, query.ToString(2), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Issue_Select_Two_In_Object()
+        {
+            var expected = @"query {
+  repository(owner: ""foo"", name: ""bar"") {
+    someData: issues(labels: [""asdf""]) {
+      nodes {
+        title
+      }
+    }
+    someData2: issues(labels: [""asdf""]) {
+      nodes {
+        title
+      }
+    }
+  }
+}";
+
+            Arg<IEnumerable<string>>? labels = new[] { "asdf" };
+
+            var expression = new Query().Repository("foo", "bar").Select(repository => new TestIssueSets
+            {
+                SomeData = repository.Issues(null, null, null, null, labels)
+                    .Nodes
+                    .Select(issue => new { issue.Title })
+                    .ToList(),
+                SomeData2 = repository.Issues(null, null, null, null, labels)
+                    .Nodes
+                    .Select(issue => new { issue.Title })
+                    .ToList(),
+            });
+
+            var query = expression.Compile();
+
+            Assert.Equal(expected, query.ToString(2), ignoreLineEndingDifferences: true);
+        }
+
         class TestModelObject
         {
             public string StringField1;
             public string StringField2;
             public int IntField1;
             public int IntField2;
         }
+
+        public class TestIssueSets
+        {
+            public IReadOnlyList<object> SomeData { get; set; }
+            public IReadOnlyList<object> SomeData2 { get; set; }
+        }
     }
 }

Octokit.GraphQL.Core.UnitTests/ResponseDeserializerTests.cs

@@ -170,8 +170,8 @@ public void Repository_Issue_Select_Multiple_Members_To_Named_Class()
     ""data"":{
         ""repository"": {
             ""issue"":{
-              ""title"": ""Hello World!"",
-              ""body"": ""Goodbye cruel world""
+              ""name"": ""Hello World!"",
+              ""description"": ""Goodbye cruel world""
             }
         }
     }

Octokit.GraphQL.Core/Core/Builders/QueryBuilder.cs

@@ -255,7 +255,8 @@ protected override Expression VisitMember(MemberExpression node)
 
         protected override MemberAssignment VisitMemberAssignment(MemberAssignment node)
         {
-            var expression = BookmarkAndVisit(node.Expression).AddCast(node.Expression.Type);
+            var nodeExpression = AliasedExpression.WrapIfNeeded(node.Expression, node.Member);
+            var expression = BookmarkAndVisit(nodeExpression).AddCast(node.Expression.Type);
             return Expression.Bind(node.Member, expression);
         }