logstash-input-jdbc 4.3.5 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f382c4428bc37a74fdfae0aac1a97eca218555266c01cb76a4c6f6de5e7e3ad1
-  data.tar.gz: 70d0027fac72146ee098c78f46c7bac8f3d8feb2139f9e6238eb44da1ba3de8f
+  metadata.gz: db57db7385391c5b71ad8e3918e2201d95266b2cc07229e25c24c13407b670bd
+  data.tar.gz: 59a3aa5b8ebdc0dfe720f24c47d7be493ffd1966078fa672aa950246edfd68c3
 SHA512:
-  metadata.gz: 471770e1b701221c9e0b5897c00313276a28f138a5831c9f1a027ca0655951115542a19edc32a4f4bbe634d9a96f969cc45e9d48d4269f72a1780ad6063b468b
-  data.tar.gz: af300cbd6b078c2d9efcfefc5482480a21e020708fd8e71036c234183dd81e734ab1775b69c9810f0f8e1d13d04dae485979b46857d8d7d773a533b9413b550b
+  metadata.gz: 391446d84ff005ca302cb7bd2a07b40c00e9fb75a870a5b9835e8b80b7f2b58fdaaa0527fcb03e3cb9704f3bbfbfdc6c1aad945da0afaef7a29d31391eb93114
+  data.tar.gz: 1ba8c5ccf76bee3a841b139c0fa8c162f549c3002ac47cbfa1a4e6422d3227ae59e4850af25fb441164a3467a766ee30ec03b75c5f88d6ebede7b200611e0afc

data/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.
 

data/lib/logstash/plugin_mixins/value_tracking.rb

@@ -69,6 +69,8 @@ module LogStash module PluginMixins
     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 @@ module LogStash module PluginMixins
     def set_value(value)
       if value.respond_to?(:to_time)
         @value = value.to_time
+      else
+        @value = DateTime.parse(value).to_time
       end
     end
   end

data/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"

data/spec/inputs/jdbc_spec.rb

@@ -259,6 +259,8 @@ describe LogStash::Inputs::Jdbc do
       end
 
       plugin.stop
+      runner.join
+      Timecop.return
     end
 
   end
@@ -739,6 +741,65 @@ describe LogStash::Inputs::Jdbc do
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.3.6
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement