aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-05-05 20:59:33 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-05-05 21:21:26 +0900
commitc16a4ca397fa1a61ba1b5481f232d66aad2c3a56 (patch)
treeb2d1ef6c37aa8f25d8801f0a48930643867e934e /activerecord
parent1dcf2800146f654065c697511dcbcea5c23c114a (diff)
downloadrails-c16a4ca397fa1a61ba1b5481f232d66aad2c3a56.tar.gz
rails-c16a4ca397fa1a61ba1b5481f232d66aad2c3a56.tar.bz2
rails-c16a4ca397fa1a61ba1b5481f232d66aad2c3a56.zip
do not pass conditions to `#destroy_all` [ci skip]
Passing conditions to `#destroy_all` was deprecated in c82c5f8.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/callbacks.rb4
-rw-r--r--activerecord/lib/active_record/relation/batches/batch_enumerator.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 1f1b11eb68..7c4f1b2bb3 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -54,8 +54,8 @@ module ActiveRecord
#
# class Firm < ActiveRecord::Base
# # Destroys the associated clients and people when the firm is destroyed
- # before_destroy { |record| Person.destroy_all "firm_id = #{record.id}" }
- # before_destroy { |record| Client.destroy_all "client_of = #{record.id}" }
+ # before_destroy { |record| Person.where("firm_id = #{record.id}").destroy_all }
+ # before_destroy { |record| Client.where("client_of = #{record.id}").destroy_all }
# end
#
# == Inheritable callback queues
diff --git a/activerecord/lib/active_record/relation/batches/batch_enumerator.rb b/activerecord/lib/active_record/relation/batches/batch_enumerator.rb
index 13393dc605..333b3a63cf 100644
--- a/activerecord/lib/active_record/relation/batches/batch_enumerator.rb
+++ b/activerecord/lib/active_record/relation/batches/batch_enumerator.rb
@@ -42,7 +42,7 @@ module ActiveRecord
# Delegates #delete_all, #update_all, #destroy_all methods to each batch.
#
# People.in_batches.delete_all
- # People.in_batches.destroy_all('age < 10')
+ # People.where('age < 10').in_batches.destroy_all
# People.in_batches.update_all('age = age + 1')
[:delete_all, :update_all, :destroy_all].each do |method|
define_method(method) do |*args, &block|