From 136ac7729f116e8e3740d511f76cee1d20f08e45 Mon Sep 17 00:00:00 2001
From: Ben Kraft <benkraft@khanacademy.org>
Date: Thu, 15 Apr 2021 11:36:46 -0700
Subject: [PATCH] include alias even if we don't need it

---
 example/generated.go                                      | 2 +-
 generate/testdata/queries/QueryWithAlias.graphql.go       | 4 ++--
 generate/testdata/queries/QueryWithDoubleAlias.graphql.go | 4 ++--
 generate/testdata/queries/UsesEnumTwice.graphql.go        | 4 ++--
 generate/types.go                                         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/example/generated.go b/example/generated.go
index 25a0ee2..03607e4 100644
--- a/example/generated.go
+++ b/example/generated.go
@@ -23,7 +23,7 @@ type getViewerResponse struct {
 }
 
 type getViewerViewerUser struct {
-	MyName    string
+	MyName    string    `json:"MyName"`
 	CreatedAt time.Time `json:"createdAt"`
 }
 
diff --git a/generate/testdata/queries/QueryWithAlias.graphql.go b/generate/testdata/queries/QueryWithAlias.graphql.go
index 013151d..28c0e69 100644
--- a/generate/testdata/queries/QueryWithAlias.graphql.go
+++ b/generate/testdata/queries/QueryWithAlias.graphql.go
@@ -8,11 +8,11 @@ import (
 )
 
 type QueryWithAliasResponse struct {
-	User QueryWithAliasUser
+	User QueryWithAliasUser `json:"User"`
 }
 
 type QueryWithAliasUser struct {
-	ID mypkg.ID
+	ID mypkg.ID `json:"ID"`
 }
 
 func QueryWithAlias(
diff --git a/generate/testdata/queries/QueryWithDoubleAlias.graphql.go b/generate/testdata/queries/QueryWithDoubleAlias.graphql.go
index b6dbb00..562dee8 100644
--- a/generate/testdata/queries/QueryWithDoubleAlias.graphql.go
+++ b/generate/testdata/queries/QueryWithDoubleAlias.graphql.go
@@ -12,8 +12,8 @@ type QueryWithDoubleAliasResponse struct {
 }
 
 type QueryWithDoubleAliasUser struct {
-	ID     mypkg.ID
-	AlsoID mypkg.ID
+	ID     mypkg.ID `json:"ID"`
+	AlsoID mypkg.ID `json:"AlsoID"`
 }
 
 func QueryWithDoubleAlias(
diff --git a/generate/testdata/queries/UsesEnumTwice.graphql.go b/generate/testdata/queries/UsesEnumTwice.graphql.go
index 5af0f10..7b3978c 100644
--- a/generate/testdata/queries/UsesEnumTwice.graphql.go
+++ b/generate/testdata/queries/UsesEnumTwice.graphql.go
@@ -22,8 +22,8 @@ type UsesEnumTwiceQueryOtherUser struct {
 }
 
 type UsesEnumTwiceQueryResponse struct {
-	Me        UsesEnumTwiceQueryMeUser
-	OtherUser UsesEnumTwiceQueryOtherUser
+	Me        UsesEnumTwiceQueryMeUser    `json:"Me"`
+	OtherUser UsesEnumTwiceQueryOtherUser `json:"OtherUser"`
 }
 
 func UsesEnumTwiceQuery(
diff --git a/generate/types.go b/generate/types.go
index 92e93ac..6b0767d 100644
--- a/generate/types.go
+++ b/generate/types.go
@@ -267,7 +267,7 @@ func (builder *typeBuilder) writeField(field field) error {
 	if builder.schema.Types[typ.Name()].IsAbstractType() {
 		// abstract types are handled in our UnmarshalJSON
 		builder.WriteString(" `json:\"-\"`")
-	} else if jsonName != goName {
+	} else {
 		fmt.Fprintf(builder, " `json:\"%s\"`", jsonName)
 	}
 	builder.WriteRune('\n')