Merge pull request 99designs#359 from 99designs/fix-null-arg-error

Fix Issue With Argument Pointer Type
cgxxv · Oct 2, 2018 · 0c5c2a6 · 0c5c2a6
2 parents 2ea5f90 + 7af8889
commit 0c5c2a6
Show file tree

Hide file tree

Showing 13 changed files with 144 additions and 66 deletions.
diff --git a/codegen/directive_build.go b/codegen/directive_build.go
@@ -32,7 +32,6 @@ func (cfg *Config) buildDirectives(types NamedTypes) ([]*Directive, error) {
 				if err != nil {
 					return nil, errors.Errorf("default value for directive argument %s(%s) is not valid: %s", dir.Name, arg.Name, err.Error())
 				}
-				newArg.StripPtr()
 			}
 			args = append(args, newArg)
 		}

diff --git a/codegen/object_build.go b/codegen/object_build.go
@@ -162,7 +162,6 @@ func (cfg *Config) buildObject(types NamedTypes, typ *ast.Definition, imports *I
 				if err != nil {
 					return nil, errors.Errorf("default value for %s.%s is not valid: %s", typ.Name, field.Name, err.Error())
 				}
-				newArg.StripPtr()
 			}
 			args = append(args, newArg)
 		}

diff --git a/codegen/testserver/element.go b/codegen/testserver/element.go
diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
diff --git a/codegen/testserver/generated_test.go b/codegen/testserver/generated_test.go
@@ -175,6 +175,15 @@ func TestGeneratedServer(t *testing.T) {
 			sub.Close()
 		})
 	})
+
+	t.Run("null args", func(t *testing.T) {
+		var resp struct {
+			NullableArg *string
+		}
+		err := c.Post(`query { nullableArg(arg: null) }`, &resp)
+		require.Nil(t, err)
+		require.Equal(t, "Ok", *resp.NullableArg)
+	})
 }
 
 func TestResponseExtension(t *testing.T) {
@@ -227,6 +236,11 @@ func (r *testQueryResolver) User(ctx context.Context, id int) (User, error) {
 	return User{ID: 1}, nil
 }
 
+func (r *testQueryResolver) NullableArg(ctx context.Context, arg *int) (*string, error) {
+	s := "Ok"
+	return &s, nil
+}
+
 func (r *testResolver) Subscription() SubscriptionResolver {
 	return &testSubscriptionResolver{r}
 }

diff --git a/codegen/testserver/resolver.go b/codegen/testserver/resolver.go
@@ -65,6 +65,9 @@ func (r *queryResolver) Valid(ctx context.Context) (string, error) {
 func (r *queryResolver) User(ctx context.Context, id int) (User, error) {
 	panic("not implemented")
 }
+func (r *queryResolver) NullableArg(ctx context.Context, arg *int) (*string, error) {
+	panic("not implemented")
+}
 func (r *queryResolver) KeywordArgs(ctx context.Context, breakArg string, defaultArg string, funcArg string, interfaceArg string, selectArg string, caseArg string, deferArg string, goArg string, mapArg string, structArg string, chanArg string, elseArg string, gotoArg string, packageArg string, switchArg string, constArg string, fallthroughArg string, ifArg string, rangeArg string, typeArg string, continueArg string, forArg string, importArg string, returnArg string, varArg string) (bool, error) {
 	panic("not implemented")
 }

diff --git a/codegen/testserver/schema.graphql b/codegen/testserver/schema.graphql
@@ -10,6 +10,7 @@ type Query {
     errorBubble: Error
     valid: String!
     user(id: Int!): User!
+    nullableArg(arg: Int = 123): String
 }
 
 type Subscription {

diff --git a/example/scalars/generated.go b/example/scalars/generated.go
diff --git a/example/scalars/resolvers.go b/example/scalars/resolvers.go
@@ -34,7 +34,7 @@ func (r *queryResolver) User(ctx context.Context, id external.ObjectID) (*model.
 	}, nil
 }
 
-func (r *queryResolver) Search(ctx context.Context, input model.SearchArgs) ([]model.User, error) {
+func (r *queryResolver) Search(ctx context.Context, input *model.SearchArgs) ([]model.User, error) {
 	location := model.Point{X: 1, Y: 2}
 	if input.Location != nil {
 		location = *input.Location