Skip to content
Closed
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
9 changes: 3 additions & 6 deletions lib/graphql/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1360,13 +1360,10 @@ def lazy_resolve(lazy_class, value_method)
end

def resolves_lazies?
lazy_method_count = 0
lazy_methods.each do |k, v|
if !v.nil?
lazy_method_count += 1
end
lazy_methods.each do |_lazy_class, lazy_method|
return true if lazy_method
end
lazy_method_count > 2
false
end

def instrument(instrument_step, instrumenter, options = {})
Expand Down
40 changes: 40 additions & 0 deletions spec/graphql/execution/next_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,28 @@ def self.resolve_type(abs_type, obj, ctx)
end
end

class DefaultLazySchema < GraphQL::Schema
class Source < GraphQL::Dataloader::Source
def fetch(keys)
keys.map { |key| "loaded-#{key}" }
end
end

class Query < GraphQL::Schema::Object
field :value, String, null: false, resolve_static: true

def self.value(context)
context.dataloader.with(Source).request(1)
end
end

query(Query)
use GraphQL::Dataloader
use GraphQL::Execution::Next
end

class DefaultLazySubclass < GraphQL::Execution::Lazy
end

def run_next(...)
NextExecutionSchema.execute_next(...)
Expand All @@ -142,6 +164,24 @@ def run_next(...)
NextExecutionSchema::DATA.concat(Marshal.load(Marshal.dump(NextExecutionSchema::CLEAN_DATA)))
end

it "keeps lazy detection stable after subclass lookups" do
schema = Class.new(GraphQL::Schema)
resolves_lazies_before = schema.resolves_lazies?

assert schema.lazy?(DefaultLazySubclass.new { nil })
assert_equal resolves_lazies_before, schema.resolves_lazies?
assert resolves_lazies_before
end

it "resolves default Dataloader requests" do
result = nil
capture_io do
result = DefaultLazySchema.execute_next("{ value }")
end

assert_equal({ "data" => { "value" => "loaded-1" } }, result.to_h)
end

it "runs a query" do
result = run_next("
query TestNext($name: String!) {
Expand Down
Loading