Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

move code out to active_record_deprecated_finders

  • Loading branch information...
commit 3bc3dd8cbea1d4eade1d3bd95f7a67b3bffac3ac 1 parent 2ffba0a
Jon Leighton jonleighton authored committed
Showing with 2 additions and 7 deletions.
  1. +2 −7 activerecord/lib/active_record/relation/batches.rb
9 activerecord/lib/active_record/relation/batches.rb
View
@@ -46,19 +46,14 @@ def find_each(options = {})
# group.each { |person| person.party_all_night! }
# end
def find_in_batches(options = {})
+ options.assert_valid_keys(:start, :batch_size)
+
relation = self
unless arel.orders.blank? && arel.taken.blank?
ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
end
- if (finder_options = options.except(:start, :batch_size)).present?
- raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order].present?
- raise "You can't specify a limit, it's forced to be the batch_size" if options[:limit].present?
-
- relation = apply_finder_options(finder_options)
- end
-
start = options.delete(:start).to_i
batch_size = options.delete(:batch_size) || 1000
Please sign in to comment.
Something went wrong with that request. Please try again.