diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-29 16:48:52 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-29 16:49:10 +0900 |
commit | b2c5ec234293813d16a65f73ee688a18900bf173 (patch) | |
tree | 442b9fdd67d1acb5ce754d7c882b96a40a9efe00 /activerecord | |
parent | a9c6c3a23ef71fb2bd26a1fdce1d8a1bca492c89 (diff) | |
download | rails-b2c5ec234293813d16a65f73ee688a18900bf173.tar.gz rails-b2c5ec234293813d16a65f73ee688a18900bf173.tar.bz2 rails-b2c5ec234293813d16a65f73ee688a18900bf173.zip |
Revert "Merge pull request #23256 from pauloancheta/master"
This reverts commit 755f7b58953c25790eea0574ff8928033ded2d88, reversing
changes made to 35db4603095e8ccc0a92d925a42d4b3d9462580f.
Originally `mapping: %w(balance amount)` is correct mapping example.
Closes #31346.
[Ryuta Kamizono & bogdanvlviv]
[ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/aggregations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index 30826c9ffa..a808a8a1ce 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -35,7 +35,7 @@ module ActiveRecord # the database). # # class Customer < ActiveRecord::Base - # composed_of :balance, class_name: "Money", mapping: %w(amount currency) + # composed_of :balance, class_name: "Money", mapping: %w(balance amount) # composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ] # end # |