Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/job-iteration/active_record_cursor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def initialize
end
end

def initialize(relation, columns = nil, position = nil)
def initialize(relation, columns = nil, position = nil, around_query = nil)
columns ||= "#{relation.table_name}.#{relation.primary_key}"
@columns = Array.wrap(columns)
self.position = Array.wrap(position)
Expand All @@ -33,6 +33,7 @@ def initialize(relation, columns = nil, position = nil)

@base_relation = relation.reorder(@columns.join(','))
@reached_end = false
@around_query = around_query
end

def <=>(other)
Expand Down Expand Up @@ -64,7 +65,11 @@ def next_batch(batch_size)
relation = relation.where(*conditions)
end

records = relation.to_a
records = if @around_query
@around_query.call { relation.to_a }
else
relation.to_a
end

update_from_record(records.last) unless records.empty?
@reached_end = records.size < batch_size
Expand Down
5 changes: 3 additions & 2 deletions lib/job-iteration/active_record_enumerator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ module JobIteration
class ActiveRecordEnumerator
SQL_DATETIME_WITH_NSEC = "%Y-%m-%d %H:%M:%S.%N"

def initialize(relation, columns: nil, batch_size: 100, cursor: nil)
def initialize(relation, columns: nil, batch_size: 100, cursor: nil, around_query: nil)
@relation = relation
@batch_size = batch_size
@columns = Array(columns || "#{relation.table_name}.#{relation.primary_key}")
@cursor = cursor
@around_query = around_query
end

def records
Expand Down Expand Up @@ -48,7 +49,7 @@ def cursor_value(record)
end

def finder_cursor
JobIteration::ActiveRecordCursor.new(@relation, @columns, @cursor)
JobIteration::ActiveRecordCursor.new(@relation, @columns, @cursor, @around_query)
end

def column_value(record, attribute)
Expand Down