aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/singular_association.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-06-30 22:41:18 +0100
committerJon Leighton <j@jonathanleighton.com>2011-06-30 23:39:58 +0100
commit0e225ec583db523a8b7da332eaf689149ed60447 (patch)
treebb18c8a7b672eb7545c36daba2aba2c0a3ce46c0 /activerecord/lib/active_record/associations/singular_association.rb
parent6a283d598f243197375266c8b981b66f1b5f10c5 (diff)
downloadrails-0e225ec583db523a8b7da332eaf689149ed60447.tar.gz
rails-0e225ec583db523a8b7da332eaf689149ed60447.tar.bz2
rails-0e225ec583db523a8b7da332eaf689149ed60447.zip
Assign the association attributes to the associated record before the before_initialize callback of the record runs. Fixes #1842.
Diffstat (limited to 'activerecord/lib/active_record/associations/singular_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/singular_association.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index ce1f2a5543..6b010064d5 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -26,8 +26,7 @@ module ActiveRecord
end
def build(attributes = {}, options = {})
- record = reflection.build_association(attributes, options)
- record.assign_attributes(create_scope.except(*record.changed), :without_protection => true)
+ record = build_record(attributes, options)
yield(record) if block_given?
set_new_record(record)
record