return nil schema on error

graphql-go · Apr 25, 2020 · 51495a7 · 51495a7
1 parent 02caa89
commit 51495a7
Show file tree

Hide file tree

Showing 33 changed files with 442 additions and 440 deletions.
diff --git a/abstract_test.go b/abstract_test.go
@@ -147,7 +147,7 @@ func TestIsTypeOfUsedToResolveRuntimeTypeForInterface(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if len(result.Errors) != 0 {
@@ -284,7 +284,7 @@ func TestAppendTypeUsedToAddRuntimeCustomScalarTypeForInterface(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if len(result.Errors) != 0 {
@@ -384,7 +384,7 @@ func TestIsTypeOfUsedToResolveRuntimeTypeForUnion(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if len(result.Errors) != 0 {
@@ -523,7 +523,7 @@ func TestResolveTypeOnInterfaceYieldsUsefulError(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if !testutil.EqualResults(expected, result) {
@@ -647,7 +647,7 @@ func TestResolveTypeOnUnionYieldsUsefulError(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if !testutil.EqualResults(expected, result) {

diff --git a/benchutil/list_schema.go b/benchutil/list_schema.go
@@ -80,7 +80,7 @@ func ListSchemaWithXItems(x int) graphql.Schema {
 		Query: queryType,
 	})
 
-	return colorSchema
+	return *colorSchema
 }
 
 var colors []color

diff --git a/benchutil/wide_schema.go b/benchutil/wide_schema.go
@@ -33,7 +33,7 @@ func WideSchemaWithXFieldsAndYItems(x int, y int) graphql.Schema {
 		Query: queryType,
 	})
 
-	return wideSchema
+	return *wideSchema
 }
 
 func generateXWideFields(x int) graphql.Fields {

diff --git a/directives_test.go b/directives_test.go
@@ -31,7 +31,7 @@ var directivesTestData map[string]interface{} = map[string]interface{}{
 func executeDirectivesTestQuery(t *testing.T, doc string) *graphql.Result {
 	ast := testutil.TestParse(t, doc)
 	ep := graphql.ExecuteParams{
-		Schema: directivesTestSchema,
+		Schema: *directivesTestSchema,
 		AST:    ast,
 		Root:   directivesTestData,
 	}

diff --git a/enum_type_test.go b/enum_type_test.go
@@ -123,14 +123,14 @@ var enumTypeTestSchema, _ = graphql.NewSchema(graphql.SchemaConfig{
 
 func executeEnumTypeTest(t *testing.T, query string) *graphql.Result {
 	result := g(t, graphql.Params{
-		Schema:        enumTypeTestSchema,
+		Schema:        *enumTypeTestSchema,
 		RequestString: query,
 	})
 	return result
 }
 func executeEnumTypeTestWithParams(t *testing.T, query string, params map[string]interface{}) *graphql.Result {
 	result := g(t, graphql.Params{
-		Schema:         enumTypeTestSchema,
+		Schema:         *enumTypeTestSchema,
 		RequestString:  query,
 		VariableValues: params,
 	})
@@ -414,7 +414,7 @@ func TestTypeSystem_EnumValues_EnumValueMayBePointer(t *testing.T) {
 				"color": "GREEN",
 				"foo":   1}}}
 	result := g(t, graphql.Params{
-		Schema:        enumTypeTestSchema,
+		Schema:        *enumTypeTestSchema,
 		RequestString: query,
 	})
 	if !reflect.DeepEqual(expected, result) {
@@ -453,7 +453,7 @@ func TestTypeSystem_EnumValues_EnumValueMayBeNilPointer(t *testing.T) {
 			}},
 	}
 	result := g(t, graphql.Params{
-		Schema:        enumTypeTestSchema,
+		Schema:        *enumTypeTestSchema,
 		RequestString: query,
 	})
 	if !reflect.DeepEqual(expected, result) {

diff --git a/examples/concurrent-resolvers/main.go b/examples/concurrent-resolvers/main.go
@@ -86,7 +86,7 @@ func main() {
 	`
 	result := graphql.Do(graphql.Params{
 		RequestString: query,
-		Schema:        schema,
+		Schema:        *schema,
 	})
 	b, err := json.Marshal(result)
 	if err != nil {

diff --git a/examples/context/main.go b/examples/context/main.go
@@ -70,5 +70,5 @@ func init() {
 	if err != nil {
 		log.Fatalf("failed to create schema, error: %v", err)
 	}
-	Schema = s
+	Schema = *s
 }
diff --git a/examples/crud/main.go b/examples/crud/main.go
@@ -226,7 +226,7 @@ func executeQuery(query string, schema graphql.Schema) *graphql.Result {
 
 func main() {
 	http.HandleFunc("/product", func(w http.ResponseWriter, r *http.Request) {
-		result := executeQuery(r.URL.Query().Get("query"), schema)
+		result := executeQuery(r.URL.Query().Get("query"), *schema)
 		json.NewEncoder(w).Encode(result)
 	})
 

diff --git a/examples/custom-scalar-type/main.go b/examples/custom-scalar-type/main.go
@@ -124,7 +124,7 @@ func main() {
 		`
 	*/
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 		VariableValues: map[string]interface{}{
 			"id": "5b42ba57289",

diff --git a/examples/hello-world/main.go b/examples/hello-world/main.go
@@ -31,7 +31,7 @@ func main() {
 			hello
 		}
 	`
-	params := graphql.Params{Schema: schema, RequestString: query}
+	params := graphql.Params{Schema: *schema, RequestString: query}
 	r := graphql.Do(params)
 	if len(r.Errors) > 0 {
 		log.Fatalf("failed to execute graphql operation, errors: %+v", r.Errors)

diff --git a/examples/http/main.go b/examples/http/main.go
@@ -88,7 +88,7 @@ func main() {
 	_ = importJSONDataFromFile("data.json", &data)
 
 	http.HandleFunc("/graphql", func(w http.ResponseWriter, r *http.Request) {
-		result := executeQuery(r.URL.Query().Get("query"), schema)
+		result := executeQuery(r.URL.Query().Get("query"), *schema)
 		json.NewEncoder(w).Encode(result)
 	})
 

diff --git a/examples/httpdynamic/main.go b/examples/httpdynamic/main.go
@@ -17,7 +17,7 @@ import (
 /* Shared data variables to allow dynamic reloads
 /*****************************************************************************/
 
-var schema graphql.Schema
+var schema *graphql.Schema
 
 const jsonDataFile = "data.json"
 
@@ -127,7 +127,7 @@ func main() {
 	}
 
 	http.HandleFunc("/graphql", func(w http.ResponseWriter, r *http.Request) {
-		result := executeQuery(r.URL.Query().Get("query"), schema)
+		result := executeQuery(r.URL.Query().Get("query"), *schema)
 		json.NewEncoder(w).Encode(result)
 	})
 

diff --git a/examples/modify-context/main.go b/examples/modify-context/main.go
@@ -65,7 +65,7 @@ func main() {
 		Context:       ctx,
 		RequestString: "{ users { id } }",
 		RootObject:    rootObject,
-		Schema:        schema,
+		Schema:        *schema,
 	})
 	b, err := json.Marshal(result)
 	if err != nil {