Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix find_in_batches against string IDs when start option is not speci…

…fied.

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/batches.rb
  • Loading branch information...
commit 16d98b2a41dec3619b9bd48b6b534406d9d07ef4 1 parent 7031e36
Alexis Bernard authored
View
4 activerecord/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 3.2.9 (unreleased)
+* Fix `find_in_batches` crashing when IDs are strings and start option is not specified.
+
+ *Alexis Bernard*
+
* Fix issue with collection associations calling first(n)/last(n) and attempting
to set the inverse association when `:inverse_of` was used. Fixes #8087.
View
4 activerecord/lib/active_record/relation/batches.rb
@@ -59,11 +59,11 @@ def find_in_batches(options = {})
relation = apply_finder_options(finder_options)
end
- start = options.delete(:start) || 0
+ start = options.delete(:start)
batch_size = options.delete(:batch_size) || 1000
relation = relation.reorder(batch_order).limit(batch_size)
- records = relation.where(table[primary_key].gteq(start)).all
+ records = start ? relation.where(table[primary_key].gteq(start)).to_a : relation.to_a
while records.any?
records_size = records.size
View
9 activerecord/test/cases/batches_test.rb
@@ -148,4 +148,13 @@ def test_find_in_batches_should_use_any_column_as_primary_key
assert_equal nick_order_subscribers[1..-1].map(&:id), subscribers.map(&:id)
end
+
+ def test_find_in_batches_should_use_any_column_as_primary_key_when_start_is_not_specified
+ Subscriber.count('nick') # preheat arel's table cache
+ assert_queries(Subscriber.count + 1) do
+ Subscriber.find_each(:batch_size => 1) do |subscriber|
+ assert_kind_of Subscriber, subscriber
+ end
+ end
+ end
end

0 comments on commit 16d98b2

Please sign in to comment.
Something went wrong with that request. Please try again.