diff options
| author | Jakub Kuźma <qoobaa@gmail.com> | 2011-12-21 15:28:24 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 21:17:06 +0100 |
| commit | 2d07c60b684a7082fa5dc052c9f965adcda1cb75 (patch) | |
| tree | caf3ac9882e41973883cd94ecef15887b186063f /activerecord/lib/active_record | |
| parent | 108e34466c57b2b4cce0c5b58239bc99c37a5150 (diff) | |
| download | rails-2d07c60b684a7082fa5dc052c9f965adcda1cb75.tar.gz rails-2d07c60b684a7082fa5dc052c9f965adcda1cb75.tar.bz2 rails-2d07c60b684a7082fa5dc052c9f965adcda1cb75.zip | |
added failing tests for has_many, has_one and belongs_to associations with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/association.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 861dda618a..7887d59aad 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -230,13 +230,8 @@ module ActiveRecord end def build_record(attributes, options) - attributes = (attributes || {}).reverse_merge(creation_attributes) - reflection.build_association(attributes, options) do |record| - record.assign_attributes( - create_scope.except(*record.changed), - :without_protection => true - ) + record.assign_attributes(create_scope.except(*record.changed), :without_protection => true) end end end |