job-iteration 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdace86b05a5a1d98777e2310d85d75679073ca63b5e52b0e83bd000891198cf
-  data.tar.gz: 4ed5b475931e24bf56d2b8b126bd9354064c438d0ea16f67c10276fb92ccd97b
+  metadata.gz: b07cecd2f672db0710d7e756d1de20db69581ba98bd46109c0023dd8d991ad76
+  data.tar.gz: 598a4a368abc83bd4765aebf61b205592675d76b544806f4458ecec9779005b1
 SHA512:
-  metadata.gz: cf9d7a54a8881146a4a0a1750e99dddf8d32c9db3339411fc61c8477a89f5766e9bb99f493257e4484d56e18ef443cb6a2a0300958342774d2e7ebd2b3e23c32
-  data.tar.gz: 966c39a5e89ae26343e07000111ba582724b85b4bf9b7a17f790a10b679e297dca94105d3fb42830f987498fb8982037c80cf3e8130b8bede845f9c7532ade41
+  metadata.gz: 61cda3903925247899c9051d5de5fac59c9cd36f94172e124e2085174aff5be0677011693018096710a8149582c1589662a1359bb11b0bbdea3c9b7c53916946
+  data.tar.gz: 3773b812a06b4f5700abf4d3c44b65d5aae412545825091c895e294862ca4290aa87b83b7e59a182085fea60d939035f68f2f11ef7ab173c7968cb6cfdff7fd3

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ### Main (unreleased)
 Nil
 
+## v1.5.1 (May 29,2024)
+- [483](https://github.com/Shopify/job-iteration/pull/483) Reverts [#456 Use Arel instead of String for AR Enumerator conditionals](https://github.com/Shopify/job-iteration/pull/456)
+
 ## v1.5.0 (May 29, 2024)
 ### Changes
 

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    job-iteration (1.5.0)
+    job-iteration (1.5.1)
       activejob (>= 5.2)
 
 GEM

data/lib/job-iteration/active_record_cursor.rb

@@ -18,8 +18,12 @@ module JobIteration
       end
     end
 
-    def initialize(relation, columns, position = nil)
-      @columns = columns
+    def initialize(relation, columns = nil, position = nil)
+      @columns = if columns
+        Array(columns)
+      else
+        Array(relation.primary_key).map { |pk| "#{relation.table_name}.#{pk}" }
+      end
       self.position = Array.wrap(position)
       raise ArgumentError, "Must specify at least one column" if columns.empty?
       if relation.joins_values.present? && !@columns.all? { |column| column.to_s.include?(".") }
@@ -30,7 +34,7 @@ module JobIteration
         raise ConditionNotSupportedError
       end
 
-      @base_relation = relation.reorder(*@columns)
+      @base_relation = relation.reorder(@columns.join(","))
       @reached_end = false
     end
 
@@ -50,10 +54,12 @@ module JobIteration
 
     def update_from_record(record)
       self.position = @columns.map do |column|
-        if ActiveRecord.version >= Gem::Version.new("7.1.0.alpha") && column.name == "id"
+        method = column.to_s.split(".").last
+
+        if ActiveRecord.version >= Gem::Version.new("7.1.0.alpha") && method == "id"
           record.id_value
         else
-          record.send(column.name)
+          record.send(method.to_sym)
         end
       end
     end
@@ -83,14 +89,14 @@ module JobIteration
       i = @position.size - 1
       column = @columns[i]
       conditions = if @columns.size == @position.size
-        column.gt(@position[i])
+        "#{column} > ?"
       else
-        column.gteq(@position[i])
+        "#{column} >= ?"
       end
       while i > 0
         i -= 1
         column = @columns[i]
-        conditions = column.gt(@position[i]).or(column.eq(@position[i]).and(conditions))
+        conditions = "#{column} > ? OR (#{column} = ? AND (#{conditions}))"
       end
       ret = @position.reduce([conditions]) { |params, value| params << value << value }
       ret.pop

data/lib/job-iteration/active_record_enumerator.rb

@@ -11,9 +11,9 @@ module JobIteration
       @relation = relation
       @batch_size = batch_size
       @columns = if columns
-        Array(columns).map { |col| relation.arel_table[col.to_sym] }
+        Array(columns)
       else
-        Array(relation.primary_key).map { |pk| relation.arel_table[pk.to_sym] }
+        Array(relation.primary_key).map { |pk| "#{relation.table_name}.#{pk}" }
       end
       @cursor = cursor
     end
@@ -45,7 +45,7 @@ module JobIteration
 
     def cursor_value(record)
       positions = @columns.map do |column|
-        attribute_name = column.name.to_sym
+        attribute_name = column.to_s.split(".").last
         column_value(record, attribute_name)
       end
       return positions.first if positions.size == 1
@@ -58,8 +58,8 @@ module JobIteration
     end
 
     def column_value(record, attribute)
-      value = record.read_attribute(attribute)
-      case record.class.columns_hash.fetch(attribute.to_s).type
+      value = record.read_attribute(attribute.to_sym)
+      case record.class.columns_hash.fetch(attribute).type
       when :datetime
         value.strftime(SQL_DATETIME_WITH_NSEC)
       else

data/lib/job-iteration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JobIteration
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Shopify