flydata 0.2.13 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d20120a45eeb0e80acb2738e924ff664454d8bf
-  data.tar.gz: 96aadd0c65100102b2e659d063fbc1d9a391f56d
+  metadata.gz: f6cd04787878b2914745754010d02ec5f9abafae
+  data.tar.gz: dc7750c6a4cc5d5891cade50d5b3f8d2fd67ad6c
 SHA512:
-  metadata.gz: be0a985f146c83e734435c5a84d38d32b0daf8e0c32a59f8774c6b1570d360cfcab3b42fc327cd01b8a54ba4229718b6e7049cc9c635f11c1bf333d163d02e79
-  data.tar.gz: 09f3b5918fbe79bbdf86d0570f73524a646d7f507a89c3fe0ae4df9d846e3724577b52da4ee73dcd0f10172128664f2c9121b9d0f5d513ba38f5a5f84f4229d9
+  metadata.gz: c4dfb4894039ef88f6763a618151a714d3bdc02d7373c35d4ad3791f9f91fd33d959a435e1b4f50dc711ba1587bd8396dcb2b8b5b496e97200c1557cf919634d
+  data.tar.gz: 661851497f9b3b7e5c842a1e0341e3ce79b9040b2f29d53c229c0bd084e2895fed080be86e00ea4b9212d8c8fce62cfbfecf88078309c68226ea5450f6b17e8e

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.15

data/flydata.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.2.13 ruby lib
+# stub: flydata 0.2.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.2.13"
+  s.version = "0.2.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2014-11-08"
+  s.date = "2014-11-18"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]
@@ -99,6 +99,7 @@ Gem::Specification.new do |s|
     "spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb",
     "spec/flydata/fluent-plugins/mysql/alter_table_query_handler_spec.rb",
     "spec/flydata/fluent-plugins/mysql/binlog_position_spec.rb",
+    "spec/flydata/fluent-plugins/mysql/binlog_query_dispatcher_spec.rb",
     "spec/flydata/heroku_spec.rb",
     "spec/flydata/output/forwarder_spec.rb",
     "spec/flydata/parser/mysql/alter_table_parser_spec.rb",
@@ -113,6 +114,7 @@ Gem::Specification.new do |s|
     "spec/flydata/table_def/mysqldump_test_table_no_pk.dump",
     "spec/flydata/table_def/mysqldump_test_unique_key.dump",
     "spec/flydata/table_def/mysqldump_test_unique_key2.dump",
+    "spec/flydata/table_def/mysqldump_test_unique_key3.dump",
     "spec/flydata/table_def/mysqldump_test_unsigned.dump",
     "spec/flydata/table_def/redshift_table_def_spec.rb",
     "spec/flydata/util/encryptor_spec.rb",

data/lib/flydata/command/sender.rb

@@ -118,9 +118,9 @@ EOF
       private
       # Return a list of fluentd parent processes run by the same user for the
       # same flydata.pid file but not the process managed by the file itself.
-      CMD = %Q{ps -u `whoami` -o ppid,pid,args | grep '^ *1 ' | grep '\\%s' | egrep -v "\\b`cat %s`\\b"}
+      CMD = %Q{test -f %s && ps -u `whoami` -o ppid,pid,args | grep '^ *1 ' | grep '\\%s' | egrep -v "\\b`cat %s`\\b"}
       def orphan_processes
-        cmd =  CMD % [ daemon_option, pid_file ]
+        cmd =  CMD % [ pid_file, daemon_option, pid_file ]
         result = `#{cmd}`
         orphan_pids = []
         result.each_line do |line|

data/lib/flydata/command/sync.rb

@@ -341,7 +341,8 @@ EOM
           puts "Checking database size(not same as mysqldump data size)..."
           db_bytesize = Flydata::Parser::Mysql::DatabaseSizeCheck.new(de['mysql_data_entry_preference']).get_db_bytesize
           puts "  -> #{as_size(db_bytesize)} (#{db_bytesize} byte)"
-          puts "Exporting data from database..."
+          puts "Exporting data from database."
+          puts "This process can take hours depending on data size and load on your database.  Please be patient..."
           Flydata::MysqlCompatibilityCheck.new(dp, de['mysql_data_entry_preference'], fp).check
           if file_dump
             Flydata::Parser::Mysql::MysqlDumpGeneratorNoMasterData.

data/lib/flydata/fluent-plugins/mysql/alter_table_query_handler.rb

@@ -17,9 +17,9 @@ module Mysql
       emit_record(:alter_table, record) do |opt|
         ret = nil
         begin
-          result = ParserProvider.parser(:mysql, :mysql_alter_table).new.parse(record['query'])
+          result = ParserProvider.parser(:mysql, :mysql_alter_table).new.parse(normalized_query)
           if result.nil?
-            $log.error("Received unsupported alter table query. query:'#{record['query']}'")
+            $log.error("Received unsupported alter table query. normalized query:'#{normalized_query}', raw query: '#{record['query']}'")
           else
             ret = result.tree
             breaking_query = ret[:actions].any?{|action| !action.has_key?(:support_level) || action[:support_level] != :nonbreaking}
@@ -27,8 +27,7 @@ module Mysql
           end
         rescue => e
           msg = <<EOS
-Received unsupported alter table query. query:'#{record['query']}'
-  Caused by error '#{e.to_s}'
+Received unsupported alter table query. normalized query:'#{normalized_query}', raw query: '#{record['query']}' Caused by error '#{e.to_s}'
   Stacktrace :
 #{e.backtrace.join("\n")}
 EOS

data/lib/flydata/fluent-plugins/mysql/binlog_query_dispatcher.rb

@@ -7,25 +7,47 @@ module Mysql
     end
 
     def dispatch(record)
-      @handlers.each do |handler|
-        query = normalize_query(record["query"])
-        if (handler.pattern.match(query))
-          handler.process(record, query)
-          break
+      normalize_query(record["query"]) do |query|
+        @handlers.each do |handler|
+          if (handler.pattern.match(query))
+            handler.process(record, query)
+            break
+          end
         end
       end
     end
 
     private
 
-    def normalize_query(query)
-      query = strip_comments(query)
+    def normalize_query(queries)
+      queries = strip_comments(queries)
+      queries = queries.gsub(/\s+/, ' ') # replace multiple spaces with a space
+      queries.split(';').each do |query|
+        query = query.lstrip
+        yield(query + ";") if block_given? && !query.empty?
+      end
     end
 
     def strip_comments(query)
-      query = query.gsub(/--\s.*\n/, ' ')  # -- style comments
-      query = query.gsub(/\/\*[^\*].*\*\//, ' ') # /* */ style comments
-      query = query.gsub(/\s+/, ' ') # replace multiple spaces with a space
+      q = query.dup
+      # \/\*.*?\*\/        /* */ style comment
+      # `.*?`              `resource_name`
+      # '(?:\\.|.)*?'      'string'
+      # "(?:\\.|.)*?"      "string"
+      # --\s+.*?(?:\n|$)   -- style comment
+      # #\s+.*?(?:\n|$)    # style comment
+      query.scan(/(\/\*.*?\*\/|`.*?`|'(?:\\.|.)*?'|"(?:\\.|.)*?"|--\s+.*?(?:\n|$)|#.*?(?:\n|$))/m) do |m|
+        comment_or_quoted = m.first
+        if comment_or_quoted.start_with?("/*") || comment_or_quoted.start_with?("--") ||
+           comment_or_quoted.start_with?("#")
+          # comment. replace with spaces of the same length
+          idx_from = $~.offset(0)[0]
+          idx_to = $~.offset(0)[1]
+          len = idx_to - idx_from
+          q[idx_from...idx_to] = ' ' * len
+        end
+      end
+      q
     end
   end
 

data/lib/flydata/parser/mysql/mysql_alter_table.treetop

@@ -16,7 +16,7 @@ grammar MysqlAlterTable
 
   rule alter_table
     alter_key sp online_option ignore_option table_key sp tbl_name
-    sp alter_commands {
+    sp alter_commands (nsp ';')? {
       def tree
         value = {
           type: :alter_table,

data/lib/flydata/table_def/mysql_table_def.rb

@@ -217,7 +217,7 @@ class MysqlTableDef
   private
 
   def self.parse_key(line, columns, type = :primary_key)
-    line = /\((?:`.*?`(?:,\s*)?)+\)/.match(line)[0]
+    line = /\((?:`.*?`(?:\(.*?\))?(?:,\s*)?)+\)/.match(line)[0]
     keys = line.scan(/`(.*?)`/).collect{|item| item[0]}
 
     keys.each do |key|

data/spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb

@@ -108,7 +108,7 @@ EOT
 EOT
   # QUERY: alter table add index
   TEST_EVENT_QUERY_ALTER_TABLE_ADD_INDEX = <<EOT
-{"marker"=>0, "timestamp"=>#{TEST_TIMESTAMP}, "type_code"=>2, "server_id"=>1, "event_length"=>217, "next_position"=>337, "flags"=>0, "event_type"=>"Query", "thread_id"=>10097, "exec_time"=>0, "error_code"=>0, "variables"=>[0, 0, 0, 0, 0, 1, 0, 0, 0, 64, 0, 0, 0, 0, 6, 3, 115, 116, 100, 4, 33, 0, 33, 0, 8, 0, 12, 1, 109, 97, 107, 95, 100, 101, 118, 101, 108, 111, 112, 109, 101, 110, 116, 0], "db_name"=>"test_db", "query"=>"ALTER TABLE `test_db`.`test_table` \nADD INDEX `my_index` USING HASH (`extra` ASC)  COMMENT 'How does this look in binlog?'"}
+{"marker"=>0, "timestamp"=>#{TEST_TIMESTAMP}, "type_code"=>2, "server_id"=>1, "event_length"=>217, "next_position"=>337, "flags"=>0, "event_type"=>"Query", "thread_id"=>10097, "exec_time"=>0, "error_code"=>0, "variables"=>[0, 0, 0, 0, 0, 1, 0, 0, 0, 64, 0, 0, 0, 0, 6, 3, 115, 116, 100, 4, 33, 0, 33, 0, 8, 0, 12, 1, 109, 97, 107, 95, 100, 101, 118, 101, 108, 111, 112, 109, 101, 110, 116, 0], "db_name"=>"test_db", "query"=>"ALTER TABLE `test_db`.`test_table` \nADD INDEX `my_index` USING HASH (`extra` ASC) COMMENT 'How does this look in binlog?'"}
 EOT
   # - 03 STOP_EVENT
   TEST_EVENT_STOP = <<EOT
@@ -349,7 +349,7 @@ EOT
               actions: [{
                 action: :add_index,
                 support_level: :nonbreaking,
-                query: "ADD INDEX `my_index` USING HASH (`extra` ASC)  COMMENT 'How does this look in binlog?'",
+                query: "ADD INDEX `my_index` USING HASH (`extra` ASC) COMMENT 'How does this look in binlog?'",
               }],
             })
           end

data/spec/flydata/fluent-plugins/mysql/alter_table_query_handler_spec.rb

@@ -69,7 +69,7 @@ module Mysql
           expect(parser).to receive(:parse).and_return(nil)
         end
         it "returns nil with a warn log" do
-          expect($log).to receive(:error).with(/Received unsupported alter table query\. query:'#{query}'/)
+          expect($log).to receive(:error).with(/Received unsupported alter table query\./)
 
           expect(subject.process(record, normalized_query)).to eq(nil)
         end

data/spec/flydata/fluent-plugins/mysql/binlog_query_dispatcher_spec.rb

@@ -0,0 +1,176 @@
+require_relative '../../../spec_helper'
+require 'flydata/fluent-plugins/mysql/binlog_query_dispatcher'
+
+module Mysql
+
+  QUERY_WITH_COMMENTS = <<EOT
+-- ALTER TABLE QUERY comment
+ALTER TABLE test_table
+ADD /* test-comment */ COLUMN value10 -- aaaaa
+-- bbbbb
+VARCHAR(512) DEFAULT NULL
+   -- flydata
+   -- hapyrus
+;
+EOT
+  NORMALIZED_QUERY_WITH_COMMENTS = "ALTER TABLE test_table ADD COLUMN value10 VARCHAR(512) DEFAULT NULL ;"
+
+  QUERY_WITH_LEADING_NEWLINE = <<EOT
+
+ALTER TABLE test_table
+ADD /* test-comment */ COLUMN
+value10 -- aaaaa
+-- bbbbb
+VARCHAR(512) DEFAULT NULL
+   -- flydata
+   -- hapyrus
+
+;
+
+EOT
+
+  CUSTOMER_QUERY = <<EOT
+-- ALTER TABLE UserPaymentMethods DROP COLUMN GoogleWallet;
+ALTER TABLE UserPaymentMethods ADD COLUMN GoogleWallet VARCHAR(512) DEFAULT NULL
+/*!*/;
+EOT
+
+  NORMALIZED_CUSTOMER_QUERY = "ALTER TABLE UserPaymentMethods ADD COLUMN GoogleWallet VARCHAR(512) DEFAULT NULL ;"
+
+  QUERY_WITH_SPECIAL_CHARS_IN_DEFAULT = <<EOT
+alter table test_table add (value1 varchar(26) not null default 'flydata -- special', value2 int auto_increment); -- real comment
+EOT
+  NORMALIZED_QUERY_WITH_SPECIAL_CHARS = "alter table test_table add (value1 varchar(26) not null default 'flydata -- special', value2 int auto_increment);"
+
+  describe FlydataBinlogQueryDispatcher do
+    let(:record) do
+      r = double('record')
+      allow(r).to receive(:[]).with("query").and_return(query)
+      r
+    end
+    let(:query_handler) do
+      r = double('query_handler')
+      allow(r).to receive(:pattern).and_return(/^ALTER TABLE/i)
+      expect(r).to receive(:process).with(record, normalized_query)
+      r
+    end
+    let(:context) { double('context') }
+    subject { described_class.new(context) }
+
+    shared_examples "a dispatcher that calls query handler with correct query" do
+      it do
+        expect(AlterTableQueryHandler).to receive(:new).with(context).and_return(query_handler)
+        expect(subject.dispatch(record))
+      end
+    end
+
+    describe '#dispatch' do
+      context "query with comments" do
+        let(:query) { QUERY_WITH_COMMENTS }
+        let(:normalized_query) { NORMALIZED_QUERY_WITH_COMMENTS }
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "customer query" do
+        let(:query) { CUSTOMER_QUERY }
+        let(:normalized_query) { NORMALIZED_CUSTOMER_QUERY }
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with leading newline" do
+        let(:query) { QUERY_WITH_LEADING_NEWLINE }
+        let(:normalized_query) { NORMALIZED_QUERY_WITH_COMMENTS }
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with special characters in DEFAULT" do
+        let(:query) { QUERY_WITH_SPECIAL_CHARS_IN_DEFAULT }
+        let(:normalized_query) { NORMALIZED_QUERY_WITH_SPECIAL_CHARS }
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with preceding commands" do
+        let(:query) { <<EOS }
+use `mydatabase`/*!*/;
+ALTER TABLE `apps` ADD `created_by_existing_admin` tinyint(1) DEFAULT 0 /*application:MyApp,line:/usr/local/lib/ruby/2.0.0/benchmark.rb:281:in `measure'*/
+/*!*/;
+SET TIMESTAMP=1415925954/*!*/;
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+ALTER TABLE `apps` ADD `created_by_existing_admin` tinyint(1) DEFAULT 0 ;
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with a comment with no space" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table test add/* adding a column */test varchar(4);
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(4);
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with strings including comment quotes" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT ' /* ' COMMENT ' */ -- a part of COMMENT string';
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT ' /* ' COMMENT ' */ -- a part of COMMENT string';
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with comments including string quotes and ending without a line feed" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table /* /* ' */ test add test varchar(256) -- this is a comment';
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) ;
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with DEFAULT using double-quote" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT "This # is default -- with \\\" in it";
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT "This # is default -- with \\\" in it";
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with # style comment" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) # You never know this works in MySQL '"
+  DEFAULT "This is default with \\\" in it"
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT "This is default with \\\" in it";
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with single quote string with escape" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) COMMENT 'Stave\\'s # -- diner'
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) COMMENT 'Stave\\'s # -- diner';
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with quoted string with UTF8 3 byte chars" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT "無国籍" COMMENT 'SJIS is トラブルメーカー'
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT "無国籍" COMMENT 'SJIS is トラブルメーカー';
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+      context "query with comments with UTF8 3 byte chars" do
+        let(:query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) /* 無国籍 */ -- 'SJIS is トラブルメーカー'
+DEFAULT NULL;
+EOS
+        let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+alter table test add test varchar(256) DEFAULT NULL;
+EOS
+        it_behaves_like "a dispatcher that calls query handler with correct query"
+      end
+    end
+  end
+end

data/spec/flydata/table_def/mysql_table_def_spec.rb

@@ -130,21 +130,21 @@ describe MysqlTableDef do
         )
       end
     end
-    
+
     context 'when table has unsigned column' do
       let(:dump_file_io) { file_io('mysqldump_test_unsigned.dump')}
       it 'should include unsigned in column type' do
         expect(subject[:columns]).to eq(
           [
-            {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},                             
+            {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
             {:column=>"value_int", :type=>"int4(10) unsigned", :default=>nil},
-            {:column=>"value_float", :type=>"float4 unsigned", :default=>nil}, 
-            {:column=>"value_dec", :type=>"numeric(10,2) unsigned", :default=>nil}, 
-            {:column=>"value_double", :type=>"float8 unsigned", :default=>nil}, 
-            {:column=>"name", :type=>"varchar(768)", :default=>nil}, 
+            {:column=>"value_float", :type=>"float4 unsigned", :default=>nil},
+            {:column=>"value_dec", :type=>"numeric(10,2) unsigned", :default=>nil},
+            {:column=>"value_double", :type=>"float8 unsigned", :default=>nil},
+            {:column=>"name", :type=>"varchar(768)", :default=>nil},
             {:column=>"value_small_int", :type=>"int2(5) unsigned", :default=>nil}
           ]
-        )      
+        )
       end
     end
 
@@ -156,11 +156,11 @@ describe MysqlTableDef do
             {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
             {:column=>"title", :type=>"varchar(768)", :unique=>true, :default=>nil},
             {:column=>"name", :type=>"text"},
-            {:column=>"num", :type=>"int4(11)", :unique=>true, :default=>nil}            
+            {:column=>"num", :type=>"int4(11)", :unique=>true, :default=>nil}
           ]
-        )      
+        )
       end
-    end    
+    end
 
     context 'when table has an unique key with a key name different than the column name' do
       let(:dump_file_io) { file_io('mysqldump_test_unique_key2.dump')}
@@ -170,11 +170,20 @@ describe MysqlTableDef do
             {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
             {:column=>"title", :type=>"varchar(768)", :unique=>true, :default=>nil},
             {:column=>"name", :type=>"text"},
-            {:column=>"num", :type=>"int4(11)", :unique=>true, :default=>nil}            
+            {:column=>"num", :type=>"int4(11)", :unique=>true, :default=>nil}
           ]
-        )      
+        )
       end
-    end    
+    end
+
+    context 'when table has unique keys with length specified' do
+      let(:dump_file_io) { file_io('mysqldump_test_unique_key3.dump')}
+      it 'should include unique in column def' do
+        subject[:columns].each { |col|
+          expect(col[:unique]).to eq(true) if ['app_id','overage_id','item_name'].include? col[:column]
+        }
+      end
+    end
   end
 end
 

data/spec/flydata/table_def/mysqldump_test_unique_key3.dump

@@ -0,0 +1,58 @@
+-- MySQL dump 10.13  Distrib 5.5.40, for debian-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: flydata_sync
+-- ------------------------------------------------------
+-- Server version	5.5.40-0ubuntu0.12.04.1-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `invoice_items`
+--
+
+DROP TABLE IF EXISTS `invoice_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoice_items` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `app_id` int(11) NOT NULL,
+  `subscription_id` int(11) NOT NULL,
+  `overage_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `stripe_invoice_item_id` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `stripe_error` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `synced_to_stripe` tinyint(1) NOT NULL DEFAULT '0',
+  `description` text COLLATE utf8mb4_unicode_ci,
+  `item_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `item_cost` int(11) NOT NULL,
+  `item_count` int(11) NOT NULL,
+  `total_cost` int(11) NOT NULL,
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL,
+  `bill_ahead` tinyint(1) DEFAULT '0',
+  `bill_ahead_resolved_at` datetime DEFAULT NULL,
+  `stripe_invoice_id` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_vat` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index_invoice_items_on_app_id_and_overage_id_and_item_name` (`app_id`,`overage_id`(32),`item_name`(32)) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=16654 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2014-11-14  9:55:46

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.15
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -482,6 +482,7 @@ files:
 - spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb
 - spec/flydata/fluent-plugins/mysql/alter_table_query_handler_spec.rb
 - spec/flydata/fluent-plugins/mysql/binlog_position_spec.rb
+- spec/flydata/fluent-plugins/mysql/binlog_query_dispatcher_spec.rb
 - spec/flydata/heroku_spec.rb
 - spec/flydata/output/forwarder_spec.rb
 - spec/flydata/parser/mysql/alter_table_parser_spec.rb
@@ -496,6 +497,7 @@ files:
 - spec/flydata/table_def/mysqldump_test_table_no_pk.dump
 - spec/flydata/table_def/mysqldump_test_unique_key.dump
 - spec/flydata/table_def/mysqldump_test_unique_key2.dump
+- spec/flydata/table_def/mysqldump_test_unique_key3.dump
 - spec/flydata/table_def/mysqldump_test_unsigned.dump
 - spec/flydata/table_def/redshift_table_def_spec.rb
 - spec/flydata/util/encryptor_spec.rb