ent · a8m · Jan 23, 2021 · Jan 23, 2021
diff --git a/entc/gen/graph.go b/entc/gen/graph.go
@@ -246,7 +246,7 @@ func (g *Graph) addEdges(schema *load.Schema) {
 				Owner:       t,
 				Unique:      e.Unique,
 				Optional:    !e.Required,
-				StructTag:   e.Tag,
+				StructTag:   structTag(e.Name, e.Tag),
 				Annotations: e.Annotations,
 			})
 		// Inverse only.
@@ -260,7 +260,7 @@ func (g *Graph) addEdges(schema *load.Schema) {
 				Inverse:     e.RefName,
 				Unique:      e.Unique,
 				Optional:    !e.Required,
-				StructTag:   e.Tag,
+				StructTag:   structTag(e.Name, e.Tag),
 				Annotations: e.Annotations,
 			})
 		// Inverse and assoc.
@@ -276,7 +276,7 @@ func (g *Graph) addEdges(schema *load.Schema) {
 				Inverse:     ref.Name,
 				Unique:      e.Unique,
 				Optional:    !e.Required,
-				StructTag:   e.Tag,
+				StructTag:   structTag(e.Name, e.Tag),
 				Annotations: e.Annotations,
 			}, &Edge{
 				def:         e,
@@ -285,7 +285,7 @@ func (g *Graph) addEdges(schema *load.Schema) {
 				Name:        ref.Name,
 				Unique:      ref.Unique,
 				Optional:    !ref.Required,
-				StructTag:   ref.Tag,
+				StructTag:   structTag(ref.Name, ref.Tag),
 				Annotations: ref.Annotations,
 			})
 		default:

diff --git a/entc/integration/customid/ent/blob.go b/entc/integration/customid/ent/blob.go
diff --git a/entc/integration/customid/ent/car.go b/entc/integration/customid/ent/car.go
diff --git a/entc/integration/customid/ent/group.go b/entc/integration/customid/ent/group.go
diff --git a/entc/integration/customid/ent/pet.go b/entc/integration/customid/ent/pet.go
diff --git a/entc/integration/customid/ent/user.go b/entc/integration/customid/ent/user.go
diff --git a/entc/integration/ent/card.go b/entc/integration/ent/card.go
diff --git a/entc/integration/ent/file.go b/entc/integration/ent/file.go
diff --git a/entc/integration/ent/filetype.go b/entc/integration/ent/filetype.go
diff --git a/entc/integration/ent/group.go b/entc/integration/ent/group.go
diff --git a/entc/integration/ent/groupinfo.go b/entc/integration/ent/groupinfo.go
diff --git a/entc/integration/ent/node.go b/entc/integration/ent/node.go
diff --git a/entc/integration/ent/pet.go b/entc/integration/ent/pet.go
diff --git a/entc/integration/ent/schema/node.go b/entc/integration/ent/schema/node.go
@@ -27,10 +27,10 @@ func (Node) Fields() []ent.Field {
 func (Node) Edges() []ent.Edge {
 	return []ent.Edge{
 		edge.To("next", Node.Type).
-			StructTag("gqlgen:next").
+			StructTag(`gqlgen:"next"`).
 			Unique().
 			From("prev").
-			StructTag("gqlgen:prev").
+			StructTag(`gqlgen:"prev"`).
 			Unique(),
 	}
 }
diff --git a/entc/integration/ent/spec.go b/entc/integration/ent/spec.go
diff --git a/entc/integration/ent/user.go b/entc/integration/ent/user.go
diff --git a/entc/integration/gremlin/ent/card.go b/entc/integration/gremlin/ent/card.go
diff --git a/entc/integration/gremlin/ent/file.go b/entc/integration/gremlin/ent/file.go
diff --git a/entc/integration/gremlin/ent/filetype.go b/entc/integration/gremlin/ent/filetype.go
diff --git a/entc/integration/gremlin/ent/group.go b/entc/integration/gremlin/ent/group.go
diff --git a/entc/integration/gremlin/ent/groupinfo.go b/entc/integration/gremlin/ent/groupinfo.go
diff --git a/entc/integration/gremlin/ent/node.go b/entc/integration/gremlin/ent/node.go
diff --git a/entc/integration/gremlin/ent/pet.go b/entc/integration/gremlin/ent/pet.go
diff --git a/entc/integration/gremlin/ent/spec.go b/entc/integration/gremlin/ent/spec.go
diff --git a/entc/integration/gremlin/ent/user.go b/entc/integration/gremlin/ent/user.go
diff --git a/entc/integration/hooks/ent/card.go b/entc/integration/hooks/ent/card.go