diff options
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 85a4f47b7d..59e6e00ad1 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -99,7 +99,6 @@ module ActiveRecord else add_to_target(build_record(attributes, options)) do |record| yield(record) if block_given? - set_owner_attributes(record) end end end @@ -423,7 +422,10 @@ module ActiveRecord end def build_record(attributes, options) - reflection.build_association(scoped.scope_for_create.merge(attributes || {}), options) + record = reflection.build_association + record.assign_attributes(scoped.scope_for_create, :without_protection => true) + record.assign_attributes(attributes || {}, options) + record end def delete_or_destroy(records, method) |