flydata 0.2.17 → 0.2.18

data/{lib/flydata → flydata-core/lib/flydata-core}/table_def/mysql_table_def.rb

@@ -1,4 +1,4 @@
-module Flydata
+module FlydataCore
 module TableDef
 
 class MysqlTableDef
@@ -78,8 +78,8 @@ class MysqlTableDef
     nil
   end
 
-  def self.create(io)
-    params = _create(io)
+  def self.create(io, options = {})
+    params = _create(io, options)
     params ? self.new(*params) : nil
   end
 
@@ -91,7 +91,7 @@ class MysqlTableDef
     @comment = comment
   end
 
-  def self._create(io)
+  def self._create(io, options)
     table_def = ''
     table_name = nil
     columns = []
@@ -136,7 +136,7 @@ class MysqlTableDef
         end
 
       when :after_create_table
-        unless columns.any? {|column| column[:primary_key]}
+        unless columns.any? {|column| column[:primary_key]} or options[:skip_primary_key_check]
           raise TableDefError, {error: "no primary key defined", table: table_name}
         end
         break
@@ -196,10 +196,8 @@ class MysqlTableDef
         column[:auto_increment] = true if line =~ /AUTO_INCREMENT/i
         column[:not_null] = true if line =~ /NOT NULL/i
         column[:unique] = true if line =~ /UNIQUE/i
-        if /DEFAULT\s+((?:[^'\s]+\b)|(?:'(?:\\'|[^'])*'))/i.match(line)
+        if /DEFAULT\s+((?:[bx]?'(?:\\'|[^'])*')|(?:[^'\s]+\b))/i.match(line)
           val = $1
-          val = val.slice(1..-1) if val.start_with?("'")
-          val = val.slice(0..-2) if val.end_with?("'")
           column[:default] = val == "NULL" ? nil : val
         end
         if /COMMENT\s+'(((?:\\'|[^'])*))'/i.match(line)

data/{lib/flydata → flydata-core/lib/flydata-core}/table_def/redshift_table_def.rb

@@ -1,4 +1,7 @@
-module Flydata
+require 'date'
+require 'flydata-core/errors'
+
+module FlydataCore
 module TableDef
 
 class RedshiftTableDef
@@ -140,7 +143,19 @@ EOS
     when 'date'
       "'#{self.parse_date(default_value)}'"
     else
-      "'#{default_value}'"
+      if !default_value.kind_of?(String)
+        "'#{default_value}'"
+      elsif /^b'.+'$/.match(default_value)
+        "0b#{default_value[2..-2]}".oct
+      elsif /^[xX]'.+'$/.match(default_value)
+        "0x#{default_value[2..-2]}".oct
+      elsif /^0[bx].+/.match(default_value)
+        default_value.oct
+      elsif /^'.*'$/.match(default_value)
+        default_value
+      else
+        "'#{default_value}'"
+      end
     end
   end
 

data/flydata-core/lib/flydata-core/table_def.rb

@@ -0,0 +1,2 @@
+require 'flydata-core/table_def/redshift_table_def'
+require 'flydata-core/table_def/mysql_table_def'

data/flydata-core/lib/flydata-core/thread_context.rb

@@ -0,0 +1,31 @@
+module FlydataCore
+  class ThreadContext
+    THREAD_LOCAL_KEY = 'flydata_thread_context'
+
+    def self.initialize(params = {})
+      Thread.current[THREAD_LOCAL_KEY] = params
+    end
+
+    def self.initialized?
+      !!(Thread.current[THREAD_LOCAL_KEY])
+    end
+
+    def self.parameters
+      Thread.current[THREAD_LOCAL_KEY]
+    end
+
+    def self.[](k)
+      h = Thread.current[THREAD_LOCAL_KEY]
+      h[k]
+    end
+
+    def self.[]=(k, v)
+      h = Thread.current[THREAD_LOCAL_KEY]
+      h[k] = v
+    end
+
+    def self.reset
+      Thread.current[THREAD_LOCAL_KEY] = nil
+    end
+  end
+end

data/flydata-core/lib/flydata-core.rb

@@ -0,0 +1 @@
+# Add require here

data/flydata-core/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'rubygems'
+require 'flydata-core'

data/{spec/flydata → flydata-core/spec}/table_def/mysql_table_def_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'flydata/table_def'
+require 'flydata-core/table_def'
 
-module Flydata
+module FlydataCore
 module TableDef
 
 
@@ -33,7 +33,7 @@ describe MysqlTableDef do
             {:column=>"id", :type=>"int8(20)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
             {:column=>"col_binary", :type=>"binary(202)", :default=>nil},
             {:column=>"col_blob", :type=>"varbinary(65535)"},
-            {:column=>"col_bool", :type=>"int1(1)", :default=>"0"},
+            {:column=>"col_bool", :type=>"int1(1)", :default=>"'0'"},
             {:column=>"col_char", :type=>"varchar(18)", :default=>nil},
             {:column=>"col_date", :type=>"date", :default=>nil},
             {:column=>"col_datetime", :type=>"datetime", :default=>nil},
@@ -73,7 +73,7 @@ describe MysqlTableDef do
     context 'when table does not have primary key' do
       let(:dump_file_io) { file_io('mysqldump_test_table_no_pk.dump') }
       it 'should raise an error' do
-        expect{subject}.to raise_error(Flydata::TableDefError)
+        expect{subject}.to raise_error(FlydataCore::TableDefError)
       end
     end
 
@@ -82,7 +82,7 @@ describe MysqlTableDef do
       it 'comment should be set' do
         expect(subject[:columns]).to eq(
           [
-            {:column=>"id", :type=>"int4(11)", :not_null=>true, :default=>"0",
+            {:column=>"id", :type=>"int4(11)", :not_null=>true, :default=>"'0'",
              :comment=>"this is primary key", :primary_key=>true},
             {:column=>"value", :type=>"text"}
           ]
@@ -95,8 +95,8 @@ describe MysqlTableDef do
       it 'multi pk should be set' do
         expect(subject[:columns]).to eq(
           [
-            {:column=>"id1", :type=>"int4(11)", :not_null=>true, :default=>"0", :primary_key=>true},
-            {:column=>"id2", :type=>"int4(11)", :not_null=>true, :default=>"0", :primary_key=>true},
+            {:column=>"id1", :type=>"int4(11)", :not_null=>true, :default=>"'0'", :primary_key=>true},
+            {:column=>"id2", :type=>"int4(11)", :not_null=>true, :default=>"'0'", :primary_key=>true},
             {:column=>"value", :type=>"text"}
           ]
         )
@@ -110,7 +110,7 @@ describe MysqlTableDef do
           [
             {:column=>"id", :type=>"int4(11)", :not_null=>true, :primary_key=>true},
             {:column=>"enum_1", :type=>"enum('apple','orange','banana')", :default=>nil},
-            {:column=>"enum_2", :type=>"enum('a','b','c')", :default=>"a"},
+            {:column=>"enum_2", :type=>"enum('a','b','c')", :default=>"'a'"},
             {:column=>"enum_3", :type=>"enum('e','f','g')", :not_null=>true},
           ]
         )
@@ -184,6 +184,20 @@ describe MysqlTableDef do
         }
       end
     end
+
+    context 'when table has bit with 0b default value' do
+      let(:dump_file_io) { file_io('mysqldump_test_bit_table.dump')}
+      it 'should extract default bit value appropriately' do
+        expect(subject[:columns][1][:default]).to eq("b'1'")
+      end
+    end
+
+    context 'when table has int with 0x default value' do
+      let(:dump_file_io) { file_io('mysqldump_test_bit_table.dump')}
+      it 'should extract default int value appropriately' do
+        expect(subject[:columns][2][:default]).to eq("x'10'")
+      end
+    end
   end
 end
 

data/flydata-core/spec/table_def/mysql_to_redshift_table_def_spec.rb

@@ -0,0 +1,428 @@
+require 'spec_helper'
+require 'flydata-core/table_def'
+
+module FlydataCore
+  module TableDef
+    describe 'generate redshift table ddl from mysqldump' do
+
+      # file full path which exists in same directory.
+      def full_path(file_name)
+        File.join(File.dirname(__FILE__), file_name)
+      end
+
+      def file_io(file_name)
+        File.new(full_path(file_name))
+      end
+
+      let(:dump_file_name) { raise "file_name must be override on context." }
+      let(:dump_file_io) { file_io(dump_file_name) }
+
+      subject {
+        RedshiftTableDef.from_flydata_tabledef(
+        MysqlTableDef.create(dump_file_io).to_flydata_tabledef)
+      }
+
+      context 'with mysqldump_test_table_all' do
+        let(:dump_file_name) { 'mysqldump_test_table_all.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "test_table_all";
+CREATE TABLE "test_table_all" (
+  "id" int8 NOT NULL,
+  "col_binary" varchar(202) DEFAULT NULL,
+  "col_blob" varchar(65535),
+  "col_bool" int2 DEFAULT '0',
+  "col_char" varchar(18) DEFAULT NULL,
+  "col_date" date DEFAULT NULL,
+  "col_datetime" timestamp DEFAULT NULL,
+  "col_decimal" numeric(5,2) DEFAULT NULL,
+  "col_double" float8 DEFAULT NULL,
+  "col_float" float4 DEFAULT NULL,
+  "col_float_4_2" float4 DEFAULT NULL,
+  "col_int" int4 DEFAULT NULL,
+  "col_int_6" int4 DEFAULT NULL,
+  "col_longblob" varchar(65535),
+  "col_longtext" varchar(max),
+  "col_mediumblob" varchar(65535),
+  "col_mediumint" int4 DEFAULT NULL,
+  "col_mediumtext" varchar(max),
+  "col_smallint" int2 DEFAULT NULL,
+  "col_text" varchar(max),
+  "col_time" timestamp DEFAULT NULL,
+  "col_timestamp" timestamp NOT NULL DEFAULT SYSDATE,
+  "col_tinyblob" varchar(255),
+  "col_tinyint" int2 DEFAULT NULL,
+  "col_tinytext" varchar(max),
+  "col_varbinary" varchar(512) DEFAULT NULL,
+  "col_varchar" varchar(372) DEFAULT NULL,
+  PRIMARY KEY (id)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'test_table_all';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('test_table_all', 'id', 'int8(20)', 1),
+('test_table_all', 'col_binary', 'binary(202)', 2),
+('test_table_all', 'col_blob', 'varbinary(65535)', 3),
+('test_table_all', 'col_bool', 'int1(1)', 4),
+('test_table_all', 'col_char', 'varchar(18)', 5),
+('test_table_all', 'col_date', 'date', 6),
+('test_table_all', 'col_datetime', 'datetime', 7),
+('test_table_all', 'col_decimal', 'numeric(5,2)', 8),
+('test_table_all', 'col_double', 'float8', 9),
+('test_table_all', 'col_float', 'float4', 10),
+('test_table_all', 'col_float_4_2', 'float4(4,2)', 11),
+('test_table_all', 'col_int', 'int4(11)', 12),
+('test_table_all', 'col_int_6', 'int4(6)', 13),
+('test_table_all', 'col_longblob', 'varbinary(4294967295)', 14),
+('test_table_all', 'col_longtext', 'text', 15),
+('test_table_all', 'col_mediumblob', 'varbinary(16777215)', 16),
+('test_table_all', 'col_mediumint', 'int3(9)', 17),
+('test_table_all', 'col_mediumtext', 'text', 18),
+('test_table_all', 'col_smallint', 'int2(6)', 19),
+('test_table_all', 'col_text', 'text', 20),
+('test_table_all', 'col_time', 'time', 21),
+('test_table_all', 'col_timestamp', 'datetime', 22),
+('test_table_all', 'col_tinyblob', 'varbinary(255)', 23),
+('test_table_all', 'col_tinyint', 'int1(4)', 24),
+('test_table_all', 'col_tinytext', 'text', 25),
+('test_table_all', 'col_varbinary', 'varbinary(512)', 26),
+('test_table_all', 'col_varchar', 'varchar(372)', 27);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_bit_table.dump' do
+        let(:dump_file_name) { 'mysqldump_test_bit_table.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "bit_test_def_1";
+CREATE TABLE "bit_test_def_1" (
+  "id" int4 NOT NULL,
+  "bit_value" bigint DEFAULT 1,
+  "int_value" int4 DEFAULT 16,
+  PRIMARY KEY (id)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'bit_test_def_1';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('bit_test_def_1', 'id', 'int4(11)', 1),
+('bit_test_def_1', 'bit_value', 'bit(1)', 2),
+('bit_test_def_1', 'int_value', 'int4(11)', 3);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_foreign_key.dump' do
+        let(:dump_file_name) { 'mysqldump_test_foreign_key.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "product_order";
+CREATE TABLE "product_order" (
+  "no" int4 NOT NULL,
+  "product_category" int4 NOT NULL,
+  "product_id" int4 NOT NULL,
+  "customer_id" int4 NOT NULL,
+  PRIMARY KEY (no)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'product_order';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('product_order', 'no', 'int4(11)', 1),
+('product_order', 'product_category', 'int4(11)', 2),
+('product_order', 'product_id', 'int4(11)', 3),
+('product_order', 'customer_id', 'int4(11)', 4);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_table_column_comment.dump' do
+        let(:dump_file_name) { 'mysqldump_test_table_column_comment.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "test_table_column_comment";
+CREATE TABLE "test_table_column_comment" (
+  "id" int4 NOT NULL DEFAULT '0',
+  "value" varchar(max),
+  PRIMARY KEY (id)
+);
+COMMENT ON COLUMN "test_table_column_comment"."id"
+  IS 'this is primary key';
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'test_table_column_comment';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('test_table_column_comment', 'id', 'int4(11)', 1),
+('test_table_column_comment', 'value', 'text', 2);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_table_enum.dump' do
+        let(:dump_file_name) { 'mysqldump_test_table_enum.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "test_table_enum";
+CREATE TABLE "test_table_enum" (
+  "id" int4 NOT NULL,
+  "enum_1" varchar encode bytedict DEFAULT NULL,
+  "enum_2" varchar encode bytedict DEFAULT 'a',
+  "enum_3" varchar encode bytedict NOT NULL,
+  PRIMARY KEY (id)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'test_table_enum';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('test_table_enum', 'id', 'int4(11)', 1),
+('test_table_enum', 'enum_1', 'enum(\\'apple\\',\\'orange\\',\\'banana\\')', 2),
+('test_table_enum', 'enum_2', 'enum(\\'a\\',\\'b\\',\\'c\\')', 3),
+('test_table_enum', 'enum_3', 'enum(\\'e\\',\\'f\\',\\'g\\')', 4);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_table_multi_pk.dump' do
+        let(:dump_file_name) { 'mysqldump_test_table_multi_pk.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "test_table_multi_pk";
+CREATE TABLE "test_table_multi_pk" (
+  "id1" int4 NOT NULL DEFAULT '0',
+  "id2" int4 NOT NULL DEFAULT '0',
+  "value" varchar(max),
+  PRIMARY KEY (id1,id2)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'test_table_multi_pk';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('test_table_multi_pk', 'id1', 'int4(11)', 1),
+('test_table_multi_pk', 'id2', 'int4(11)', 2),
+('test_table_multi_pk', 'value', 'text', 3);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_table_no_pk.dump' do
+        let(:dump_file_name) { 'mysqldump_test_table_no_pk.dump' }
+
+        it 'should return ddl' do
+          expect{subject}.to raise_error(FlydataCore::TableDefError)
+        end
+      end
+
+      context 'with mysqldump_test_unique_key.dump' do
+        let(:dump_file_name) { 'mysqldump_test_unique_key.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "sample1";
+CREATE TABLE "sample1" (
+  "id" int4 NOT NULL,
+  "title" varchar(768) DEFAULT NULL,
+  "name" varchar(max),
+  "num" int4 DEFAULT NULL,
+  PRIMARY KEY (id)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'sample1';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('sample1', 'id', 'int4(11)', 1),
+('sample1', 'title', 'varchar(768)', 2),
+('sample1', 'name', 'text', 3),
+('sample1', 'num', 'int4(11)', 4);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_unique_key2.dump' do
+        let(:dump_file_name) { 'mysqldump_test_unique_key2.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "sample1";
+CREATE TABLE "sample1" (
+  "id" int4 NOT NULL,
+  "title" varchar(768) DEFAULT NULL,
+  "name" varchar(max),
+  "num" int4 DEFAULT NULL,
+  PRIMARY KEY (id)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'sample1';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('sample1', 'id', 'int4(11)', 1),
+('sample1', 'title', 'varchar(768)', 2),
+('sample1', 'name', 'text', 3),
+('sample1', 'num', 'int4(11)', 4);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_unique_key3.dump' do
+        let(:dump_file_name) { 'mysqldump_test_unique_key3.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "invoice_items";
+CREATE TABLE "invoice_items" (
+  "id" int4 NOT NULL,
+  "app_id" int4 NOT NULL,
+  "subscription_id" int4 NOT NULL,
+  "overage_id" varchar(765) NOT NULL,
+  "stripe_invoice_item_id" varchar(765) DEFAULT NULL,
+  "stripe_error" varchar(765) DEFAULT NULL,
+  "synced_to_stripe" int2 NOT NULL DEFAULT '0',
+  "description" varchar(max),
+  "item_name" varchar(765) NOT NULL,
+  "item_cost" int4 NOT NULL,
+  "item_count" int4 NOT NULL,
+  "total_cost" int4 NOT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL,
+  "bill_ahead" int2 DEFAULT '0',
+  "bill_ahead_resolved_at" timestamp DEFAULT NULL,
+  "stripe_invoice_id" varchar(765) DEFAULT NULL,
+  "is_vat" int2 NOT NULL DEFAULT '0',
+  PRIMARY KEY (id)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'invoice_items';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('invoice_items', 'id', 'int4(11)', 1),
+('invoice_items', 'app_id', 'int4(11)', 2),
+('invoice_items', 'subscription_id', 'int4(11)', 3),
+('invoice_items', 'overage_id', 'varchar(765)', 4),
+('invoice_items', 'stripe_invoice_item_id', 'varchar(765)', 5),
+('invoice_items', 'stripe_error', 'varchar(765)', 6),
+('invoice_items', 'synced_to_stripe', 'int1(1)', 7),
+('invoice_items', 'description', 'text', 8),
+('invoice_items', 'item_name', 'varchar(765)', 9),
+('invoice_items', 'item_cost', 'int4(11)', 10),
+('invoice_items', 'item_count', 'int4(11)', 11),
+('invoice_items', 'total_cost', 'int4(11)', 12),
+('invoice_items', 'created_at', 'datetime', 13),
+('invoice_items', 'updated_at', 'datetime', 14),
+('invoice_items', 'bill_ahead', 'int1(1)', 15),
+('invoice_items', 'bill_ahead_resolved_at', 'datetime', 16),
+('invoice_items', 'stripe_invoice_id', 'varchar(765)', 17),
+('invoice_items', 'is_vat', 'int1(1)', 18);
+EOT
+        end
+      end
+
+      context 'with mysqldump_test_unsigned.dump' do
+        let(:dump_file_name) { 'mysqldump_test_unsigned.dump' }
+
+        it 'should return ddl' do
+          expect(subject).to eq( <<EOT.strip )
+CREATE TABLE "flydata_ctl_columns"(
+  id integer NOT NULL IDENTITY(1,1),
+  table_name varchar(128) NOT NULL,
+  column_name varchar(128) NOT NULL,
+  src_data_type varchar(1024) NOT NULL,
+  revision int NOT NULL DEFAULT 1,
+  ordinal_position int NOT NULL,
+  PRIMARY KEY(id)
+) DISTKEY(table_name) SORTKEY(table_name);
+DROP TABLE "zerofill_table";
+CREATE TABLE "zerofill_table" (
+  "id" int4 NOT NULL,
+  "value_int" int8 DEFAULT NULL,
+  "value_float" float4 DEFAULT NULL,
+  "value_dec" numeric(10,2) DEFAULT NULL,
+  "value_double" float8 DEFAULT NULL,
+  "name" varchar(768) DEFAULT NULL,
+  "value_small_int" int4 DEFAULT NULL,
+  PRIMARY KEY (id)
+);
+DELETE FROM "flydata_ctl_columns" WHERE table_name = 'zerofill_table';
+INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordinal_position) VALUES
+('zerofill_table', 'id', 'int4(11)', 1),
+('zerofill_table', 'value_int', 'int4(10) unsigned', 2),
+('zerofill_table', 'value_float', 'float4 unsigned', 3),
+('zerofill_table', 'value_dec', 'numeric(10,2) unsigned', 4),
+('zerofill_table', 'value_double', 'float8 unsigned', 5),
+('zerofill_table', 'name', 'varchar(768)', 6),
+('zerofill_table', 'value_small_int', 'int2(5) unsigned', 7);
+EOT
+        end
+      end
+    end
+  end
+end

data/flydata-core/spec/table_def/mysqldump_test_bit_table.dump

@@ -0,0 +1,51 @@
+-- MySQL dump 10.13  Distrib 5.6.19, for osx10.9 (x86_64)
+--
+-- Host: localhost    Database: sync_test
+-- ------------------------------------------------------
+-- Server version	5.6.19-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 `bit_test_def_1`
+--
+
+DROP TABLE IF EXISTS `bit_test_def_1`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bit_test_def_1` (
+  `id` int(11) NOT NULL,
+  `bit_value` bit(1) DEFAULT b'1',
+  `int_value` int(11) DEFAULT x'10',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `bit_test_def_1`
+--
+
+LOCK TABLES `bit_test_def_1` WRITE;
+/*!40000 ALTER TABLE `bit_test_def_1` DISABLE KEYS */;
+/*!40000 ALTER TABLE `bit_test_def_1` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!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-24 13:14:45