Skip to content

Commit 7a9b7db

Browse files
authored
Merge pull request #5256 from Shopify/ravangen/remove-InvalidNullError-value
Remove `InvalidNullError#value` as it is always `nil`
2 parents eb4cac0 + d1a6f1f commit 7a9b7db

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

lib/graphql/execution/interpreter/runtime.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ def continue_value(value, field, is_non_null, ast_node, result_name, selection_r
473473
# When this comes from a list item, use the parent object:
474474
parent_type = selection_result.is_a?(GraphQLResultArray) ? selection_result.graphql_parent.graphql_result_type : selection_result.graphql_result_type
475475
# This block is called if `result_name` is not dead. (Maybe a previous invalid nil caused it be marked dead.)
476-
err = parent_type::InvalidNullError.new(parent_type, field, value, ast_node)
476+
err = parent_type::InvalidNullError.new(parent_type, field, ast_node)
477477
schema.type_error(err, context)
478478
end
479479
else

lib/graphql/invalid_null_error.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@ class InvalidNullError < GraphQL::Error
99
# @return [GraphQL::Field] The field which failed to return a value
1010
attr_reader :field
1111

12-
# @return [nil, GraphQL::ExecutionError] The invalid value for this field
13-
attr_reader :value
14-
1512
# @return [GraphQL::Language::Nodes::Field] the field where the error occurred
1613
attr_reader :ast_node
1714

18-
def initialize(parent_type, field, value, ast_node)
15+
def initialize(parent_type, field, ast_node)
1916
@parent_type = parent_type
2017
@field = field
21-
@value = value
2218
@ast_node = ast_node
2319
super("Cannot return null for non-nullable field #{@parent_type.graphql_name}.#{@field.graphql_name}")
2420
end

spec/graphql/non_null_type_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ def self.type_error(type_err, ctx)
4949
assert_equal("Cannot return null for non-nullable field Cow.cantBeNullButIs", err.message)
5050
assert_equal("Cow", err.parent_type.graphql_name)
5151
assert_equal("cantBeNullButIs", err.field.name)
52-
assert_nil(err.value)
5352
end
5453
end
5554
end

0 commit comments

Comments
 (0)