From eb876c4d07130f15be2cac7be968cc393f959c62 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 21 Sep 2012 19:10:16 -0300 Subject: Revert "Fix find_in_batches with customized primary_key" This reverts commit 761bc751d31c22e2c2fdae2b4cdd435b68b6d783. This commit wasn't fixing any issue just using the same table for different models with different primary keys. --- activerecord/test/cases/batches_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'activerecord/test/cases') diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb index 3b4ff83725..78d89aa232 100644 --- a/activerecord/test/cases/batches_test.rb +++ b/activerecord/test/cases/batches_test.rb @@ -125,14 +125,18 @@ class EachTest < ActiveRecord::TestCase end def test_find_in_batches_should_use_any_column_as_primary_key + old_primary_key = Post.primary_key + Post.primary_key = :title title_order_posts = Post.order('title asc') start_title = title_order_posts.first.title posts = [] - PostWithTitlePrimaryKey.find_in_batches(:batch_size => 1, :start => start_title) do |batch| + Post.find_in_batches(:batch_size => 1, :start => start_title) do |batch| posts.concat(batch) end assert_equal title_order_posts.map(&:id), posts.map(&:id) + ensure + Post.primary_key = old_primary_key end end -- cgit v1.2.3