Merge pull request #5125 from francisbeaudoin/master

Optimization - Skip processing non-existing fields in FieldsWillMerge
rmosolgo · Oct 22, 2024 · ec80ea5 · ec80ea5
2 parents 56265cd + 8c0e258
commit ec80ea5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/graphql/static_validation/rules/fields_will_merge.rb b/lib/graphql/static_validation/rules/fields_will_merge.rb
@@ -212,6 +212,7 @@ def find_conflicts_within(response_keys)
 
       def find_conflict(response_key, field1, field2, mutually_exclusive: false)
         return if @conflict_count >= context.max_errors
+        return if field1.definition.nil? || field2.definition.nil?
 
         node1 = field1.node
         node2 = field2.node