Skip to content

Commit 3e34643

Browse files
committed
Fix jdbc_paging_enabled config flag not being passed through
1 parent 23e6e3b commit 3e34643

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/logstash/plugin_mixins/jdbc/jdbc.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def execute_statement
244244
begin
245245
sql_last_value = @use_column_value ? @value_tracker.value : Time.now.utc
246246
@tracking_column_warning_sent = false
247-
@statement_handler.perform_query(@database, @value_tracker.value) do |row|
247+
@statement_handler.perform_query(@database, @value_tracker.value, @jdbc_paging_enabled, @jdbc_page_size) do |row|
248248
sql_last_value = get_column_value(row) if @use_column_value
249249
yield extract_values_from(row)
250250
end

lib/logstash/plugin_mixins/jdbc/statement_handler.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ class NormalStatementHandler < StatementHandler
2929
# @param db [Sequel::Database]
3030
# @param sql_last_value [Integet|DateTime|Time]
3131
# @yieldparam row [Hash{Symbol=>Object}]
32-
def perform_query(db, sql_last_value)
32+
def perform_query(db, sql_last_value, jdbc_paging_enabled, jdbc_page_size)
3333
query = build_query(db, sql_last_value)
34-
if @jdbc_paging_enabled
35-
query.each_page(@jdbc_page_size) do |paged_dataset|
34+
if jdbc_paging_enabled
35+
query.each_page(jdbc_page_size) do |paged_dataset|
3636
paged_dataset.each do |row|
3737
yield row
3838
end
@@ -74,7 +74,7 @@ class PreparedStatementHandler < StatementHandler
7474
# @param db [Sequel::Database]
7575
# @param sql_last_value [Integet|DateTime|Time]
7676
# @yieldparam row [Hash{Symbol=>Object}]
77-
def perform_query(db, sql_last_value)
77+
def perform_query(db, sql_last_value, jdbc_paging_enabled, jdbc_page_size)
7878
query = build_query(db, sql_last_value)
7979
query.each do |row|
8080
yield row

0 commit comments

Comments
 (0)