fluent-plugin-sql 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00987a628d7afc94546e68d5374331e82c65eca49aa8e3aad33b8f5ffb5c8f59'
-  data.tar.gz: e809d69583ab25571878d9bc4adb64a26841e14347e9deb973e1a659262bbf47
+  metadata.gz: 02d185dee05a4611437c046d0d279fb7299a874dd6c46a76d174a03c983b2f16
+  data.tar.gz: 71708e3128e2ec604ccccaf4ca7aeeb13c20853f2cdf0f72bbf4264125706ea2
 SHA512:
-  metadata.gz: b5cf74d0668a3e7b26220d2b56179c3668a99e2a51e8d99b7468d797bdc3c7e0fe81ca813ede95713fc3a2dc6484929505953c0be7239129343f138798ad7fe4
-  data.tar.gz: c45922cd85d83e3ed89629c55232cd0fe83106b4961f1d2dfaafd8564d8db900b4740f78e2f12b7596ee6ce025a43efaf4cb409ca9ed418434dcc3ed447a4456
+  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

@@ -1,3 +1,7 @@
+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

data/README.md

@@ -27,11 +27,6 @@ We recommend that mysql2 gem is higher than `0.3.12` and pg gem is higher than `
 
 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.
 
-### Resolve tzinfo version conflict
-
-If you want to use fluent-plugin-sql with recent fluentd/td-agent, you need to downgrade tzinfo to v1.x manually.
-See also this comment: https://github.com/fluent/fluent-plugin-sql/issues/87#issuecomment-614552292
-
 ## Input: How It Works
 
 This plugin runs following SQL periodically:

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/fluent-plugin-sql.gemspec

@@ -16,9 +16,9 @@ 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', "~> 5.1"
-  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-rr"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sql
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 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: '5.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        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
@@ -134,7 +134,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- ".github/workflows/linux.yml"
 - ChangeLog
 - Gemfile
 - Gemfile.v0.12
@@ -168,13 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+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_in_sql_with_custom_time.rb
-- test/plugin/test_out_sql.rb
+test_files: []

data/.travis.yml

@@ -1,28 +0,0 @@
-sudo: false
-language: ruby
-
-addons:
-  postgresql: "9.4"
-
-rvm:
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-  - ruby-head
-
-gemfile:
- - Gemfile
-
-before_install:
-  - gem update 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