1 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb
index 1c61e7d450..4649e3b376 100644
--- a/activerecord/lib/active_record/relation/batches.rb
+++ b/activerecord/lib/active_record/relation/batches.rb
@@ -67,11 +67,18 @@ module ActiveRecord
       relation = relation.except(:order).order(batch_order).limit(batch_size)
       records = relation.where(primary_key.gteq(start)).all
 
+      key_value = self.primary_key.name
+
       while records.any?
         yield records
 
         break if records.size < batch_size
-        records = relation.where(primary_key.gt(records.last.id)).all
+
+        last_value = records.last.send(key_value)
+
+        raise "You must include the primary key if you define a select" unless last_value.present?
+
+        records = relation.where(primary_key.gt(last_value)).all
       end
     end