logstash-input-jdbc 4.3.9 → 4.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b3729c8e7d700220f5bd8f8c537909129fd3f4b10190429d62e7a8168530028
-  data.tar.gz: fe829c225a4dbee8872269e59ca07d61b9d907092eec1c8472d1c6e6e447592d
+  metadata.gz: d9e1072279ad555d69710d66bc23f5d6af1d5492998c6a2a30edb8dea03bb402
+  data.tar.gz: 03ca8379b772ef0a4b5d8693fbcee2adbe3c2226922f19e38c2f70e0b02d573e
 SHA512:
-  metadata.gz: 1e1fef88ac0a342a88a3b2986e38c280f0de510964abe8caa22a955d3befee3276e24dcb4d63b1ace6f5ec35ab633ec1e857f74114677fe7b67562faa4f4840c
-  data.tar.gz: 601ae42f004b530346dcafb7da654b20df633cc8fa12a6ef997c5d3d4184221820374533eab740436c753f9fe7036aa48c41cf892c4d07d1cad01da424e62ff5
+  metadata.gz: 151670dbc5de220c1c68eef6b723a2c49a1fa93f19efe97a6286c0968309ea53bb57be19e0a46a359c094ce6ce8a69a3cc78213f9884f67fec6477622bc70c94
+  data.tar.gz: 19929d6d094038af8405cb019de5032cc470ab312ffe3e495f47c193ee066f87fd9fdae7dcb79f8fd6b1a0fc27db1450e876bce8b0437c9e35706059d726b8dd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.3.11
+  - Fixed crash that occurs when receiving string input that cannot be coerced to UTF-8 (such as BLOB data) [#291](https://github.com/logstash-plugins/logstash-input-jdbc/pull/291)
+
+## 4.3.10
+  - [#284](https://github.com/logstash-plugins/logstash-input-jdbc/pull/284) Swap out mysql for postgresql for testing
+
 ## 4.3.9
   - Docs: Set the default_codec doc attribute.
 

data/lib/logstash/inputs/jdbc.rb

@@ -230,11 +230,14 @@ class LogStash::Inputs::Jdbc < LogStash::Inputs::Base
     @jdbc_password = LogStash::Util::Password.new(File.read(@jdbc_password_filepath).strip) if @jdbc_password_filepath
 
     if enable_encoding?
-      @converters = {}
-      @columns_charset.each do |column_name, encoding|
-        @converters[encoding] = LogStash::Util::Charset.new(encoding)
+      encodings = @columns_charset.values
+      encodings << @charset if @charset
+
+      @converters = encodings.each_with_object({}) do |encoding, converters|
+        converter = LogStash::Util::Charset.new(encoding)
+        converter.logger = self.logger
+        converters[encoding] = converter
       end
-      @converters[@charset] = LogStash::Util::Charset.new(@charset) if @charset
     end
   end # def register
 

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '4.3.9'
+  s.version         = '4.3.11'
   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"
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'jdbc-derby'
-  s.add_development_dependency 'jdbc-mysql'
+  s.add_development_dependency 'jdbc-postgres'
 end

data/spec/inputs/jdbc_spec.rb

@@ -2,8 +2,8 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/jdbc"
 require "jdbc/derby"
-require "jdbc/mysql"
-Jdbc::MySQL.load_driver
+require 'jdbc/postgres'
+Jdbc::Postgres.load_driver
 require "sequel"
 require "sequel/adapters/jdbc"
 require "timecop"
@@ -99,8 +99,8 @@ describe LogStash::Inputs::Jdbc do
   context "when connecting to a non-existent server", :no_connection => true do
     let(:mixin_settings) do
       super.merge(
-        "jdbc_driver_class" => "com.mysql.jdbc.Driver",
-        "jdbc_connection_string" => "jdbc:mysql://localhost:99999/somedb"
+        "jdbc_driver_class" => "org.postgresql.Driver",
+        "jdbc_connection_string" => "jdbc:postgresql://localhost:65000/somedb"
       )
     end
     let(:settings) { super.merge("statement" => "SELECT 1 as col1 FROM test_table", "jdbc_user" => "foo", "jdbc_password" => "bar") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 4.3.9
+  version: 4.3.11
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: jdbc-mysql
+  name: jdbc-postgres
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Creates events from JDBC data