fluent-plugin-mysql 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c8d2f2fd5a6164a01413ca4d9179d6a93d8b4f0
-  data.tar.gz: 05a99dbf24a3458cbd2031f87da2b1cd154c7d66
+  metadata.gz: 9859ad599cbae8698e0054adcbeaff3205f5a537
+  data.tar.gz: 96cdfad1bf8d00270b2e6ac9d8ac92b83987b326
 SHA512:
-  metadata.gz: 1aaf277b0400baf6235a2a1ebfa954e55c3f1b09f63c81f524f1d8af2751eb9e53de9f0828630de1e2bf8c36468445a51951e88f6823528b18db4716226c0a75
-  data.tar.gz: f1889ff991d71cc77e0c35201ed8bd169464e118671865ad839717d97082b3e9118c416342f568a2e2506f290760da350034c5e9835cf5120a468a64c1caf774
+  metadata.gz: e15db1860fe2d5925917a6fe949459e0d3e75cddd7d57f8df3d83f497f6e55dafa634b3da94273bcae01f2d89c64e5862da4540ec649034ce1a311320b4e88bc
+  data.tar.gz: b1d106391be32bb63aa2dde7ade7c894fef44eab820ccf2dd7f9901160a7bfd26629469a8f089eddc80fff2d6f94d8c13a0c0343286f140eba07b987f4bd45fe

data/fluent-plugin-mysql.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-mysql"
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
   gem.authors       = ["TAGOMORI Satoshi", "Toyama Hiroshi"]
   gem.email         = ["tagomoris@gmail.com", "toyama0919@gmail.com"]
   gem.description   = %q{fluent plugin to insert mysql as json(single column) or insert statement}

data/lib/fluent/plugin/out_mysql_bulk.rb

@@ -33,6 +33,8 @@ DESC
                  desc: "On duplicate key update enable."
     config_param :on_duplicate_update_keys, :string, default: nil,
                  desc: "On duplicate key update column, comma separator."
+    config_param :on_duplicate_update_custom_values, :string, default: nil,
+                 desc: "On_duplicate_update_custom_values, comma separator. specify the column name is insert value, custom value is use ${sql conditions}"
 
     attr_accessor :handler
 
@@ -55,10 +57,25 @@ DESC
         end
         @on_duplicate_update_keys = @on_duplicate_update_keys.split(',')
 
+        if !@on_duplicate_update_custom_values.nil?
+          @on_duplicate_update_custom_values = @on_duplicate_update_custom_values.split(',')
+          if @on_duplicate_update_custom_values.length != @on_duplicate_update_keys.length
+            fail Fluent::ConfigError, <<-DESC
+on_duplicate_update_keys and on_duplicate_update_custom_values must be the same length
+DESC
+          end
+        end
+
         @on_duplicate_key_update_sql = ' ON DUPLICATE KEY UPDATE '
         updates = []
-        @on_duplicate_update_keys.each do |update_column|
-          updates << "#{update_column} = VALUES(#{update_column})"
+        @on_duplicate_update_keys.each_with_index do |update_column, i|
+          if @on_duplicate_update_custom_values.nil? || @on_duplicate_update_custom_values[i] == "#{update_column}"
+            updates << "#{update_column} = VALUES(#{update_column})"
+          else
+            value = @on_duplicate_update_custom_values[i].to_s.match(/\${(.*)}/)[1]
+            escape_value = Mysql2::Client.escape(value)
+            updates << "#{update_column} = #{escape_value}"
+          end
         end
         @on_duplicate_key_update_sql += updates.join(',')
       end

data/test/plugin/test_out_mysql_bulk.rb

@@ -158,6 +158,20 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
         flush_interval 10s
       ]
     end
+
+    assert_raise(Fluent::ConfigError) do
+      create_driver %[
+        host localhost
+        username root
+        password hogehoge
+        column_names id,user_name,login_count,created_at,updated_at
+        table users
+        on_duplicate_key_update true
+        on_duplicate_update_keys login_count,updated_at
+        on_duplicate_update_custom_values login_count
+        flush_interval 10s
+      ]
+    end
   end
 
   def test_configure
@@ -222,6 +236,20 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
         table access
       ]
     end
+
+    assert_nothing_raised(Fluent::ConfigError) do
+      create_driver %[
+        database test_app_development
+        username root
+        password hogehoge
+        column_names id,user_name,login_count,created_at,updated_at
+        key_names id,user_name,login_count,created_date,updated_date
+        table users
+        on_duplicate_key_update true
+        on_duplicate_update_keys login_count,updated_at
+        on_duplicate_update_custom_values ${`login_count` + 1},updated_at
+      ]
+    end
   end
 
   def test_variables
@@ -281,6 +309,22 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
     assert_equal ['id','url','request_headers_json','params_json','created_date','updated_date'], d.instance.column_names
     assert_equal ['request_headers','params'], d.instance.json_key_names
     assert_nil d.instance.instance_variable_get(:@on_duplicate_key_update_sql)
+
+    d = create_driver %[
+      database test_app_development
+      username root
+      password hogehoge
+      column_names id,user_name,login_count,created_at,updated_at
+      table users
+      on_duplicate_key_update true
+      on_duplicate_update_keys login_count,updated_at
+      on_duplicate_update_custom_values ${`login_count` + 1},updated_at
+    ]
+
+    assert_equal ['id','user_name','login_count','created_at','updated_at'], d.instance.key_names
+    assert_equal ['id','user_name','login_count','created_at','updated_at'], d.instance.column_names
+    assert_equal nil, d.instance.json_key_names
+    assert_equal " ON DUPLICATE KEY UPDATE login_count = `login_count` + 1,updated_at = VALUES(updated_at)", d.instance.instance_variable_get(:@on_duplicate_key_update_sql)
   end
 
   def test_spaces_in_columns

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -150,3 +150,4 @@ test_files:
 - test/helper.rb
 - test/plugin/test_out_mysql.rb
 - test/plugin/test_out_mysql_bulk.rb
+has_rdoc: