Skip to content
Browse files

Merge pull request #10992 from Empact/find-each-enumerator

When .find_each is called without a block, return an Enumerator.
  • Loading branch information...
2 parents 755069e + 2504235 commit 840c552047a660d0a66883fb9c0cb144d5e728fb @carlosantoniodasilva carlosantoniodasilva committed
View
5 activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* `find_each` now returns an `Enumerator` when called without a block, so that it
+ can be chained with other `Enumerable` methods.
+
+ *Ben Woosley*
+
* `ActiveRecord::Result.each` now returns an `Enumerator` when called without
a block, so that it can be chained with other `Enumerable` methods.
View
15 activerecord/lib/active_record/relation/batches.rb
@@ -19,6 +19,13 @@ module Batches
# person.party_all_night!
# end
#
+ # If you do not provide a block to #find_each, it will return an Enumerator
+ # for chaining with other methods:
+ #
+ # Person.find_each.with_index do |person, index|
+ # person.award_trophy(index + 1)
+ # end
+ #
# ==== Options
# * <tt>:batch_size</tt> - Specifies the size of the batch. Default to 1000.
# * <tt>:start</tt> - Specifies the starting point for the batch processing.
@@ -40,8 +47,12 @@ module Batches
# NOTE: You can't set the limit either, that's used to control
# the batch sizes.
def find_each(options = {})
- find_in_batches(options) do |records|
- records.each { |record| yield record }
+ if block_given?
+ find_in_batches(options) do |records|
+ records.each { |record| yield record }
+ end
+ else
+ enum_for :find_each, options
end
end
View
18 activerecord/test/cases/batches_test.rb
@@ -26,6 +26,24 @@ def test_each_should_not_return_query_chain_and_execute_only_one_query
end
end
+ def test_each_should_return_an_enumerator_if_no_block_is_present
+ assert_queries(1) do
+ Post.find_each(:batch_size => 100000).with_index do |post, index|
+ assert_kind_of Post, post
+ assert_kind_of Integer, index
+ end
+ end
+ end
+
+ def test_each_enumerator_should_execute_one_query_per_batch
+ assert_queries(@total + 1) do
+ Post.find_each(:batch_size => 1).with_index do |post, index|
+ assert_kind_of Post, post
+ assert_kind_of Integer, index
+ end
+ end
+ end
+
def test_each_should_raise_if_select_is_set_without_id
assert_raise(RuntimeError) do
Post.select(:title).find_each(:batch_size => 1) { |post| post }

0 comments on commit 840c552

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