aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAlexis Bernard <alexis@obloh.com>2012-10-30 15:54:16 +0100
committerAlexis Bernard <alexis@obloh.com>2012-10-31 15:39:24 +0100
commita58cafeb3a86be46849de57481b6644094fb8165 (patch)
tree25e5f33cc12853e6bb522538951319470b484c01 /activerecord/lib
parent6a6909dc2940ac0a6d3536fdac96bdce55a18023 (diff)
downloadrails-a58cafeb3a86be46849de57481b6644094fb8165.tar.gz
rails-a58cafeb3a86be46849de57481b6644094fb8165.tar.bz2
rails-a58cafeb3a86be46849de57481b6644094fb8165.zip
Fix find_in_batches against string IDs when start option is not specified.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/batches.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb
index 8af0c6a8ef..b921f2eddb 100644
--- a/activerecord/lib/active_record/relation/batches.rb
+++ b/activerecord/lib/active_record/relation/batches.rb
@@ -62,11 +62,11 @@ module ActiveRecord
ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
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)).to_a
+ records = start ? relation.where(table[primary_key].gteq(start)).to_a : relation.to_a
while records.any?
records_size = records.size