Fix regression with 4.3.5 that can result in NULL :sql_last_value depending on timestamp format

fixes #274

Fixes #275

Author: jakelandis

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.3.6
+  - [#274](https://github.com/logstash-plugins/logstash-input-jdbc/issues/274) Fix regression with 4.3.5 that can result in NULL :sql_last_value depending on timestamp format
+  
 ## 4.3.5
   - [#140](https://github.com/logstash-plugins/logstash-input-jdbc/issues/140) Fix long standing bug where setting jdbc_default_timezone loses milliseconds. Force all usage of sql_last_value to be typed according to the settings.
 

lib/logstash/plugin_mixins/value_tracking.rb

@@ -69,6 +69,8 @@ def get_initial
     def set_value(value)
       if value.respond_to?(:to_datetime)
         @value = value.to_datetime
+      else
+        @value = DateTime.parse(value)
       end
     end
   end
@@ -81,6 +83,8 @@ def get_initial
     def set_value(value)
       if value.respond_to?(:to_time)
         @value = value.to_time
+      else
+        @value = DateTime.parse(value).to_time
       end
     end
   end

logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '4.3.5'
+  s.version         = '4.3.6'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Creates events from JDBC data"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

spec/inputs/jdbc_spec.rb

@@ -739,6 +739,65 @@
     end
   end
 
+  context "when previous runs are to be respected upon successful query execution (by time string)" do
+
+    let(:settings) do
+      { "statement" => "SELECT custom_time FROM test_table WHERE custom_time > :sql_last_value",
+        "use_column_value" => true,
+        "tracking_column" => "custom_time",
+        "tracking_column_type" => "timestamp",
+        "last_run_metadata_path" => Stud::Temporary.pathname }
+    end
+
+    let(:last_run_time) { '2010-03-19T14:48:40.483Z' }
+
+    before do
+      File.write(settings["last_run_metadata_path"], YAML.dump(last_run_time))
+      test_table = db[:test_table]
+      test_table.insert(:num => 0, :custom_time => Time.now.utc)
+      plugin.register
+    end
+
+    after do
+      plugin.stop
+    end
+
+    it "should respect last run metadata" do
+      plugin.run(queue)
+      expect(plugin.instance_variable_get("@value_tracker").value).to be > DateTime.parse(last_run_time).to_time
+    end
+  end
+
+  context "when previous runs are to be respected upon successful query execution (by date/time string)" do
+
+    let(:settings) do
+      { "statement" => "SELECT custom_time FROM test_table WHERE custom_time > :sql_last_value",
+        "use_column_value" => true,
+        "tracking_column" => "custom_time",
+        "tracking_column_type" => "timestamp",
+        "jdbc_default_timezone" => "UTC", #this triggers the last_run_time to be treated as date/time
+        "last_run_metadata_path" => Stud::Temporary.pathname }
+    end
+
+    let(:last_run_time) { '2010-03-19T14:48:40.483Z' }
+
+    before do
+      File.write(settings["last_run_metadata_path"], YAML.dump(last_run_time))
+      test_table = db[:test_table]
+      test_table.insert(:num => 0, :custom_time => Time.now.utc)
+      plugin.register
+    end
+
+    after do
+      plugin.stop
+    end
+
+    it "should respect last run metadata" do
+      plugin.run(queue)
+      expect(plugin.instance_variable_get("@value_tracker").value).to be > DateTime.parse(last_run_time)
+    end
+  end
+
   context "when previous runs are to be respected upon successful query execution (by column)" do
 
     let(:settings) do