fluent-plugin-sql 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88024ff651d07318ed1d0abf03a0c43601e61288356544c53805a7678e6e5c45
-  data.tar.gz: 020b0a879adfa39a5130105e9c75ed1d3e65574de63624a52f698c91b3e48d48
+  metadata.gz: 8d90c196fbc84a7921ba99ea09cdc7aef2c564b4c19799cc1bcce9973e1f391e
+  data.tar.gz: 358dbde32a842e26b2ff9e34a11acff25790624dec8ae1e4689aaa8488d179de
 SHA512:
-  metadata.gz: c258a8f2b9eb8dbc78cfe1709cfcee97b647d1ab4067bc1e47624dc296ea3196b313b0d7fd2543f37cdbd67598b846507a1ee0f705d1d9e338098bd3977e28e9
-  data.tar.gz: a32904e86a3d30a586e745a60fb48f4e43a78e427a32ea81beba225dba858c7aff9a3afb85e1ce5d7325daea1505a200845d38d330cadd0c47f8e85edab7a26c
+  metadata.gz: 1cbe495ae7aab0133427155b1a136f8a499b9b0924305bf24807c0f2950f2a84b7a3d0657093375e682be37d2d81f96b503e77635c7ddb24f51a5abb40914a51
+  data.tar.gz: 9b856ce7892a9d9f2fd35d36137eca67508d129194043516e976f5497518da251604c35cba15d483386d0879bb073e2fe9fd1d96a0e027dcbe66fb5fd2a78b7d

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/linux-ruby-head.yml

@@ -0,0 +1,45 @@
+name: Test with Ruby head
+on:
+  schedule:
+    - cron: '11 23 * * 0'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 'head' ]
+        postgres: [ '16', '15', '14', '13', '12' ]
+        os:
+          - ubuntu-latest
+    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@v6
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - 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: bundle exec rake test

data/.github/workflows/linux.yml

@@ -1,41 +1,20 @@
-name: linux
+name: Test
 on:
-  - push
-  - pull_request
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 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' ]
+        ruby: [ '4.0', '3.4', '3.3', '3.2', '3.1', '3.0', '2.7' ]
+        postgres: [ '16', '15', '14', '13', '12' ]
         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 }}
@@ -52,10 +31,11 @@ jobs:
           --health-retries 5
     name: Ruby ${{ matrix.ruby }} with PostgreSQL ${{ matrix.postgres }} unit testing on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - name: prepare database
       env:
         PGPASSWORD: password
@@ -63,7 +43,4 @@ jobs:
         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
+      run: bundle exec rake test

data/.gitignore

@@ -0,0 +1,4 @@
+Gemfile.lock
+pkg/*
+.vscode
+.idea/

data/ChangeLog

@@ -1,3 +1,13 @@
+Release 2.3.2 - 2026/01/13
+
+  * out_sql: Use isolated connection configurations in the output plugin (#152)
+  * gem: Add ostruct as dependency for Ruby 4.0 (#159)
+  * gem: Relax required activesupport version to accept latest one (#161, #148)
+
+Release 2.3.1 - 2024/02/29
+
+　* in_sql: Fix incompatibility against Ruby 3.2
+
 Release 2.3.0 - 2021/10/08
 
 　* in_sql: Make table time_format configurable

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.3.2

data/fluent-plugin-sql.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
   gem.license = "Apache-2.0"
 
   gem.add_dependency "fluentd", [">= 1.7.0", "< 2"]
-  gem.add_dependency 'activerecord', "~> 6.1"
+  gem.add_dependency "ostruct", '~> 0.6'
+  gem.add_dependency 'activerecord', [">= 6.1", "< 8.2"]
   gem.add_dependency 'activerecord-import', "~> 1.0"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "test-unit", "> 3.1.0"

data/lib/fluent/plugin/in_sql.rb

@@ -282,7 +282,7 @@ module Fluent::Plugin
         require 'yaml'
 
         @path = path
-        if File.exists?(@path)
+        if File.exist?(@path)
           @data = YAML.load_file(@path)
           if @data == false || @data == []
             # this happens if an users created an empty file accidentally

data/lib/fluent/plugin/out_sql.rb

@@ -206,7 +206,7 @@ module Fluent::Plugin
       end
 
       SQLOutput.const_set("BaseModel_#{rand(1 << 31)}", @base_model)
-      ActiveRecord::Base.establish_connection(config)
+      @base_model.establish_connection(config)
 
       # ignore tables if TableElement#init failed
       @tables.reject! do |te|
@@ -224,7 +224,7 @@ module Fluent::Plugin
     end
 
     def write(chunk)
-      ActiveRecord::Base.connection_pool.with_connection do
+      @base_model.connection_pool.with_connection do
 
         @tables.each { |table|
           tag = format_tag(chunk.metadata.tag)

data/test/helper.rb

@@ -1,6 +1,6 @@
 require "test/unit"
 require "test/unit/rr"
-require "test/unit/notify"
+require "test/unit/notify" unless ENV['CI']
 require "fluent/test"
 require "fluent/plugin/out_sql"
 require "fluent/plugin/in_sql"

data/test/plugin/test_in_sql_with_state_file.rb

@@ -0,0 +1,96 @@
+require "helper"
+require "fluent/test/driver/input"
+
+class SqlInputStateFileTest < 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
+
+    state_file /tmp/sql_state
+
+    schema_search_path public
+
+    tag_prefix db
+
+    <table>
+      table messages
+      tag logs
+      update_column updated_at
+      time_column updated_at
+    </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 = tables.first
+    assert_equal("messages", messages.table)
+    assert_equal("logs", messages.tag)
+  end
+
+  def test_message
+    d = create_driver(CONFIG + "select_interval 1")
+    Message.create!(message: "message 1")
+    Message.create!(message: "message 2")
+    Message.create!(message: "message 3")
+
+    d.end_if do
+      d.record_count >= 3
+    end
+    d.run
+
+    assert_equal("db.logs", d.events[0][0])
+    expected = [
+      [d.events[0][1], "message 1"],
+      [d.events[1][1], "message 2"],
+      [d.events[2][1], "message 3"],
+    ]
+    actual = [
+      [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
+
+  class Message < ActiveRecord::Base
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sql
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -31,19 +30,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +153,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/linux-ruby-head.yml"
 - ".github/workflows/linux.yml"
+- ".gitignore"
 - ChangeLog
 - Gemfile
 - Gemfile.v0.12
@@ -148,12 +170,12 @@ files:
 - test/helper.rb
 - test/plugin/test_in_sql.rb
 - test/plugin/test_in_sql_with_custom_time.rb
+- test/plugin/test_in_sql_with_state_file.rb
 - test/plugin/test_out_sql.rb
 homepage: https://github.com/fluent/fluent-plugin-sql
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -168,8 +190,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: SQL input/output plugin for Fluentd event collector
-test_files: []
+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_in_sql_with_state_file.rb
+- test/plugin/test_out_sql.rb