logstash-input-jdbc 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c5cc2740af8903f9a22ea46ab992cbee6d8c86
-  data.tar.gz: 1c2773a7b4d978204b86285e5b4742d7f2804af5
+  metadata.gz: 6fcc8b3eaba96543efed3777360fd0af48db6bae
+  data.tar.gz: 6c87821ec96f4df83b055f5510b03ec2e5bba48f
 SHA512:
-  metadata.gz: a39e30c007c31f3827e15e912cdeb3ab89487ab134edbd2269846892d0d6a6c3f6d3676ca8ea60da72a66e43991c3f06dd5ce57e3ee729f7fc301aa20d7e1766
-  data.tar.gz: ae1ca16f36749b62223dd9e56a627909eb0cb094d410840a2eec97d73db581eb06a9b7da81ca8779ac42f03d7b717f80ba650e4f76246d17221e32795605a1e9
+  metadata.gz: 38f419423f8fe7d82988049061049b6ff1af9c099e6af124da46aa4d1957076382c6fef6b49f461e83ffe9c562fe0f7e3df3ddeda08c9e786cf2057fda2aede2
+  data.tar.gz: 1d068d7aa44690298e49fe8ce926bc67c1663970cb10418d8d27f4879a8932dbc7c5027f84a295222906f90a8aa799b4f75838fa76dbed6e79ecc8dc1bca1885

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.5
+  - [#77](https://github.com/logstash-plugins/logstash-input-jdbc/issues/77) Time represented as RubyTime and not as Logstash::Timestamp
+
 ## 2.0.4
   - [#70](https://github.com/logstash-plugins/logstash-input-jdbc/pull/70) prevents multiple queries from being run at the same time
   - [#69](https://github.com/logstash-plugins/logstash-input-jdbc/pull/69) pass password as string to Sequel

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -23,7 +23,9 @@ module LogStash::PluginMixins::Jdbc
     # If not provided, Plugin will look for the driver class in the Logstash Java classpath.
     config :jdbc_driver_library, :validate => :path
 
-    # JDBC driver class to load, for example "oracle.jdbc.OracleDriver" or "org.apache.derby.jdbc.ClientDriver"
+    # JDBC driver class to load, for exmaple, "org.apache.derby.jdbc.ClientDriver"
+    # NB per https://github.com/logstash-plugins/logstash-input-jdbc/issues/43 if you are using
+    # the Oracle JDBC driver (ojdbc6.jar) the correct `jdbc_driver_class` is `"Java::oracle.jdbc.driver.OracleDriver"`
     config :jdbc_driver_class, :validate => :string, :required => true
 
     # JDBC connection string
@@ -141,14 +143,12 @@ module LogStash::PluginMixins::Jdbc
       if @jdbc_paging_enabled
         query.each_page(@jdbc_page_size) do |paged_dataset|
           paged_dataset.each do |row|
-            #Stringify row keys
-            yield Hash[row.map { |k, v| [k.to_s, v] }]
+            yield extract_values_from(row)
           end
         end
       else
         query.each do |row|
-          #Stringify row keys
-          yield Hash[row.map { |k, v| [k.to_s, v] }]
+          yield extract_values_from(row)
         end
       end
       success = true
@@ -171,4 +171,20 @@ module LogStash::PluginMixins::Jdbc
       hash
     end
   end
+
+  private
+  #Stringify row keys and decorate values when necessary
+  def extract_values_from(row)
+    Hash[row.map { |k, v| [k.to_s, decorate_value(v)] }]
+  end
+
+  private
+  def decorate_value(value)
+    if value.is_a?(Time)
+      # transform it to LogStash::Timestamp as required by LS
+      LogStash::Timestamp.new(value)
+    else
+      value  # no-op
+    end
+  end
 end

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '2.0.4'
+  s.version         = '2.0.5'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This example input streams a string at a definable interval."
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/jdbc_spec.rb

@@ -19,7 +19,8 @@ describe LogStash::Inputs::Jdbc do
     Jdbc::Derby.load_driver
     db.create_table :test_table do
       DateTime :created_at
-      Integer :num
+      Integer  :num
+      DateTime :custom_time
     end
   end
 
@@ -96,7 +97,7 @@ describe LogStash::Inputs::Jdbc do
     let(:settings) do
       {
         "statement" => "SELECT :num_param as num_param FROM SYSIBM.SYSDUMMY1",
-        "parameters" => {"num_param" => 10}
+        "parameters" => { "num_param" => 10}
       }
     end
 
@@ -159,7 +160,7 @@ describe LogStash::Inputs::Jdbc do
 
     it "should fetch all rows" do
       num_rows.times do
-        db[:test_table].insert(:num => 1, :created_at => Time.now.utc)
+        db[:test_table].insert(:num => 1, :custom_time => Time.now.utc, :created_at => Time.now.utc)
       end
 
       plugin.run(queue)
@@ -169,6 +170,35 @@ describe LogStash::Inputs::Jdbc do
 
   end
 
+  context "when fetching time data" do
+
+    let(:settings) do
+      {
+        "statement" => "SELECT * from test_table",
+      }
+    end
+
+    let(:num_rows) { 10 }
+
+    before do
+      num_rows.times do
+        db[:test_table].insert(:num => 1, :custom_time => Time.now.utc, :created_at => Time.now.utc)
+      end
+
+      plugin.register
+    end
+
+    after do
+      plugin.stop
+    end
+
+    it "should convert it to LogStash::Timestamp " do
+      plugin.run(queue)
+      event = queue.pop
+      expect(event["custom_time"]).to be_a(LogStash::Timestamp)
+    end
+  end
+
   context "when iteratively running plugin#run" do
     let(:settings) do
       {"statement" => "SELECT num, created_at FROM test_table WHERE created_at > :sql_last_start"}
@@ -289,7 +319,7 @@ describe LogStash::Inputs::Jdbc do
 
     before do
       num_rows.times do
-        db[:test_table].insert(:num => 1, :created_at => Time.now.utc)
+        db[:test_table].insert(:num => 1, :custom_time => Time.now.utc, :created_at => Time.now.utc)
       end
 
       plugin.register

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core