fluent-plugin-sql 1.0.0.rc1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e683b76d37276e4bbe276dc6148216c113e5267
-  data.tar.gz: 374e957bfaf1f9eea818a6d3bc9c9b370c58604f
+SHA256:
+  metadata.gz: 02d185dee05a4611437c046d0d279fb7299a874dd6c46a76d174a03c983b2f16
+  data.tar.gz: 71708e3128e2ec604ccccaf4ca7aeeb13c20853f2cdf0f72bbf4264125706ea2
 SHA512:
-  metadata.gz: 1a71af14e2817621d22c85ac31a49d54d6b7f224b605ce2febaf09fbe369b435b33df779b23196e37ac6fb5d3c5a26d2039cb5aadf24dc90ec5d105ba4b283c6
-  data.tar.gz: 593be077cfbc429c9502ad7b56c404cac24afbae65268d095c723339bb77a4645a5c4297d03a6cbf73dd269cdda69824d3e2e5d4d4b498406e8871c5e0fb775e
+  metadata.gz: 94aff71abbd5fea54eca7b2d9534fe2615992586add9f2ced691770a21aae95e45c4276ed6b076c5505eca634d3ff82b1eb321a13959021791704fde88691533
+  data.tar.gz: ad2d4fe75de3032775ef25c6d6c5062a43ec01fc715a9a4e59371022975ae421c9e957282da0c8777a159f873b04280f09bd9aa34e2dc3fd512ac54136599ed6

data/.github/workflows/linux.yml

@@ -0,0 +1,69 @@
+name: linux
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        postgres: [ '9', '10', '11', '12', '13' ]
+        os:
+          - ubuntu-latest
+        experimental: [false]
+        include:
+          - ruby: head
+            postgres: '9'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '10'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '11'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '12'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '13'
+            os: ubuntu-latest
+            experimental: true
+    services:
+      postgres:
+        image: postgres:${{ matrix.postgres }}
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    name: Ruby ${{ matrix.ruby }} with PostgreSQL ${{ matrix.postgres }} unit testing on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: prepare database
+      env:
+        PGPASSWORD: password
+      run: |
+        psql -h localhost -p 5432 -U postgres -c "CREATE ROLE fluentd WITH LOGIN ENCRYPTED PASSWORD 'fluentd';"
+        psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE fluentd_test OWNER fluentd;"
+    - name: unit testing
+      run: |
+        gem install bundler rake
+        bundle install --jobs 4 --retry 3
+        bundle exec rake test

data/ChangeLog

@@ -0,0 +1,24 @@
+Release 2.2.0 - 2021/04/20
+
+　* Upgrade ActiveRecord to 6.1
+
+Release 2.1.0 - 2020/09/09
+
+　* in_sql: Use Fluent::EventTime instead of Integer to preserve millisecond precision
+
+Release 2.0.0 - 2020/04/22
+
+  * out_sql: Remove v0.12 API code and use full v1 API. Change buffer format.
+
+Release 1.1.1 - 2019/05/10
+
+  * out_sql: Support schema_search_path option of PostgreSQL
+
+Release 1.1.0 - 2018/10/04
+
+  * Upgrade ActiveRecord to 5.1
+
+Release 1.0.0 - 2018/04/06
+
+  * Support v1 API
+

data/README.md

@@ -5,7 +5,7 @@
 This SQL plugin has two parts:
 
 1. SQL **input** plugin reads records from RDBMSes periodically. An example use case would be getting "diffs" of a table (based on the "updated_at" field).
-2. SQL **output** plugin that writes records into RDBMes. An example use case would be aggregating server/app/sensor logs into RDBMS systems.
+2. SQL **output** plugin that writes records into RDBMSes. An example use case would be aggregating server/app/sensor logs into RDBMS systems.
 
 ## Requirements
 
@@ -14,7 +14,7 @@ This SQL plugin has two parts:
 | >= 1.0.0          | >= v0.14.4 | >= 2.1 |
 | <  1.0.0          | <  v0.14.0 | >= 1.9 |
 
-NOTE: fluent-plugin-sql v1.0.0 is now RC. We will release stable v1.0.0 soon.
+NOTE: fluent-plugin-sql v2's buffer format is different from v1. If you update the plugin to v2, don't reuse v1's buffer.
 
 ## Installation
 
@@ -25,6 +25,8 @@ You should install actual RDBMS driver gem together. `pg` gem for postgresql ada
 
 We recommend that mysql2 gem is higher than `0.3.12` and pg gem is higher than `0.16.0`.
 
+If you use ruby 2.1, use pg gem 0.21.0 (< 1.0.0) because ActiveRecord 5.1.4 or earlier doesn't support Ruby 2.1.
+
 ## Input: How It Works
 
 This plugin runs following SQL periodically:
@@ -148,10 +150,12 @@ This plugin takes advantage of ActiveRecord underneath. For `host`, `port`, `dat
 * **username** RDBMS login user name
 * **password** RDBMS login password
 * **socket** RDBMS socket path
+* **pool** A connection pool synchronizes thread access to a limited number of database connections
+* **timeout** RDBMS connection timeout
 * **remove_tag_prefix** remove the given prefix from the events. See "tag_prefix" in "Input: Configuration". (optional)
 
 \<table\> sections:
 
 * **table** RDBM table name
 * **column_mapping**: [Required] Record to table schema mapping. The format is consists of `from:to` or `key` values are separated by `,`. For example, if set 'item_id:id,item_text:data,updated_at' to **column_mapping**, `item_id` field of record is stored into `id` column and `updated_at` field of record is stored into `updated_at` column.
-* **<table pattern>**: the pattern to which the incoming event's tag (after it goes through `remove_tag_prefix`, if given). The patterns should follow the same syntax as [that of <match>](http://docs.fluentd.org/articles/config-file#match-pattern-how-you-control-the-event-flow-inside-fluentd). **Exactly one <table> element must NOT have this parameter so that it becomes the default table to store data**.
+* **\<table pattern\>**: the pattern to which the incoming event's tag (after it goes through `remove_tag_prefix`, if given). The patterns should follow the same syntax as [that of \<match\>](https://docs.fluentd.org/configuration/config-file#how-match-patterns-work). **Exactly one \<table\> element must NOT have this parameter so that it becomes the default table to store data**.

data/VERSION

@@ -1 +1 @@
-1.0.0.rc1
+2.2.0

data/fluent-plugin-sql.gemspec

@@ -4,12 +4,11 @@ $:.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"]
   gem.email       = "frsyuki@gmail.com"
-  gem.has_rdoc    = false
   #gem.platform    = Gem::Platform::RUBY
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -17,12 +16,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.license = "Apache-2.0"
 
-  gem.add_dependency "fluentd", [">= 0.12.17", "< 2"]
-  gem.add_dependency 'activerecord', "~> 4.2"
-  gem.add_dependency 'activerecord-import', "~> 0.7"
+  gem.add_dependency "fluentd", [">= 1.7.0", "< 2"]
+  gem.add_dependency 'activerecord', "~> 6.1"
+  gem.add_dependency 'activerecord-import', "~> 1.0"
   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"
+  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
@@ -58,13 +60,16 @@ module Fluent::Plugin
       config_param :time_column, :string, default: nil
       config_param :primary_key, :string, default: nil
 
+      attr_reader :log
+
       def configure(conf)
         super
       end
 
-      def init(tag_prefix, base_model, router)
+      def init(tag_prefix, base_model, router, log)
         @router = router
         @tag = "#{tag_prefix}.#{@tag}" if tag_prefix
+        @log = log
 
         # creates a model for this table
         table_name = @table
@@ -106,6 +111,17 @@ module Fluent::Plugin
         end
       end
 
+      # Make sure we always have a Fluent::EventTime object regardless of what comes in
+      def normalized_time(tv, now)
+        return Fluent::EventTime.from_time(tv) if tv.is_a?(Time)
+        begin
+          Fluent::EventTime.parse(tv.to_s)
+        rescue
+          log.warn "Message contains invalid timestamp, using current time instead (#{now.inspect})"
+          now
+        end
+      end
+
       # emits next records and returns the last record of emitted records
       def emit_next_records(last_record, limit)
         relation = @model
@@ -121,15 +137,13 @@ module Fluent::Plugin
         relation.each do |obj|
           record = obj.serializable_hash rescue nil
           if record
-            if @time_column && tv = obj.read_attribute(@time_column)
-              if tv.is_a?(Time)
-                time = tv.to_i
+            time =
+              if @time_column && (tv = obj.read_attribute(@time_column))
+                normalized_time(tv, now)
               else
-                time = Time.parse(tv.to_s).to_i rescue now
+                now
               end
-            else
-              time = now
-            end
+
             me.add(time, record)
             last_record = record
           end
@@ -176,6 +190,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
@@ -214,7 +229,7 @@ module Fluent::Plugin
       # ignore tables if TableElement#init failed
       @tables.reject! do |te|
         begin
-          te.init(@tag_prefix, @base_model, router)
+          te.init(@tag_prefix, @base_model, router, log)
           log.info "Selecting '#{te.table}' table"
           false
         rescue => e

data/lib/fluent/plugin/out_sql.rb

@@ -1,11 +1,12 @@
 require "fluent/plugin/output"
 
+require 'active_record'
+require 'activerecord-import'
+
 module Fluent::Plugin
   class SQLOutput < Output
     Fluent::Plugin.register_output('sql', self)
 
-    DEFAULT_BUFFER_TYPE = "memory"
-
     helpers :inject, :compat_parameters, :event_emitter
 
     desc 'RDBMS host'
@@ -22,13 +23,19 @@ 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'
     config_param :enable_fallback, :bool, default: true
+    desc "size of ActiveRecord's connection pool"
+    config_param :pool, :integer, default: 5
+    desc "specifies the timeout to establish a new connection to the database before failing"
+    config_param :timeout, :integer, default: 5000
 
     config_section :buffer do
-      config_set_default :@type, DEFAULT_BUFFER_TYPE
+      config_set_default :chunk_keys, ["tag"]
     end
 
     attr_accessor :tables
@@ -81,11 +88,12 @@ module Fluent::Plugin
         # @model.column_names
       end
 
-      def import(chunk)
+      def import(chunk, output)
+        tag = chunk.metadata.tag
         records = []
-        chunk.msgpack_each { |tag, time, data|
+        chunk.msgpack_each { |time, data|
           begin
-            # format process should be moved to emit / format after supports error stream.
+            data = output.inject_values_to_record(tag, time, data)
             records << @model.new(@format_proc.call(data))
           rescue => e
             args = {error: e, table: @table, record: Yajl.dump(data)}
@@ -100,7 +108,7 @@ module Fluent::Plugin
             @log.warn "Got deterministic error. Fallback to one-by-one import", error: e
             one_by_one_import(records)
           else
-            $log.warn "Got deterministic error. Fallback is disabled", error: e
+            @log.warn "Got deterministic error. Fallback is disabled", error: e
             raise e
           end
         end
@@ -142,8 +150,6 @@ module Fluent::Plugin
 
     def initialize
       super
-      require 'active_record'
-      require 'activerecord-import'
     end
 
     def configure(conf)
@@ -169,7 +175,10 @@ module Fluent::Plugin
           @tables << te
         end
       }
-      @only_default = @tables.empty?
+
+      if @pool < @buffer_config.flush_thread_count
+        log.warn "connection pool size is smaller than buffer's flush_thread_count. Recommend to increase pool value", :pool => @pool, :flush_thread_count => @buffer_config.flush_thread_count
+      end
 
       if @default_table.nil?
         raise Fluent::ConfigError, "There is no default table. <table> is required in sql output"
@@ -187,6 +196,9 @@ module Fluent::Plugin
         username: @username,
         password: @password,
         socket: @socket,
+        schema_search_path: @schema_search_path,
+        pool: @pool,
+        timeout: @timeout,
       }
 
       @base_model = Class.new(ActiveRecord::Base) do
@@ -207,19 +219,6 @@ module Fluent::Plugin
       super
     end
 
-    def emit(tag, es, chain)
-      if @only_default
-        super(tag, es, chain)
-      else
-        super(tag, es, chain, format_tag(tag))
-      end
-    end
-
-    def format(tag, time, record)
-      record = inject_values_to_record(tag, time, record)
-      [tag, time, record].to_msgpack
-    end
-
     def formatted_to_msgpack_binary
       true
     end
@@ -228,11 +227,12 @@ module Fluent::Plugin
       ActiveRecord::Base.connection_pool.with_connection do
 
         @tables.each { |table|
-          if table.pattern.match(chunk.key)
-            return table.import(chunk)
+          tag = format_tag(chunk.metadata.tag)
+          if table.pattern.match(tag)
+            return table.import(chunk, self)
           end
         }
-        @default_table.import(chunk)
+        @default_table.import(chunk, self)
       end
     end
 
@@ -251,7 +251,7 @@ module Fluent::Plugin
     end
 
     def format_tag(tag)
-      if @remove_tag_prefix
+      if tag && @remove_tag_prefix
         tag.gsub(@remove_tag_prefix, '')
       else
         tag

data/test/fixtures/schema.rb

@@ -20,5 +20,12 @@ ActiveRecord::Schema.define(version: 20160225030107) do
     t.datetime "created_at",  null: false
     t.datetime "updated_at",  null: false
   end
+
+  create_table "messages_custom_time", force: :cascade do |t|
+    t.string "message"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+    t.string "custom_time"
+  end
 end
 

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)
@@ -78,9 +82,9 @@ class SqlInputTest < Test::Unit::TestCase
       [d.events[2][1], "message 3"],
     ]
     actual = [
-      [Time.parse(d.events[0][2]["updated_at"]).to_i, d.events[0][2]["message"]],
-      [Time.parse(d.events[1][2]["updated_at"]).to_i, d.events[1][2]["message"]],
-      [Time.parse(d.events[2][2]["updated_at"]).to_i, d.events[2][2]["message"]],
+      [Fluent::EventTime.parse(d.events[0][2]["updated_at"]), d.events[0][2]["message"]],
+      [Fluent::EventTime.parse(d.events[1][2]["updated_at"]), d.events[1][2]["message"]],
+      [Fluent::EventTime.parse(d.events[2][2]["updated_at"]), d.events[2][2]["message"]],
     ]
     assert_equal(expected, actual)
   end

data/test/plugin/test_in_sql_with_custom_time.rb

@@ -0,0 +1,114 @@
+require "helper"
+require "fluent/test/driver/input"
+
+class SqlInputCustomTimeTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  def teardown
+  end
+
+  CONFIG = %[
+    adapter postgresql
+    host localhost
+    port 5432
+    database fluentd_test
+
+    username fluentd
+    password fluentd
+
+    schema_search_path public
+
+    tag_prefix db
+
+    <table>
+      table messages_custom_time
+      tag logs
+      update_column updated_at
+      time_column custom_time
+    </table>
+  ]
+
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::SQLInput).configure(conf)
+  end
+
+  def test_configure
+    d = create_driver
+    expected = {
+      host: "localhost",
+      port: 5432,
+      adapter: "postgresql",
+      database: "fluentd_test",
+      username: "fluentd",
+      password: "fluentd",
+      schema_search_path: "public",
+      tag_prefix: "db"
+    }
+    actual = {
+      host: d.instance.host,
+      port: d.instance.port,
+      adapter: d.instance.adapter,
+      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)
+    tables = d.instance.instance_variable_get(:@tables)
+    assert_equal(1, tables.size)
+    messages_custom_time = tables.first
+    assert_equal("messages_custom_time", messages_custom_time.table)
+    assert_equal("logs", messages_custom_time.tag)
+  end
+
+  def test_message
+    d = create_driver(CONFIG + "select_interval 1")
+
+    start_time = Fluent::EventTime.now
+
+    # Create one message with a valid timestamp containing milliseconds and a time zone
+    Message.create!(message: "message 1", custom_time: '2020-08-27 15:00:16.100758000 -0400')
+
+    # Create one message without a timestamp so that we can test auto-creation
+    Message.create!(message: "message 2 (no timestamp)", custom_time: nil)
+
+    # Create one message with an unparseable timestamp so that we can check that a valid
+    # one is auto-generated.
+    Message.create!(message: "message 3 (bad timestamp)", custom_time: 'foo')
+
+    d.end_if do
+      d.record_count >= 3
+    end
+    d.run(timeout: 5)
+
+    assert_equal("db.logs", d.events[0][0])
+    expected = [
+      [d.events[0][1], "message 1"],
+      [d.events[1][1], "message 2 (no timestamp)"],
+      [d.events[2][1], "message 3 (bad timestamp)"],
+    ]
+
+    actual = [
+      [Fluent::EventTime.parse(d.events[0][2]["custom_time"]), d.events[0][2]["message"]],
+      d.events[1][2]["message"],
+      d.events[2][2]["message"],
+    ]
+
+    assert_equal(expected[0], actual[0])
+
+    # Messages 2 and 3 should have the same messages but (usually) a slightly later
+    # timestamps because they are generated by the input plugin instead of the test
+    # code
+    [1,2].each do |i|
+      assert_equal(expected[i][1], actual[i])
+      assert_operator(expected[i][0], :>=, start_time)
+    end
+  end
+
+  class Message < ActiveRecord::Base
+    self.table_name = "messages_custom_time"
+  end
+end

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,8 +41,10 @@ class SqlOutputTest < Test::Unit::TestCase
       database: "fluentd_test",
       username: "fluentd",
       password: "fluentd",
+      schema_search_path: 'public',
       remove_tag_suffix: /^db/,
-      enable_fallback: true
+      enable_fallback: true,
+      pool: 5
     }
     actual = {
       host: d.instance.host,
@@ -49,8 +53,10 @@ 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
+      enable_fallback: d.instance.enable_fallback,
+      pool: d.instance.pool
     }
     assert_equal(expected, actual)
     assert_empty(d.instance.tables)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 2.2.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.17
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.17
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   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
@@ -118,23 +118,24 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: SQL input/output plugin for Fluentd event collector
 email: frsyuki@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- ".github/workflows/linux.yml"
+- ChangeLog
 - Gemfile
 - Gemfile.v0.12
 - README.md
@@ -146,8 +147,9 @@ files:
 - test/fixtures/schema.rb
 - test/helper.rb
 - test/plugin/test_in_sql.rb
+- test/plugin/test_in_sql_with_custom_time.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: {}
@@ -162,17 +164,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: SQL input/output plugin for Fluentd event collector
-test_files:
-- test/fixtures/schema.rb
-- test/helper.rb
-- test/plugin/test_in_sql.rb
-- test/plugin/test_out_sql.rb
+test_files: []

data/.travis.yml

@@ -1,32 +0,0 @@
-sudo: false
-language: ruby
-
-addons:
-  postgresql: "9.4"
-
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2.4
-  - 2.3.1
-  - 2.4.1
-  - ruby-head
-
-gemfile:
- - Gemfile
-
-before_install:
-  - gem install bundler
-
-before_script:
-  - psql -U postgres -c "CREATE ROLE fluentd WITH LOGIN ENCRYPTED PASSWORD 'fluentd';"
-  - psql -U postgres -c "CREATE DATABASE fluentd_test OWNER fluentd;"
-
-script: bundle exec rake test
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 2.0
-      gemfile: Gemfile