Merge pull request #28768 from kamipo/early_return_array_handler

Early return in `PredicateBuilder::ArrayHandler`

1 files changed, 3 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
index 54e9910598..1068e700e2 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
@@ -6,12 +6,11 @@ module ActiveRecord
       end
 
       def call(attribute, value)
+        return attribute.in([]) if value.empty?
+        return queries_predicates(value) if value.all? { |v| v.is_a?(Hash) }
+
         values = value.map { |x| x.is_a?(Base) ? x.id : x }
         nils, values = values.partition(&:nil?)
-
-        return attribute.in([]) if values.empty? && nils.empty?
-        return queries_predicates(values) if nils.empty? && values.all? { |v| v.is_a?(Hash) }
-
         ranges, values = values.partition { |v| v.is_a?(Range) }
 
         values_predicate =