diff options
| author | Jakub Kuźma <qoobaa@gmail.com> | 2011-12-21 15:28:24 +0100 |
|---|---|---|
| committer | Jakub Kuźma <qoobaa@gmail.com> | 2011-12-21 21:10:15 +0100 |
| commit | 1ad0a5363bcf44da9ed51e30c5c47a83c3516c24 (patch) | |
| tree | 1c1a9464c3e7f58e812c0cb1352f58d68fce4ae9 /activerecord/lib/active_record/associations | |
| parent | 618cb4429191290b957391c314a55b4d59f381f3 (diff) | |
| download | rails-1ad0a5363bcf44da9ed51e30c5c47a83c3516c24.tar.gz rails-1ad0a5363bcf44da9ed51e30c5c47a83c3516c24.tar.bz2 rails-1ad0a5363bcf44da9ed51e30c5c47a83c3516c24.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
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -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 |