Rails 7.1 update (#25963)

2023-10-23 13:58:29 -04:00
parent 379115e601
commit e93a75f1a1
13 changed files with 122 additions and 89 deletions
--- a/lib/active_record/batches.rb
+++ b/lib/active_record/batches.rb
@@ -13,7 +13,7 @@ module ActiveRecord

      column_names.unshift(primary_key)

-      relation = relation.reorder(batch_order(order)).limit(batch_limit)
+      relation = relation.reorder(build_batch_orders(order).to_h).limit(batch_limit)
      relation.skip_query_cache!

      batch_relation = relation