From b2c5ec234293813d16a65f73ee688a18900bf173 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 29 Jan 2018 16:48:52 +0900 Subject: 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] --- activerecord/lib/active_record/aggregations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') 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 # -- cgit v1.2.3