Merge branch 'master' into lazies-list

rmosolgo · Feb 22, 2023 · 988a602 · 988a602
2 parents 691e828 + d0fdeea
commit 988a602
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 95 deletions.
diff --git a/lib/graphql/backtrace/tracer.rb b/lib/graphql/backtrace/tracer.rb
@@ -25,7 +25,7 @@ def trace(key, metadata)
         when "execute_field", "execute_field_lazy"
           query = metadata[:query]
           multiplex = query.multiplex
-          push_key = metadata[:path]
+          push_key = query.context[:current_path]
           parent_frame = multiplex.context[:graphql_backtrace_contexts][push_key[0..-2]]
 
           if parent_frame.is_a?(GraphQL::Query)

diff --git a/lib/graphql/execution/interpreter.rb b/lib/graphql/execution/interpreter.rb
@@ -102,10 +102,7 @@ def run_all(schema, query_options, context: {}, max_complexity: schema.max_compl
                     queries.each do |query|
                       runtime = query.context.namespace(:interpreter_runtime)[:runtime]
                       if runtime
-                        runtime.delete_interpreter_context(:current_path)
-                        runtime.delete_interpreter_context(:current_field)
-                        runtime.delete_interpreter_context(:current_object)
-                        runtime.delete_interpreter_context(:current_arguments)
+                        runtime.delete_all_interpreter_context
                       end
                     end
                   }
@@ -151,10 +148,7 @@ def run_all(schema, query_options, context: {}, max_complexity: schema.max_compl
                   queries.map { |query|
                     runtime = query.context.namespace(:interpreter_runtime)[:runtime]
                     if runtime
-                      runtime.delete_interpreter_context(:current_path)
-                      runtime.delete_interpreter_context(:current_field)
-                      runtime.delete_interpreter_context(:current_object)
-                      runtime.delete_interpreter_context(:current_arguments)
+                      runtime.delete_all_interpreter_context
                     end
                   }
                 end