aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_many_association.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-12-04 14:33:31 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-12-04 14:33:31 +0900
commit4d7354aa352b94ec3a10ad053cff04890c534080 (patch)
treeacba17f5b5c2a65d61ee6dcee06d82d742491ecb /activerecord/lib/active_record/associations/has_many_association.rb
parent6ca6478a67ecdff58c29d10cd408b7259ed89e2b (diff)
downloadrails-4d7354aa352b94ec3a10ad053cff04890c534080.tar.gz
rails-4d7354aa352b94ec3a10ad053cff04890c534080.tar.bz2
rails-4d7354aa352b94ec3a10ad053cff04890c534080.zip
Ensure that `delete_all` on collection proxy returns affected count
Unlike the `Relation#delete_all`, `delete_all` on collection proxy doesn't return affected count. Since the `CollectionProxy` is a subclass of the `Relation`, this inconsistency is probably not intended, so it should return the count consistently.
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_many_association.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index e224d3456a..f6fdbcde54 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -99,6 +99,7 @@ module ActiveRecord
def delete_or_nullify_all_records(method)
count = delete_count(method, scope)
update_counter(-count)
+ count
end
# Deletes the records according to the <tt>:dependent</tt> option.