Merge pull request #289 from packrat386/fix_condition_not_supported_r…

…aise Fix ConditionNotSupportedError raise
Shopify · Oct 26, 2022 · 5e0147f · 5e0147f
2 parents 57b9c0e + 0914072
commit 5e0147f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/job-iteration/active_record_batch_enumerator.rb b/lib/job-iteration/active_record_batch_enumerator.rb
@@ -26,7 +26,7 @@ def initialize(relation, columns: nil, batch_size: 100, cursor: nil)
       end
 
       if relation.arel.orders.present? || relation.arel.taken.present?
-        raise ConditionNotSupportedError
+        raise JobIteration::ActiveRecordCursor::ConditionNotSupportedError
       end
 
       @base_relation = relation.reorder(@columns.join(","))

diff --git a/test/unit/active_record_batch_enumerator_test.rb b/test/unit/active_record_batch_enumerator_test.rb
@@ -125,6 +125,12 @@ class ActiveRecordBatchEnumeratorTest < IterationUnitTest
       assert_equal expected_num_queries, queries.size
     end
 
+    test "enumerator will raise ConditionNotSupportedError if the relation is ordered" do
+      assert_raise(JobIteration::ActiveRecordCursor::ConditionNotSupportedError) do
+        build_enumerator(relation: Product.order(created_at: :desc))
+      end
+    end
+
     private
 
     def build_enumerator(relation: Product.all, batch_size: 2, columns: nil, cursor: nil)