aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-28 20:10:35 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-28 20:10:35 -0700
commit7763cff2981757ab6a4d5796c1d17b98a2f57f0a (patch)
tree7ba0d6f3985137885ebe3dacb55e5a9a2977cdd1 /activerecord/lib
parentb7b319ec758ae5cd9394e87390813f7bd55e1787 (diff)
parent748daa39610585829cdd52810870adf8e8711bfc (diff)
downloadrails-7763cff2981757ab6a4d5796c1d17b98a2f57f0a.tar.gz
rails-7763cff2981757ab6a4d5796c1d17b98a2f57f0a.tar.bz2
rails-7763cff2981757ab6a4d5796c1d17b98a2f57f0a.zip
Merge pull request #14899 from eileencodes/fix-delete-all-with-nil-dependency-to-not-produce-in-statement
Fix delete all with nil (:nullify) dependency to not produce in statement
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 9bf253d976..1c84973920 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -252,10 +252,10 @@ module ActiveRecord
end
def delete_all_with_dependency(dependent)
- if dependent == :delete_all
- delete_records(:all, dependent)
- else
+ if dependent == :destroy
delete_or_destroy(load_target, dependent)
+ else
+ delete_records(:all, dependent)
end
end