Merge pull request #294 from aca/master

add json tag to edges

entc/gen/template/ent.tmpl

@@ -28,7 +28,7 @@ type {{ $.Name }} struct {
 				// {{ $e.StructField }} holds the value of the {{ $e.Name }} edge.
 				{{ $e.StructField }} {{ if not $e.Unique }}[]{{ end }}*{{ $e.Type.Name }} {{ with $e.StructTag }}`{{ . }}`{{ end }}
 			{{- end }}
-		}
+		} `json:"edges"`
 	{{- end -}}
 	{{- /* Additional fields to add by the storage driver. */}}
 	{{- $tmpl := printf "dialect/%s/model/fields" $.Storage }}

entc/integration/customid/ent/group.go

@@ -24,7 +24,7 @@ type Group struct {
 	Edges struct {
 		// Users holds the value of the users edge.
 		Users []*User
-	}
+	} `json:"edges"`
 }
 
 // scanValues returns the types for scanning values from sql.Rows.

entc/integration/customid/ent/user.go

@@ -28,7 +28,7 @@ type User struct {
 		Parent *User
 		// Children holds the value of the children edge.
 		Children []*User
-	}
+	} `json:"edges"`
 	parent_id *int
 }
 

entc/integration/ent/card.go

@@ -36,7 +36,7 @@ type Card struct {
 		Owner *User
 		// Spec holds the value of the spec edge.
 		Spec []*Spec
-	}
+	} `json:"edges"`
 	owner_id *string
 
 	// StaticField defined by templates.

entc/integration/ent/file.go

@@ -35,7 +35,7 @@ type File struct {
 		Owner *User
 		// Type holds the value of the type edge.
 		Type *FileType
-	}
+	} `json:"edges"`
 	type_id       *string
 	group_file_id *string
 	owner_id      *string

entc/integration/ent/filetype.go

@@ -27,7 +27,7 @@ type FileType struct {
 	Edges struct {
 		// Files holds the value of the files edge.
 		Files []*File
-	}
+	} `json:"edges"`
 }
 
 // scanValues returns the types for scanning values from sql.Rows.

entc/integration/ent/group.go

@@ -42,7 +42,7 @@ type Group struct {
 		Users []*User
 		// Info holds the value of the info edge.
 		Info *GroupInfo
-	}
+	} `json:"edges"`
 	info_id *string
 }
 

entc/integration/ent/groupinfo.go

@@ -29,7 +29,7 @@ type GroupInfo struct {
 	Edges struct {
 		// Groups holds the value of the groups edge.
 		Groups []*Group
-	}
+	} `json:"edges"`
 }
 
 // scanValues returns the types for scanning values from sql.Rows.

entc/integration/ent/node.go

@@ -29,7 +29,7 @@ type Node struct {
 		Prev *Node
 		// Next holds the value of the next edge.
 		Next *Node
-	}
+	} `json:"edges"`
 	prev_id *string
 }
 

entc/integration/ent/pet.go

@@ -29,7 +29,7 @@ type Pet struct {
 		Team *User
 		// Owner holds the value of the owner edge.
 		Owner *User
-	}
+	} `json:"edges"`
 	owner_id *string
 	team_id  *string
 }

entc/integration/ent/spec.go

@@ -25,7 +25,7 @@ type Spec struct {
 	Edges struct {
 		// Card holds the value of the card edge.
 		Card []*Card
-	}
+	} `json:"edges"`
 }
 
 // scanValues returns the types for scanning values from sql.Rows.

entc/integration/ent/user.go

@@ -61,7 +61,7 @@ type User struct {
 		Children []*User
 		// Parent holds the value of the parent edge.
 		Parent *User
-	}
+	} `json:"edges"`
 	group_blocked_id *string
 	user_spouse_id   *string
 	parent_id        *string

entc/integration/gremlin/ent/card.go

@@ -35,7 +35,7 @@ type Card struct {
 		Owner *User
 		// Spec holds the value of the spec edge.
 		Spec []*Spec
-	}
+	} `json:"edges"`
 
 	// StaticField defined by templates.
 	StaticField string `json:"boring,omitempty"`

entc/integration/gremlin/ent/file.go

@@ -34,7 +34,7 @@ type File struct {
 		Owner *User
 		// Type holds the value of the type edge.
 		Type *FileType
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into File.

entc/integration/gremlin/ent/filetype.go

@@ -26,7 +26,7 @@ type FileType struct {
 	Edges struct {
 		// Files holds the value of the files edge.
 		Files []*File
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into FileType.

entc/integration/gremlin/ent/group.go

@@ -41,7 +41,7 @@ type Group struct {
 		Users []*User
 		// Info holds the value of the info edge.
 		Info *GroupInfo
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into Group.

entc/integration/gremlin/ent/groupinfo.go

@@ -28,7 +28,7 @@ type GroupInfo struct {
 	Edges struct {
 		// Groups holds the value of the groups edge.
 		Groups []*Group
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into GroupInfo.

entc/integration/gremlin/ent/node.go

@@ -28,7 +28,7 @@ type Node struct {
 		Prev *Node
 		// Next holds the value of the next edge.
 		Next *Node
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into Node.

entc/integration/gremlin/ent/pet.go

@@ -28,7 +28,7 @@ type Pet struct {
 		Team *User
 		// Owner holds the value of the owner edge.
 		Owner *User
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into Pet.

entc/integration/gremlin/ent/spec.go

@@ -24,7 +24,7 @@ type Spec struct {
 	Edges struct {
 		// Card holds the value of the card edge.
 		Card []*Card
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into Spec.

entc/integration/gremlin/ent/user.go

@@ -61,7 +61,7 @@ type User struct {
 		Children []*User
 		// Parent holds the value of the parent edge.
 		Parent *User
-	}
+	} `json:"edges"`
 }
 
 // FromResponse scans the gremlin response data into User.

entc/integration/idtype/ent/user.go

@@ -30,7 +30,7 @@ type User struct {
 		Followers []*User
 		// Following holds the value of the following edge.
 		Following []*User
-	}
+	} `json:"edges"`
 	user_spouse_id *uint64
 }
 

entc/integration/migrate/entv1/car.go

@@ -24,7 +24,7 @@ type Car struct {
 	Edges struct {
 		// Owner holds the value of the owner edge.
 		Owner *User
-	}
+	} `json:"edges"`
 	owner_id *int
 }
 

entc/integration/migrate/entv1/user.go

@@ -44,7 +44,7 @@ type User struct {
 		Spouse *User
 		// Car holds the value of the car edge.
 		Car *Car
-	}
+	} `json:"edges"`
 	parent_id      *int
 	user_spouse_id *int
 }

entc/integration/migrate/entv2/car.go

@@ -24,7 +24,7 @@ type Car struct {
 	Edges struct {
 		// Owner holds the value of the owner edge.
 		Owner *User
-	}
+	} `json:"edges"`
 	owner_id *int
 }
 

entc/integration/migrate/entv2/user.go

@@ -42,7 +42,7 @@ type User struct {
 	Edges struct {
 		// Car holds the value of the car edge.
 		Car []*Car
-	}
+	} `json:"edges"`
 }
 
 // scanValues returns the types for scanning values from sql.Rows.

entc/integration/template/ent/pet.go

@@ -29,7 +29,7 @@ type Pet struct {
 	Edges struct {
 		// Owner holds the value of the owner edge.
 		Owner *User
-	}
+	} `json:"edges"`
 	owner_id *int
 }
 

entc/integration/template/ent/user.go

@@ -28,7 +28,7 @@ type User struct {
 		Pets []*Pet
 		// Friends holds the value of the friends edge.
 		Friends []*User
-	}
+	} `json:"edges"`
 }
 
 // scanValues returns the types for scanning values from sql.Rows.