embulk-filter-mysql 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7dee585e2b80d2158e70ee32028bee401ea9f21
-  data.tar.gz: ce71e605f40be4a449379e6322927457ca18558e
+  metadata.gz: 7020a8e284723e9158697c85419dfce529911072
+  data.tar.gz: 0f7d65646e185d7f5aee2e73288475a0cf7dfcb0
 SHA512:
-  metadata.gz: 18c8bf4569c9be072cfaa39bcf213fa5aed4875902a1010a3aa8c785d2fedbb28dcfe8afb9fc2a6c831f1ee5d8bf34cefae16f28c33483eaeb1a56e13ba5365f
-  data.tar.gz: 2043954828f36a5778dbd8a1eaa7589f22cae8e667ad572dabdf53de3f8c565f799ca0c4694006b8e32d39a9c4b50225eb259eaac9cb270b074101ae235fd163
+  metadata.gz: 0f089e8d9c715fb00c1fd4db24280fefa7d588e7dff919d409e8ccb3c5aaadacd76e4d8fb22fb9a63dfc95abd1ddfd66860d7b0ae47f653c417ab94bab24a39e
+  data.tar.gz: d4c74cb9b1d702408e11d559b2234d9bc7a7ccee937058df16c80a11c43c3ff198241996de43cae66c884458b069185fe4546b038370847eccab66afe0ecbe33

data/.ruby-version

@@ -1 +1 @@
-jruby-9.0.4.0
+jruby-9.1.5.0

data/embulk-filter-mysql.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-filter-mysql"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["toyama0919"]
   spec.summary       = "Mysql filter plugin for Embulk. Execute prepared statements query."
   spec.description   = "Mysql filter plugin for Embulk. Execute prepared statements query."
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'ffi-mysql'
-  spec.add_development_dependency 'embulk', ['>= 0.8.3']
+  spec.add_development_dependency 'embulk', ['>= 0.8.16']
   spec.add_development_dependency 'bundler', ['>= 1.10.6']
   spec.add_development_dependency 'rake', ['>= 10.0']
 end

data/lib/embulk/filter/mysql.rb

@@ -1,6 +1,7 @@
 # coding: UTF-8
 require 'ffi-mysql'
- 
+require_relative 'mysql/field'
+
 module Embulk
   module Filter
     class Mysql < FilterPlugin
@@ -24,59 +25,28 @@ module Embulk
         columns = columns + in_schema if task['keep_input']
 
         statement.result_metadata.fetch_fields.each do |field|
-          columns << Column.new(nil, field.name, get_type(field.type))
+          columns << Column.new(nil, field.name, get_type(field.name, field.type))
         end
 
         yield(task, columns)
       end
 
-      # ::Mysql::Field::TYPE_DECIMAL     = 0
-      # ::Mysql::Field::TYPE_TINY        = 1
-      # ::Mysql::Field::TYPE_SHORT       = 2
-      # ::Mysql::Field::TYPE_LONG        = 3
-      # ::Mysql::Field::TYPE_FLOAT       = 4
-      # ::Mysql::Field::TYPE_DOUBLE      = 5
-      # ::Mysql::Field::TYPE_NULL        = 6
-      # ::Mysql::Field::TYPE_TIMESTAMP   = 7
-      # ::Mysql::Field::TYPE_LONGLONG    = 8
-      # ::Mysql::Field::TYPE_INT24       = 9
-      # ::Mysql::Field::TYPE_DATE        = 10
-      # ::Mysql::Field::TYPE_TIME        = 11
-      # ::Mysql::Field::TYPE_DATETIME    = 12
-      # ::Mysql::Field::TYPE_YEAR        = 13
-      # ::Mysql::Field::TYPE_NEWDATE     = 14
-      # ::Mysql::Field::TYPE_VARCHAR     = 15
-      # ::Mysql::Field::TYPE_BIT         = 16
-      # ::Mysql::Field::TYPE_TIMESTAMP2  = 17
-      # ::Mysql::Field::TYPE_DATETIME2   = 18
-      # ::Mysql::Field::TYPE_TIME2       = 19
-      # ::Mysql::Field::TYPE_JSON        = 245
-      # ::Mysql::Field::TYPE_NEWDECIMAL  = 246
-      # ::Mysql::Field::TYPE_ENUM        = 247
-      # ::Mysql::Field::TYPE_SET         = 248
-      # ::Mysql::Field::TYPE_TINY_BLOB   = 249
-      # ::Mysql::Field::TYPE_MEDIUM_BLOB = 250
-      # ::Mysql::Field::TYPE_LONG_BLOB   = 251
-      # ::Mysql::Field::TYPE_BLOB        = 252
-      # ::Mysql::Field::TYPE_VAR_STRING  = 253
-      # ::Mysql::Field::TYPE_STRING      = 254
-      # ::Mysql::Field::TYPE_GEOMETRY    = 255
-      # ::Mysql::Field::TYPE_CHAR        = TYPE_TINY
-      # ::Mysql::Field::TYPE_INTERVAL    = TYPE_ENUM
-      def self.get_type(type)
+      def self.get_type(name, type)
         case type
-        when ::Mysql::Field::TYPE_TINY
+        when Mysql::Field::TYPE_TINY
           :boolean
-        when ::Mysql::Field::TYPE_SHORT, ::Mysql::Field::TYPE_LONG
+        when Mysql::Field::TYPE_SHORT, Mysql::Field::TYPE_LONG, Mysql::Field::TYPE_LONGLONG
           :long
-        when ::Mysql::Field::TYPE_DOUBLE, ::Mysql::Field::TYPE_FLOAT
+        when Mysql::Field::TYPE_DOUBLE, Mysql::Field::TYPE_FLOAT
           :double
-        when ::Mysql::Field::TYPE_DATE, ::Mysql::Field::TYPE_DATETIME, ::Mysql::Field::TYPE_TIMESTAMP
+        when Mysql::Field::TYPE_DATE, Mysql::Field::TYPE_DATETIME, Mysql::Field::TYPE_TIMESTAMP
           :timestamp
-        when ::Mysql::Field::TYPE_BLOB, ::Mysql::Field::TYPE_STRING, ::Mysql::Field::TYPE_VAR_STRING, ::Mysql::Field::TYPE_VARCHAR
+        when Mysql::Field::TYPE_BLOB, Mysql::Field::TYPE_STRING, Mysql::Field::TYPE_VAR_STRING, Mysql::Field::TYPE_VARCHAR
           :string
+        when Mysql::Field::TYPE_JSON
+          :json
         else
-          raise
+          raise ConfigError.new "Not support column [#{name}], type_no => [#{type}]"
         end
       end
 

data/lib/embulk/filter/mysql/field.rb

@@ -0,0 +1,62 @@
+module Embulk
+  module Filter
+    class Mysql < FilterPlugin
+      class Field
+        TYPE_DECIMAL     = 0
+        TYPE_TINY        = 1
+        TYPE_SHORT       = 2
+        TYPE_LONG        = 3
+        TYPE_FLOAT       = 4
+        TYPE_DOUBLE      = 5
+        TYPE_NULL        = 6
+        TYPE_TIMESTAMP   = 7
+        TYPE_LONGLONG    = 8
+        TYPE_INT24       = 9
+        TYPE_DATE        = 10
+        TYPE_TIME        = 11
+        TYPE_DATETIME    = 12
+        TYPE_YEAR        = 13
+        TYPE_NEWDATE     = 14
+        TYPE_VARCHAR     = 15
+        TYPE_BIT         = 16
+        TYPE_TIMESTAMP2  = 17
+        TYPE_DATETIME2   = 18
+        TYPE_TIME2       = 19
+        TYPE_JSON        = 245
+        TYPE_NEWDECIMAL  = 246
+        TYPE_ENUM        = 247
+        TYPE_SET         = 248
+        TYPE_TINY_BLOB   = 249
+        TYPE_MEDIUM_BLOB = 250
+        TYPE_LONG_BLOB   = 251
+        TYPE_BLOB        = 252
+        TYPE_VAR_STRING  = 253
+        TYPE_STRING      = 254
+        TYPE_GEOMETRY    = 255
+        TYPE_CHAR        = TYPE_TINY
+        TYPE_INTERVAL    = TYPE_ENUM
+
+        # Flag
+        NOT_NULL_FLAG         = 1
+        PRI_KEY_FLAG          = 2
+        UNIQUE_KEY_FLAG       = 4
+        MULTIPLE_KEY_FLAG     = 8
+        BLOB_FLAG             = 16
+        UNSIGNED_FLAG         = 32
+        ZEROFILL_FLAG         = 64
+        BINARY_FLAG           = 128
+        ENUM_FLAG             = 256
+        AUTO_INCREMENT_FLAG   = 512
+        TIMESTAMP_FLAG        = 1024
+        SET_FLAG              = 2048
+        NO_DEFAULT_VALUE_FLAG = 4096
+        ON_UPDATE_NOW_FLAG    = 8192
+        NUM_FLAG              = 32768
+        PART_KEY_FLAG         = 16384
+        GROUP_FLAG            = 32768
+        UNIQUE_FLAG           = 65536
+        BINCMP_FLAG           = 131072
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-mysql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - toyama0919
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.16
   name: embulk
   prerelease: false
   type: :development
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.16
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - embulk-filter-mysql.gemspec
 - lib/embulk/filter/mysql.rb
+- lib/embulk/filter/mysql/field.rb
 homepage: https://github.com/toyama0919/embulk-filter-mysql
 licenses:
 - MIT
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: Mysql filter plugin for Embulk. Execute prepared statements query.