Merge branch 'master' into fix-data-race

Author: chris-ramon

executor.go

@@ -175,15 +175,15 @@ func executeOperation(p executeOperationParams) *Result {
 // Extracts the root type of the operation from the schema.
 func getOperationRootType(schema Schema, operation ast.Definition) (*Object, error) {
 	if operation == nil {
-		return nil, errors.New("Can only execute queries and mutations")
+		return nil, errors.New("Can only execute queries, mutations and subscription")
 	}
 
 	switch operation.GetOperation() {
 	case ast.OperationTypeQuery:
 		return schema.QueryType(), nil
 	case ast.OperationTypeMutation:
 		mutationType := schema.MutationType()
-		if mutationType.PrivateName == "" {
+		if mutationType == nil || mutationType.PrivateName == "" {
 			return nil, gqlerrors.NewError(
 				"Schema is not configured for mutations",
 				[]ast.Node{operation},
@@ -196,7 +196,7 @@ func getOperationRootType(schema Schema, operation ast.Definition) (*Object, err
 		return mutationType, nil
 	case ast.OperationTypeSubscription:
 		subscriptionType := schema.SubscriptionType()
-		if subscriptionType.PrivateName == "" {
+		if subscriptionType == nil || subscriptionType.PrivateName == "" {
 			return nil, gqlerrors.NewError(
 				"Schema is not configured for subscriptions",
 				[]ast.Node{operation},

executor_test.go

@@ -843,6 +843,57 @@ func TestThrowsIfUnknownOperationNameIsProvided(t *testing.T) {
 		t.Fatalf("unexpected result, Diff: %v", testutil.Diff(expectedErrors, result.Errors))
 	}
 }
+
+func TestThrowsIfOperationTypeIsUnsupported(t *testing.T) {
+	query := `mutation Mut { a } subscription Sub { a }`
+	operations := []string{"Mut", "Sub"}
+
+	expectedErrors := [][]gqlerrors.FormattedError{
+		{{
+			Message:   `Schema is not configured for mutations`,
+			Locations: []location.SourceLocation{{Line: 1, Column: 1}},
+		}},
+		{{
+			Message:   `Schema is not configured for subscriptions`,
+			Locations: []location.SourceLocation{{Line: 1, Column: 20}},
+		}},
+	}
+
+	schema, err := graphql.NewSchema(graphql.SchemaConfig{
+		Query: graphql.NewObject(graphql.ObjectConfig{
+			Name: "Query",
+			Fields: graphql.Fields{
+				"a": &graphql.Field{
+					Type: graphql.String,
+				},
+			},
+		}),
+	})
+	if err != nil {
+		t.Fatalf("Error in schema %v", err.Error())
+	}
+
+	// parse query
+	ast := testutil.TestParse(t, query)
+
+	for opIndex, operation := range operations {
+		expectedErrors := expectedErrors[opIndex]
+
+		// execute
+		ep := graphql.ExecuteParams{
+			Schema:        schema,
+			AST:           ast,
+			OperationName: operation,
+		}
+		result := testutil.TestExecute(t, ep)
+		if result.Data != nil {
+			t.Fatalf("wrong result, expected nil result.Data, got %v", result.Data)
+		}
+		if !testutil.EqualFormattedErrors(expectedErrors, result.Errors) {
+			t.Fatalf("unexpected result, Diff: %v", testutil.Diff(expectedErrors, result.Errors))
+		}
+	}
+}
 func TestUsesTheQuerySchemaForQueries(t *testing.T) {
 
 	doc := `query Q { a } mutation M { c } subscription S { a }`

language/lexer/lexer.go

@@ -11,8 +11,10 @@ import (
 	"github.com/graphql-go/graphql/language/source"
 )
 
+type TokenKind int
+
 const (
-	EOF = iota + 1
+	EOF TokenKind = iota + 1
 	BANG
 	DOLLAR
 	PAREN_L
@@ -34,6 +36,33 @@ const (
 	AMP
 )
 
+var tokenDescription = map[TokenKind]string{
+	EOF:          "EOF",
+	BANG:         "!",
+	DOLLAR:       "$",
+	PAREN_L:      "(",
+	PAREN_R:      ")",
+	SPREAD:       "...",
+	COLON:        ":",
+	EQUALS:       "=",
+	AT:           "@",
+	BRACKET_L:    "[",
+	BRACKET_R:    "]",
+	BRACE_L:      "{",
+	PIPE:         "|",
+	BRACE_R:      "}",
+	NAME:         "Name",
+	INT:          "Int",
+	FLOAT:        "Float",
+	STRING:       "String",
+	BLOCK_STRING: "BlockString",
+	AMP:          "&",
+}
+
+func (kind TokenKind) String() string {
+	return tokenDescription[kind]
+}
+
 // NAME -> keyword relationship
 const (
 	FRAGMENT     = "fragment"
@@ -51,61 +80,10 @@ const (
 	DIRECTIVE    = "directive"
 )
 
-var TokenKind map[int]int
-var tokenDescription map[int]string
-
-func init() {
-	TokenKind = make(map[int]int)
-	{
-		TokenKind[EOF] = EOF
-		TokenKind[BANG] = BANG
-		TokenKind[DOLLAR] = DOLLAR
-		TokenKind[PAREN_L] = PAREN_L
-		TokenKind[PAREN_R] = PAREN_R
-		TokenKind[SPREAD] = SPREAD
-		TokenKind[COLON] = COLON
-		TokenKind[EQUALS] = EQUALS
-		TokenKind[AT] = AT
-		TokenKind[BRACKET_L] = BRACKET_L
-		TokenKind[BRACKET_R] = BRACKET_R
-		TokenKind[BRACE_L] = BRACE_L
-		TokenKind[PIPE] = PIPE
-		TokenKind[BRACE_R] = BRACE_R
-		TokenKind[NAME] = NAME
-		TokenKind[INT] = INT
-		TokenKind[FLOAT] = FLOAT
-		TokenKind[STRING] = STRING
-		TokenKind[BLOCK_STRING] = BLOCK_STRING
-	}
-	tokenDescription = make(map[int]string)
-	{
-		tokenDescription[TokenKind[EOF]] = "EOF"
-		tokenDescription[TokenKind[BANG]] = "!"
-		tokenDescription[TokenKind[DOLLAR]] = "$"
-		tokenDescription[TokenKind[PAREN_L]] = "("
-		tokenDescription[TokenKind[PAREN_R]] = ")"
-		tokenDescription[TokenKind[SPREAD]] = "..."
-		tokenDescription[TokenKind[COLON]] = ":"
-		tokenDescription[TokenKind[EQUALS]] = "="
-		tokenDescription[TokenKind[AT]] = "@"
-		tokenDescription[TokenKind[BRACKET_L]] = "["
-		tokenDescription[TokenKind[BRACKET_R]] = "]"
-		tokenDescription[TokenKind[BRACE_L]] = "{"
-		tokenDescription[TokenKind[PIPE]] = "|"
-		tokenDescription[TokenKind[BRACE_R]] = "}"
-		tokenDescription[TokenKind[NAME]] = "Name"
-		tokenDescription[TokenKind[INT]] = "Int"
-		tokenDescription[TokenKind[FLOAT]] = "Float"
-		tokenDescription[TokenKind[STRING]] = "String"
-		tokenDescription[TokenKind[BLOCK_STRING]] = "BlockString"
-		tokenDescription[TokenKind[AMP]] = "&"
-	}
-}
-
 // Token is a representation of a lexed Token. Value only appears for non-punctuation
 // tokens: NAME, INT, FLOAT, and STRING.
 type Token struct {
-	Kind  int
+	Kind  TokenKind
 	Start int
 	End   int
 	Value string
@@ -151,7 +129,7 @@ func readName(source *source.Source, position, runePosition int) Token {
 			break
 		}
 	}
-	return makeToken(TokenKind[NAME], runePosition, endRune, string(body[position:endByte]))
+	return makeToken(NAME, runePosition, endRune, string(body[position:endByte]))
 }
 
 // Reads a number token from the source file, either a float
@@ -207,9 +185,9 @@ func readNumber(s *source.Source, start int, firstCode rune, codeLength int) (To
 		}
 		position = p
 	}
-	kind := TokenKind[INT]
+	kind := INT
 	if isFloat {
-		kind = TokenKind[FLOAT]
+		kind = FLOAT
 	}
 
 	return makeToken(kind, start, position, string(body[start:position])), nil
@@ -328,7 +306,7 @@ func readString(s *source.Source, start int) (Token, error) {
 	stringContent := body[chunkStart:position]
 	valueBuffer.Write(stringContent)
 	value := valueBuffer.String()
-	return makeToken(TokenKind[STRING], start, position+1, value), nil
+	return makeToken(STRING, start, position+1, value), nil
 }
 
 // readBlockString reads a block string token from the source file.
@@ -357,7 +335,7 @@ func readBlockString(s *source.Source, start int) (Token, error) {
 				stringContent := body[chunkStart:position]
 				valueBuffer.Write(stringContent)
 				value := blockStringValue(valueBuffer.String())
-				return makeToken(TokenKind[BLOCK_STRING], start, position+3, value), nil
+				return makeToken(BLOCK_STRING, start, position+3, value), nil
 			}
 		}
 
@@ -490,7 +468,7 @@ func char2hex(a rune) int {
 	return -1
 }
 
-func makeToken(kind int, start int, end int, value string) Token {
+func makeToken(kind TokenKind, start int, end int, value string) Token {
 	return Token{Kind: kind, Start: start, End: end, Value: value}
 }
 
@@ -512,7 +490,7 @@ func readToken(s *source.Source, fromPosition int) (Token, error) {
 	bodyLength := len(body)
 	position, runePosition := positionAfterWhitespace(body, fromPosition)
 	if position >= bodyLength {
-		return makeToken(TokenKind[EOF], position, position, ""), nil
+		return makeToken(EOF, position, position, ""), nil
 	}
 	code, codeLength := runeAt(body, position)
 
@@ -524,51 +502,51 @@ func readToken(s *source.Source, fromPosition int) (Token, error) {
 	switch code {
 	// !
 	case '!':
-		return makeToken(TokenKind[BANG], position, position+1, ""), nil
+		return makeToken(BANG, position, position+1, ""), nil
 	// $
 	case '$':
-		return makeToken(TokenKind[DOLLAR], position, position+1, ""), nil
+		return makeToken(DOLLAR, position, position+1, ""), nil
 	// &
 	case '&':
-		return makeToken(TokenKind[AMP], position, position+1, ""), nil
+		return makeToken(AMP, position, position+1, ""), nil
 	// (
 	case '(':
-		return makeToken(TokenKind[PAREN_L], position, position+1, ""), nil
+		return makeToken(PAREN_L, position, position+1, ""), nil
 	// )
 	case ')':
-		return makeToken(TokenKind[PAREN_R], position, position+1, ""), nil
+		return makeToken(PAREN_R, position, position+1, ""), nil
 	// .
 	case '.':
 		next1, _ := runeAt(body, position+1)
 		next2, _ := runeAt(body, position+2)
 		if next1 == '.' && next2 == '.' {
-			return makeToken(TokenKind[SPREAD], position, position+3, ""), nil
+			return makeToken(SPREAD, position, position+3, ""), nil
 		}
 		break
 	// :
 	case ':':
-		return makeToken(TokenKind[COLON], position, position+1, ""), nil
+		return makeToken(COLON, position, position+1, ""), nil
 	// =
 	case '=':
-		return makeToken(TokenKind[EQUALS], position, position+1, ""), nil
+		return makeToken(EQUALS, position, position+1, ""), nil
 	// @
 	case '@':
-		return makeToken(TokenKind[AT], position, position+1, ""), nil
+		return makeToken(AT, position, position+1, ""), nil
 	// [
 	case '[':
-		return makeToken(TokenKind[BRACKET_L], position, position+1, ""), nil
+		return makeToken(BRACKET_L, position, position+1, ""), nil
 	// ]
 	case ']':
-		return makeToken(TokenKind[BRACKET_R], position, position+1, ""), nil
+		return makeToken(BRACKET_R, position, position+1, ""), nil
 	// {
 	case '{':
-		return makeToken(TokenKind[BRACE_L], position, position+1, ""), nil
+		return makeToken(BRACE_L, position, position+1, ""), nil
 	// |
 	case '|':
-		return makeToken(TokenKind[PIPE], position, position+1, ""), nil
+		return makeToken(PIPE, position, position+1, ""), nil
 	// }
 	case '}':
-		return makeToken(TokenKind[BRACE_R], position, position+1, ""), nil
+		return makeToken(BRACE_R, position, position+1, ""), nil
 	// A-Z
 	case 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
 		'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z':
@@ -672,11 +650,7 @@ func positionAfterWhitespace(body []byte, startPosition int) (position int, rune
 
 func GetTokenDesc(token Token) string {
 	if token.Value == "" {
-		return GetTokenKindDesc(token.Kind)
+		return token.Kind.String()
 	}
-	return fmt.Sprintf("%s \"%s\"", GetTokenKindDesc(token.Kind), token.Value)
-}
-
-func GetTokenKindDesc(kind int) string {
-	return tokenDescription[kind]
+	return fmt.Sprintf("%s \"%s\"", token.Kind.String(), token.Value)
 }