fluent-plugin-sql 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd8d34b2d5c4981aeedac525be4dc5e15e99e1b
-  data.tar.gz: f8a552edbc257cb4b42260f61ba3841313bdbead
+  metadata.gz: 23ecce81f2ec2830716c45445688e709d0b16cf4
+  data.tar.gz: 0fd2ea1be49a7a67428727138840905a932db1d0
 SHA512:
-  metadata.gz: 79cdfb604242c0740840e521f8ba3e3f0da3cb32bb5b629a5355971298461b748e81b5d9b3cf271beea4ab314e5097a80854b2e16795229ffc5448bdb85342cf
-  data.tar.gz: fcf036e5ed13fa247fa9faf31df3a994c86b301b79f03654e8e088a31e5788a19695d2a0bb3474e93b94d0d0c6e313771e211cbb4b01064e534e654cbf7be79e
+  metadata.gz: e033466e88f576493744f89e4153ca6fe9258ca4ef70372892aaaefa212c354965577308b8c4efa43b8489c571c51ac9ad9cf1a28496d03892c90c710a22cf79
+  data.tar.gz: 4f527cb05b629a9a0d9558ee9940ecd7b127a45b91f9d5f3276e74de6f7cee0617bcc13e3d4c716f101f0463787fb90d75c238309fd4180bb494ac9ddb86cae1

data/.travis.yml

@@ -5,11 +5,10 @@ addons:
   postgresql: "9.4"
 
 rvm:
-  - 2.1
-  - 2.2.9
   - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - ruby-head
 
 gemfile:

data/README.md

@@ -19,12 +19,15 @@ NOTE: fluent-plugin-sql v1.0.0 is now RC. We will release stable v1.0.0 soon.
 ## Installation
 
     $ fluent-gem install fluent-plugin-sql --no-document
-    $ fluent-gem install pg --no-document # for postgresql
+    $ fluent-gem install pg -v 0.21.0 --no-document # for postgresql
 
 You should install actual RDBMS driver gem together. `pg` gem for postgresql adapter or `mysql2` gem for `mysql2` adapter. Other adapters supported by [ActiveRecord](https://github.com/rails/rails/tree/master/activerecord) should work.
 
 We recommend that mysql2 gem is higher than `0.3.12` and pg gem is higher than `0.16.0`.
 
+We must use pg gem 0.21.0 (< 1.0.0) because ActiveRecord 5.0 or later doesn't support Ruby 2.1.
+NOTE: ActiveRecord has supported pg 1.0.0 since ActiveRecord 5.1.5.
+
 ## Input: How It Works
 
 This plugin runs following SQL periodically:

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.1

data/fluent-plugin-sql.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path('../lib', __FILE__)
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-sql"
   gem.description = "SQL input/output plugin for Fluentd event collector"
-  gem.homepage    = "https://github.com/frsyuki/fluent-plugin-sql"
+  gem.homepage    = "https://github.com/fluent/fluent-plugin-sql"
   gem.summary     = gem.description
   gem.version     = File.read("VERSION").strip
   gem.authors     = ["Sadayuki Furuhashi"]
@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.license = "Apache-2.0"
 
   gem.add_dependency "fluentd", [">= 0.12.17", "< 2"]
-  gem.add_dependency 'activerecord', "~> 4.2"
+  gem.add_dependency 'activerecord', "~> 5.1"
   gem.add_dependency 'activerecord-import', "~> 0.7"
   gem.add_development_dependency "rake", ">= 0.9.2"
-  gem.add_development_dependency "test-unit", "~> 3.1.0"
+  gem.add_development_dependency "test-unit", "> 3.1.0"
   gem.add_development_dependency "test-unit-rr"
   gem.add_development_dependency "test-unit-notify"
-  gem.add_development_dependency "pg", '~> 0.21.0'
+  gem.add_development_dependency "pg", '~> 1.0'
 end

data/lib/fluent/plugin/in_sql.rb

@@ -39,6 +39,8 @@ module Fluent::Plugin
     config_param :password, :string, default: nil, secret: true
     desc 'RDBMS socket path'
     config_param :socket, :string, default: nil
+    desc 'PostgreSQL schema search path'
+    config_param :schema_search_path, :string, default: nil
 
     desc 'path to a file to store last rows'
     config_param :state_file, :string, default: nil
@@ -176,6 +178,7 @@ module Fluent::Plugin
         username: @username,
         password: @password,
         socket: @socket,
+        schema_search_path: @schema_search_path,
       }
 
       # creates subclass of ActiveRecord::Base so that it can have different

data/lib/fluent/plugin/out_sql.rb

@@ -22,6 +22,8 @@ module Fluent::Plugin
     config_param :database, :string
     desc 'RDBMS socket path'
     config_param :socket, :string, default: nil
+    desc 'PostgreSQL schema search path'
+    config_param :schema_search_path, :string, default: nil
     desc 'remove the given prefix from the events'
     config_param :remove_tag_prefix, :string, default: nil
     desc 'enable fallback'
@@ -187,6 +189,7 @@ module Fluent::Plugin
         username: @username,
         password: @password,
         socket: @socket,
+        schema_search_path: @schema_search_path,
       }
 
       @base_model = Class.new(ActiveRecord::Base) do

data/test/plugin/test_in_sql.rb

@@ -18,6 +18,8 @@ class SqlInputTest < Test::Unit::TestCase
     username fluentd
     password fluentd
 
+    schema_search_path public
+
     tag_prefix db
 
     <table>
@@ -41,6 +43,7 @@ class SqlInputTest < Test::Unit::TestCase
       database: "fluentd_test",
       username: "fluentd",
       password: "fluentd",
+      schema_search_path: "public",
       tag_prefix: "db"
     }
     actual = {
@@ -50,6 +53,7 @@ class SqlInputTest < Test::Unit::TestCase
       database: d.instance.database,
       username: d.instance.username,
       password: d.instance.password,
+      schema_search_path: d.instance.schema_search_path,
       tag_prefix: d.instance.tag_prefix
     }
     assert_equal(expected, actual)

data/test/plugin/test_out_sql.rb

@@ -18,6 +18,8 @@ class SqlOutputTest < Test::Unit::TestCase
     username fluentd
     password fluentd
 
+    schema_search_path public
+
     remove_tag_prefix db
 
     <table>
@@ -39,6 +41,7 @@ class SqlOutputTest < Test::Unit::TestCase
       database: "fluentd_test",
       username: "fluentd",
       password: "fluentd",
+      schema_search_path: 'public',
       remove_tag_suffix: /^db/,
       enable_fallback: true
     }
@@ -49,6 +52,7 @@ class SqlOutputTest < Test::Unit::TestCase
       database: d.instance.database,
       username: d.instance.username,
       password: d.instance.password,
+      schema_search_path: d.instance.schema_search_path,
       remove_tag_suffix: d.instance.remove_tag_prefix,
       enable_fallback: d.instance.enable_fallback
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +76,14 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '1.0'
 description: SQL input/output plugin for Fluentd event collector
 email: frsyuki@gmail.com
 executables: []
@@ -147,7 +147,7 @@ files:
 - test/helper.rb
 - test/plugin/test_in_sql.rb
 - test/plugin/test_out_sql.rb
-homepage: https://github.com/frsyuki/fluent-plugin-sql
+homepage: https://github.com/fluent/fluent-plugin-sql
 licenses:
 - Apache-2.0
 metadata: {}
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: SQL input/output plugin for Fluentd event collector