1 files changed, 45 insertions, 0 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
new file mode 100644
index 0000000000..4b5f5773a0
--- /dev/null
+++ b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
@@ -0,0 +1,45 @@
+require 'active_support/core_ext/string/filters'
+
+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 }
+        nils, values = values.partition(&:nil?)
+
+        return attribute.in([]) if values.empty? && nils.empty?
+
+        ranges, values = values.partition { |v| v.is_a?(Range) }
+
+        values_predicate =
+          case values.length
+          when 0 then NullPredicate
+          when 1 then predicate_builder.build(attribute, values.first)
+          else attribute.in(values)
+          end
+
+        unless nils.empty?
+          values_predicate = values_predicate.or(predicate_builder.build(attribute, nil))
+        end
+
+        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