Extract `Relation#bind_attribute` for internal use

To make it easier to construct boundable predicate.

2 files changed, 11 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index e1cd5cbf29..a7523563e2 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -43,6 +43,12 @@ module ActiveRecord
       klass.arel_attribute(name, table)
     end
 
+    def bind_attribute(name, value) # :nodoc:
+      attr = arel_attribute(name)
+      bind = predicate_builder.build_bind_attribute(attr.name, value)
+      yield attr, bind
+    end
+
     # Initializes new record from relation while maintaining the current
     # scope.
     #
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb
index ec4bb06c57..9c579843b1 100644
--- a/activerecord/lib/active_record/relation/batches.rb
+++ b/activerecord/lib/active_record/relation/batches.rb
@@ -251,8 +251,9 @@ module ActiveRecord
           end
         end
 
-        bind = primary_key_bind(primary_key_offset)
-        batch_relation = relation.where(arel_attribute(primary_key).gt(bind))
+        batch_relation = relation.where(
+          bind_attribute(primary_key, primary_key_offset) { |attr, bind| attr.gt(bind) }
+        )
       end
     end
 
@@ -265,15 +266,11 @@ module ActiveRecord
       end
 
       def apply_start_limit(relation, start)
-        relation.where(arel_attribute(primary_key).gteq(primary_key_bind(start)))
+        relation.where(bind_attribute(primary_key, start) { |attr, bind| attr.gteq(bind) })
       end
 
       def apply_finish_limit(relation, finish)
-        relation.where(arel_attribute(primary_key).lteq(primary_key_bind(finish)))
-      end
-
-      def primary_key_bind(value)
-        predicate_builder.build_bind_attribute(primary_key, value)
+        relation.where(bind_attribute(primary_key, finish) { |attr, bind| attr.lteq(bind) })
       end
 
       def batch_order