Merge pull request #228 from graphql-go/augustoroman/master

Fix isNullish to not consider an empty string as Null.

definition.go

@@ -1262,8 +1262,7 @@ func (gl *List) Error() error {
 //
 // Note: the enforcement of non-nullability occurs within the executor.
 type NonNull struct {
-	PrivateName string `json:"name"` // added to conform with introspection for NonNull.Name = nil
-	OfType      Type   `json:"ofType"`
+	OfType Type `json:"ofType"`
 
 	err error
 }

executor_resolve_test.go

@@ -147,7 +147,7 @@ func TestExecutesResolveFunction_UsesProvidedResolveFunction_SourceIsStruct_With
 
 	expected := map[string]interface{}{
 		"test": map[string]interface{}{
-			"Str": nil,
+			"Str": "",
 			"Int": 0,
 		},
 	}
@@ -223,7 +223,7 @@ func TestExecutesResolveFunction_UsesProvidedResolveFunction_SourceIsStruct_With
 
 	expected := map[string]interface{}{
 		"test": map[string]interface{}{
-			"str": nil,
+			"str": "",
 			"int": 0,
 		},
 	}

executor_test.go

@@ -85,7 +85,7 @@ func TestExecutesArbitraryCode(t *testing.T) {
 				"b": "Boring",
 				"c": []interface{}{
 					"Contrived",
-					nil,
+					"",
 					"Confusing",
 				},
 				"deeper": []interface{}{

graphql_test.go

@@ -198,3 +198,51 @@ func TestNewErrorChecksNilNodes(t *testing.T) {
 		t.Fatalf("expected errors, got: %v", result)
 	}
 }
+
+func TestEmptyStringIsNotNull(t *testing.T) {
+	checkForEmptyString := func(p graphql.ResolveParams) (interface{}, error) {
+		arg := p.Args["arg"]
+		if arg == nil || arg.(string) != "" {
+			t.Errorf("Expected empty string for input arg, got %#v", arg)
+		}
+		return "yay", nil
+	}
+	returnEmptyString := func(p graphql.ResolveParams) (interface{}, error) {
+		return "", nil
+	}
+
+	schema, err := graphql.NewSchema(graphql.SchemaConfig{
+		Query: graphql.NewObject(graphql.ObjectConfig{
+			Name: "Query",
+			Fields: graphql.Fields{
+				"checkEmptyArg": &graphql.Field{
+					Type: graphql.String,
+					Args: graphql.FieldConfigArgument{
+						"arg": &graphql.ArgumentConfig{Type: graphql.String},
+					},
+					Resolve: checkForEmptyString,
+				},
+				"checkEmptyResult": &graphql.Field{
+					Type:    graphql.String,
+					Resolve: returnEmptyString,
+				},
+			},
+		}),
+	})
+	if err != nil {
+		t.Fatalf("wrong result, unexpected errors: %v", err.Error())
+	}
+	query := `{ checkEmptyArg(arg:"") checkEmptyResult }`
+
+	result := graphql.Do(graphql.Params{
+		Schema:        schema,
+		RequestString: query,
+	})
+	if len(result.Errors) > 0 {
+		t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
+	}
+	expected := map[string]interface{}{"checkEmptyArg": "yay", "checkEmptyResult": ""}
+	if !reflect.DeepEqual(result.Data, expected) {
+		t.Errorf("wrong result, query: %v, graphql result diff: %v", query, testutil.Diff(expected, result))
+	}
+}