1 files changed, 27 insertions, 13 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 2f6c34ac08..95dbd6a77f 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
@@ -1,29 +1,43 @@
 module ActiveRecord
   class PredicateBuilder
     class ArrayHandler # :nodoc:
+      def initialize(predicate_builder)
+        @predicate_builder = predicate_builder
+      end
+
       def call(attribute, value)
         values = value.map { |x| x.is_a?(Base) ? x.id : x }
-        ranges, values = values.partition { |v| v.is_a?(Range) }
+        nils, values = values.partition(&:nil?)
 
-        values_predicate = if values.include?(nil)
-          values = values.compact
+        return attribute.in([]) if values.empty? && nils.empty?
 
+        ranges, values = values.partition { |v| v.is_a?(Range) }
+
+        values_predicate =
           case values.length
-          when 0
-            attribute.eq(nil)
-          when 1
-            attribute.eq(values.first).or(attribute.eq(nil))
-          else
-            attribute.in(values).or(attribute.eq(nil))
+          when 0 then NullPredicate
+          when 1 then predicate_builder.build(attribute, values.first)
+          else attribute.in(values)
           end
-        else
-          attribute.in(values)
+
+        unless nils.empty?
+          values_predicate = values_predicate.or(predicate_builder.build(attribute, nil))
         end
 
-        array_predicates = ranges.map { |range| attribute.in(range) }
-        array_predicates << values_predicate
+        array_predicates = ranges.map { |range| predicate_builder.build(attribute, range) }
+        array_predicates.unshift(values_predicate)
         array_predicates.inject { |composite, predicate| composite.or(predicate) }
       end
+
+      protected
+
+      attr_reader :predicate_builder
+
+      module NullPredicate # :nodoc:
+        def self.or(other)
+          other
+        end
+      end
     end
   end
 end