Make Model.destroy_all use new finders

2 files changed, 3 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 0d3ae1ef3e..a3b123c463 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -914,7 +914,7 @@ module ActiveRecord #:nodoc:
       #   Person.destroy_all("last_login < '2004-04-04'")
       #   Person.destroy_all(:status => "inactive")
       def destroy_all(conditions = nil)
-        find(:all, :conditions => conditions).each { |object| object.destroy }
+        where(conditions).each {|object| object.destroy }
       end
 
       # Deletes the records matching +conditions+ without instantiating the records first, and hence not
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index e52c7c3dc6..bec9a88297 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -88,6 +88,8 @@ module ActiveRecord
     end
 
     def where(*args)
+      return create_new_relation if args.blank?
+
       if [String, Hash, Array].include?(args.first.class)
         conditions = @klass.send(:merge_conditions, args.size > 1 ? Array.wrap(args) : args.first)
       else