Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/graphql/execution/interpreter/runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ def continue_field(value, owner_type, field, current_type, ast_node, next_select
idx += 1
if use_dataloader_job
@dataloader.append_job do
resolve_list_item(inner_value, inner_type, inner_type_non_null, ast_node, field, owner_object, arguments, this_idx, response_list, owner_type, was_scoped, runtime_state)
resolve_list_item(inner_value, inner_type, inner_type_non_null, ast_node, field, owner_object, arguments, this_idx, response_list, owner_type, was_scoped, nil)
end
else
resolve_list_item(inner_value, inner_type, inner_type_non_null, ast_node, field, owner_object, arguments, this_idx, response_list, owner_type, was_scoped, runtime_state)
Expand Down Expand Up @@ -803,6 +803,7 @@ def continue_field(value, owner_type, field, current_type, ast_node, next_select
end

def resolve_list_item(inner_value, inner_type, inner_type_non_null, ast_node, field, owner_object, arguments, this_idx, response_list, owner_type, was_scoped, runtime_state) # rubocop:disable Metrics/ParameterLists
runtime_state ||= get_current_runtime_state
runtime_state.current_result_name = this_idx
runtime_state.current_result = response_list
call_method_on_directives(:resolve_each, owner_object, ast_node.directives) do
Expand Down
98 changes: 98 additions & 0 deletions spec/graphql/execution/interpreter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -999,4 +999,102 @@ def exec_multiplex(...)
assert_nil Fiber[:__graphql_runtime_info]
end
end

describe "list items with dataloader and current_path usage" do
class ListBugExampleSchema < GraphQL::Schema
class PathTest < GraphQL::Schema::Directive
locations(GraphQL::Schema::Directive::INLINE_FRAGMENT)

def self.resolve(object, arguments, context)
context[:test_paths] ||= []
context[:test_paths] << context[:current_path]
super
end
end

class DataloadedSource < GraphQL::Dataloader::Source
def fetch(objects)
objects.map(&:dataloaded)
end
end

class DataloadedType < GraphQL::Schema::Object
field :int, Integer
end

class SiblingType < GraphQL::Schema::Object
field :dataloaded, DataloadedType, null: false

def dataloaded
dataload(DataloadedSource, object)
end
end


class ChildType < GraphQL::Schema::Object
field :int, Integer, null: false
end

class ParentType < GraphQL::Schema::Object
field :children, [ChildType], null: false
end

class Query < GraphQL::Schema::Object
field :parent, ParentType do
argument :name, String
end

def parent(name:)
object.parent
end

field :siblings, [SiblingType], null: false
end

query(Query)
use GraphQL::Dataloader
directive PathTest
end

it "correctly provides current_type at selections-level" do
query_str = <<~GRAPHQL
query {
parent(name: "ABC") {
children {
... @pathTest {
int
}
}
}
siblings {
dataloaded {
int
}
}
}
GRAPHQL

root_value = OpenStruct.new(
parent: OpenStruct.new(
children: [
OpenStruct.new(int: 1),
]
),
siblings: [
OpenStruct.new(dataloaded: OpenStruct.new(int: 2)),
]
)

result = ListBugExampleSchema.execute(query_str, root_value: root_value)
expected_result = {
"data" => {
"parent" => {"children" => [{"int" => 1}]},
"siblings" => [{"dataloaded" => {"int" => 2}}]
}
}

assert_graphql_equal expected_result, result
assert_equal [["parent", "children", 0]], result.context[:test_paths]
end
end
end