diff options
author | orekyuu <orekyuu@pixiv.com> | 2018-01-26 10:29:41 +0900 |
---|---|---|
committer | orekyuu <orekyuu@pixiv.com> | 2018-01-26 10:29:41 +0900 |
commit | c9822ace4c8961336527670e7eef59093f515dfd (patch) | |
tree | f7b1f56ae2fb5013fa5dbcf70d0976c8fa74afad /activerecord | |
parent | bbed4c32e469ee74718d5a9cc52792cb473700b9 (diff) | |
download | rails-c9822ace4c8961336527670e7eef59093f515dfd.tar.gz rails-c9822ace4c8961336527670e7eef59093f515dfd.tar.bz2 rails-c9822ace4c8961336527670e7eef59093f515dfd.zip |
Fix not expanded problem when passing an Array object as argument to the where method using composed_of column.
Fixes #31723
```
david_balance = customers(:david).balance
Customer.where(balance: [david_balance]).to_sql
# Before: WHERE `customers`.`balance` = NULL
# After : WHERE `customers`.`balance` = 50
```
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/CHANGELOG.md | 14 | ||||
-rw-r--r-- | activerecord/lib/active_record/sanitization.rb | 10 | ||||
-rw-r--r-- | activerecord/test/cases/finder_test.rb | 19 |
3 files changed, 40 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index af77eaae0e..12d9a15e63 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,17 @@ +* Fix not expanded problem when passing an Array object as argument to the where method using composed_of column. + + Fixes #31723 + + ``` + david_balance = customers(:david).balance + Customer.where(balance: [david_balance]).to_sql + + # Before: WHERE `customers`.`balance` = NULL + # After : WHERE `customers`.`balance` = 50 + ``` + + *Yutaro Kanagawa* + * Fix `count(:all)` with eager loading and having an order other than the driving table. Fixes #31783. diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb index 58da106092..4acc491104 100644 --- a/activerecord/lib/active_record/sanitization.rb +++ b/activerecord/lib/active_record/sanitization.rb @@ -155,10 +155,14 @@ module ActiveRecord if aggregation = reflect_on_aggregation(attr.to_sym) mapping = aggregation.mapping mapping.each do |field_attr, aggregate_attr| - if mapping.size == 1 && !value.respond_to?(aggregate_attr) - expanded_attrs[field_attr] = value + 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 else - expanded_attrs[field_attr] = value.send(aggregate_attr) + value.send(aggregate_attr) end end else diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb index 4769ffd64d..ebbd2b8118 100644 --- a/activerecord/test/cases/finder_test.rb +++ b/activerecord/test/cases/finder_test.rb @@ -868,6 +868,25 @@ class FinderTest < ActiveRecord::TestCase assert_equal customers(:david), found_customer end + def test_hash_condition_find_with_aggregate_having_three_mapping_array + david_address = customers(:david).address + 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 + end + + def test_hash_condition_find_with_aggregate_having_one_mapping_array + david_balance = customers(:david).balance + zaphod_balance = customers(:zaphod).balance + assert_kind_of Money, david_balance + assert_kind_of Money, zaphod_balance + found_customers = Customer.where(balance: [david_balance, zaphod_balance]) + assert_equal [customers(:david), customers(:zaphod)], found_customers + end + def test_hash_condition_find_with_aggregate_attribute_having_same_name_as_field_and_key_value_being_aggregate gps_location = customers(:david).gps_location assert_kind_of GpsLocation, gps_location |