diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-10-09 20:14:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-10-09 20:14:33 -0700 |
| commit | 269adaec211c41301271f02a597d1ed170deb717 (patch) | |
| tree | 6efcb3f6479cd07b8416332c11e6aef790923f14 /activerecord/lib/active_record | |
| parent | 1c534c6e429b6d5115153a8e83ae13e55d0ee1d3 (diff) | |
| parent | 9f3b8cd5a5e37583bf9356456a3fc1b3484f4294 (diff) | |
| download | rails-269adaec211c41301271f02a597d1ed170deb717.tar.gz rails-269adaec211c41301271f02a597d1ed170deb717.tar.bz2 rails-269adaec211c41301271f02a597d1ed170deb717.zip | |
Merge pull request #7859 from ernie/fix-collection-associations-with-select
Fix has_many assocation w/select load after create
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 96270ec0e9..7f39d3083e 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -414,7 +414,7 @@ module ActiveRecord persisted.map! do |record| if mem_record = memory.delete(record) - (record.attribute_names - mem_record.changes.keys).each do |name| + ((record.attribute_names & mem_record.attribute_names) - mem_record.changes.keys).each do |name| mem_record[name] = record[name] end |