diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-06-07 20:02:49 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-06-07 20:02:49 +0100 |
| commit | 959fb8ea651fa6638aaa7caced20d921ca2ea5c1 (patch) | |
| tree | a9d1cea0486d309cf57f7c716f35e98d83a5f6c5 /activerecord/lib/active_record/associations/has_many_association.rb | |
| parent | 6b6c1de9f96d27af73371b1595c4b9ff76bb59bc (diff) | |
| download | rails-959fb8ea651fa6638aaa7caced20d921ca2ea5c1.tar.gz rails-959fb8ea651fa6638aaa7caced20d921ca2ea5c1.tar.bz2 rails-959fb8ea651fa6638aaa7caced20d921ca2ea5c1.zip | |
Revert "Perf: Don't load the association for #delete_all."
This reverts commit b98d1e21635d8776de8893cc09bd86c71f6c78f0.
Closes #6609
Conflicts:
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index e631579087..059e6c77bc 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -89,12 +89,8 @@ module ActiveRecord records.each { |r| r.destroy } update_counter(-records.length) unless inverse_updates_counter_cache? else - if records == :all - scope = scoped - else - keys = records.map { |r| r[reflection.association_primary_key] } - scope = scoped.where(reflection.association_primary_key => keys) - end + keys = records.map { |r| r[reflection.association_primary_key] } + scope = scoped.where(reflection.association_primary_key => keys) if method == :delete_all update_counter(-scope.delete_all) |