diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-07 09:00:35 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-07 09:00:35 -0700 |
commit | 63861e0c9c88d9c3f97e5ca9f1a5da014e624f4e (patch) | |
tree | fa390158a893964be975c45cd40fa76dc547eb82 | |
parent | 6469560f2dc8ef4eae57477b4b506c9845c53f1a (diff) | |
parent | 2ca9b6dfab81c17bdad7d367c97e39c9ac25c075 (diff) | |
download | rails-63861e0c9c88d9c3f97e5ca9f1a5da014e624f4e.tar.gz rails-63861e0c9c88d9c3f97e5ca9f1a5da014e624f4e.tar.bz2 rails-63861e0c9c88d9c3f97e5ca9f1a5da014e624f4e.zip |
Merge pull request #1997 from knapo/master
Make `ActiveRecord::Batches#find_each` to not return `self`.
-rw-r--r-- | activerecord/lib/active_record/relation/batches.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/batches_test.rb | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb index d52b84179f..46ab67d1cf 100644 --- a/activerecord/lib/active_record/relation/batches.rb +++ b/activerecord/lib/active_record/relation/batches.rb @@ -20,8 +20,6 @@ module ActiveRecord find_in_batches(options) do |records| records.each { |record| yield record } end - - self end # Yields each batch of records that was found by the find +options+ as diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb index 6620464d6a..50ddf6c757 100644 --- a/activerecord/test/cases/batches_test.rb +++ b/activerecord/test/cases/batches_test.rb @@ -18,6 +18,13 @@ class EachTest < ActiveRecord::TestCase end end + def test_each_should_not_return_query_chain_and_execcute_only_one_query + assert_queries(1) do + result = Post.find_each(:batch_size => 100000){ } + assert_nil result + end + end + def test_each_should_raise_if_select_is_set_without_id assert_raise(RuntimeError) do Post.find_each(:select => :title, :batch_size => 1) { |post| post } |