Allow expanding an array of `composed_of` objects

2 files changed, 6 insertions, 9 deletions

diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
index 4acc491104..173794b8f4 100644
--- a/activerecord/lib/active_record/sanitization.rb
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -155,12 +155,10 @@ module ActiveRecord
             if aggregation = reflect_on_aggregation(attr.to_sym)
               mapping = aggregation.mapping
               mapping.each do |field_attr, aggregate_attr|
-                expanded_attrs[field_attr] = if mapping.size == 1 && !value.respond_to?(aggregate_attr)
-                  if value.is_a?(Array)
-                    value.map { |it| it.respond_to?(aggregate_attr) ? it.send(aggregate_attr) : it }
-                  else
-                    value
-                  end
+                expanded_attrs[field_attr] = if value.is_a?(Array)
+                  value.map { |it| it.send(aggregate_attr) }
+                elsif mapping.size == 1 && !value.respond_to?(aggregate_attr)
+                  value
                 else
                   value.send(aggregate_attr)
                 end
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index ebbd2b8118..81efd61e9a 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -873,9 +873,8 @@ class FinderTest < ActiveRecord::TestCase
     zaphod_address = customers(:zaphod).address
     assert_kind_of Address, david_address
     assert_kind_of Address, zaphod_address
-    assert_raise(NoMethodError) do
-      Customer.where(address: [david_address, zaphod_address])
-    end
+    found_customers = Customer.where(address: [david_address, zaphod_address])
+    assert_equal [customers(:david), customers(:zaphod)], found_customers
   end
 
   def test_hash_condition_find_with_aggregate_having_one_mapping_array