TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove need for :all symbol

Browse Source 
Refactor delete_count method to only handle delete_all or nullify/nil cases
and not destroy and switch to if/else rather than case statement. This
refactoring allows removal of :all symbol usage.
This commit is contained in:
eileencodes 2014-05-12 14:01:19 -04:00
parent d8ae2764d0
commit 1c851b8cdf
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activerecord/lib/active_record/associations/has_many_association.rb
View File

@ -105,11 +105,8 @@ def inverse_updates_counter_cache?(reflection = reflection())
}
end
def delete_count(records, method, scope)
case method
when :destroy
records.length
when :delete_all
def delete_count(method, scope)
if method == :delete_all
scope.delete_all
else
scope.update_all(reflection.foreign_key => nil)
@ -117,23 +114,19 @@ def delete_count(records, method, scope)
end
def delete_all_records(method)
scope = self.scope
count = delete_count(:all, method, scope)
count = delete_count(method, self.scope)
update_counter(-count)
end
# Deletes the records according to the <tt>:dependent</tt> option.
def delete_records(records, method)
scope = self.scope.where(reflection.klass.primary_key => records)
count = delete_count(records, method, scope)
if method == :destroy
count = records.length
records.each(&:destroy!)
update_counter(-count) unless inverse_updates_counter_cache?
else
scope = self.scope.where(reflection.klass.primary_key => records)
count = delete_count(method, scope)
update_counter(-count)
end
end