Merge pull request 99designs#30 from vektah/complex-input-types

Fix complex input types
cgxxv · Feb 25, 2018 · 7d5285b · 7d5285b
2 parents bc85f1d + b27e880
commit 7d5285b
Show file tree

Hide file tree

Showing 9 changed files with 845 additions and 8 deletions.
diff --git a/codegen/models_build.go b/codegen/models_build.go
@@ -49,8 +49,7 @@ func bindGenerated(types NamedTypes, object *Object) {
 				field.GoVarName = "ID"
 			}
 		} else if object.Input {
-			field.GoFKName = ucFirst(field.GQLName)
-			field.GoFKType = types[field.GQLType].GoType
+			field.GoVarName = ucFirst(field.GQLName)
 		} else {
 			field.GoFKName = ucFirst(field.GQLName) + "ID"
 			field.GoFKType = "int" // todo: use schema to determine type of id?

diff --git a/codegen/templates/args.gotpl b/codegen/templates/args.gotpl
@@ -12,7 +12,7 @@
 				{{- end }}
 			}
 		} {{ if $arg.Default }} else {
-			tmp := {{ $arg.Default | dump }}
+			var tmp interface{} = {{ $arg.Default | dump }}
 			var err error
 			{{$arg.Unmarshal (print "arg" $i) "tmp" }}
 			if err != nil {

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/example/scalars/generated.go b/example/scalars/generated.go
@@ -124,7 +124,7 @@ func (ec *executionContext) _Query_search(field graphql.CollectedField) graphql.
 			return graphql.Null
 		}
 	} else {
-		tmp := map[string]interface{}{"location": "37,144"}
+		var tmp interface{} = map[string]interface{}{"location": "37,144"}
 		var err error
 
 		arg0, err = UnmarshalSearchArgs(tmp)

diff --git a/example/starwars/generated.go b/example/starwars/generated.go
@@ -353,7 +353,7 @@ func (ec *executionContext) _Human_height(field graphql.CollectedField, obj *Hum
 			return graphql.Null
 		}
 	} else {
-		tmp := "METER"
+		var tmp interface{} = "METER"
 		var err error
 
 		arg0, err = graphql.UnmarshalString(tmp)
@@ -590,7 +590,7 @@ func (ec *executionContext) _Query_hero(field graphql.CollectedField) graphql.Ma
 			return graphql.Null
 		}
 	} else {
-		tmp := "NEWHOPE"
+		var tmp interface{} = "NEWHOPE"
 		var err error
 
 		arg0, err = graphql.UnmarshalString(tmp)
@@ -884,7 +884,7 @@ func (ec *executionContext) _Starship_length(field graphql.CollectedField, obj *
 			return graphql.Null
 		}
 	} else {
-		tmp := "METER"
+		var tmp interface{} = "METER"
 		var err error
 
 		arg0, err = graphql.UnmarshalString(tmp)