Merge pull request #26074 from kamipo/where_by_attribute_with_array_or_range

`where` by `array|range` attribute with array or range value

3 files changed, 23 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 505a78cb78..9d6fc9f702 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -87,14 +87,14 @@ module ActiveRecord
         binds = []
 
         attributes.each do |column_name, value|
-          case value
-          when Hash
+          case
+          when value.is_a?(Hash)
             attrs, bvs = associated_predicate_builder(column_name).create_binds_for_hash(value)
             result[column_name] = attrs
             binds += bvs
-          when Relation
+          when value.is_a?(Relation)
             binds += value.bound_attributes
-          when Range
+          when value.is_a?(Range) && !table.type(column_name).respond_to?(:subtype)
             first = value.begin
             last = value.end
             unless first.respond_to?(:infinite?) && first.infinite?
@@ -155,9 +155,13 @@ module ActiveRecord
       end
 
       def can_be_bound?(column_name, value)
-        !value.nil? &&
-          handler_for(value).is_a?(BasicObjectHandler) &&
-          !table.associated_with?(column_name)
+        return if table.associated_with?(column_name)
+        case value
+        when Array, Range
+          table.type(column_name).respond_to?(:subtype)
+        else
+          !value.nil? && handler_for(value).is_a?(BasicObjectHandler)
+        end
       end
 
       def build_bind_param(column_name, value)
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index c14745ac1f..60da9d8859 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -290,6 +290,12 @@ class PostgresqlArrayTest < ActiveRecord::PostgreSQLTestCase
     assert_equal record.tags, record.reload.tags
   end
 
+  def test_where_by_attribute_with_array
+    tags = ["black", "blue"]
+    record = PgArray.create!(tags: tags)
+    assert_equal record, PgArray.where(tags: tags).take
+  end
+
   def test_uniqueness_validation
     klass = Class.new(PgArray) do
       validates_uniqueness_of :tags
diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb
index 3f819f7bd5..f411884dfd 100644
--- a/activerecord/test/cases/adapters/postgresql/range_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/range_test.rb
@@ -282,6 +282,12 @@ _SQL
       assert_raises(ArgumentError) { PostgresqlRange.create!(tstz_range: "(''2010-01-01 14:30:00+05'', ''2011-01-01 14:30:00-03'']") }
     end
 
+    def test_where_by_attribute_with_range
+      range = 1..100
+      record = PostgresqlRange.create!(int4_range: range)
+      assert_equal record, PostgresqlRange.where(int4_range: range).take
+    end
+
     def test_update_all_with_ranges
       PostgresqlRange.create!