flydata 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86638a18d82f42ee50003d03780a5e9a62b3d82a
-  data.tar.gz: a6d911a12d67f294d1cb855e293a0add77f99a92
+  metadata.gz: f5fc3a906ed3837e16d5cedecaf192d488c140eb
+  data.tar.gz: b5ddcf8ea4abd89688e6ed096837bf53cfff14ee
 SHA512:
-  metadata.gz: a97793d37523ba2319529941ff8661445b64836038bfa179e453800c45b18f4a91103174e0cc479d8ea821feb42e084f6098392ce7b9667b8d9d90e41f68f466
-  data.tar.gz: 94c736d7dd868e197c96ea39404e04c3f466ab8bd07ae5370872d3a11a34f77be1adcf1027df83cf272789476b451089fee682d7781fcef5b5388ad8016756fe
+  metadata.gz: 14bd2021e7c507a6ab59e29e6e210776fd6a2a7bf2eaeb52d36b1da39839d1e575203066c2b14e6bb06628f8464b1b9b9510c13c64b7ada5d727b81d46ce230e
+  data.tar.gz: 83740aa8b34dd758656071446c34a8fd2ed0486a464eca577b9ea9ff0731ece4e190ba36292210cd66953adf761e2ff5abaeb6e484582b491d93d24928eab396

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{FlyData Agent}
   gem.description = %Q{FlyData Agent}
   gem.email = "sysadmin@flydata.com"
-  gem.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
+  gem.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS", "Chie Inada"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.8.7
+0.8.8

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

@@ -145,6 +145,11 @@ class MysqlTableDef < Base
         # `col_smallint` smallint(6) DEFAULT NULL,
         if stripped_line.start_with?('`')
           column = parse_one_column_def(line)
+          unless column[:type]
+            tabledef_error = {error: "Unsupported column type '#{column[:source_type]}'", table: table_name}
+            position = :tabledef_error
+            next
+          end
           columns << column
           coldef = line.strip.gsub(/,$/, '')
           column_def[column[:column]] = coldef
@@ -236,6 +241,7 @@ class MysqlTableDef < Base
 
         # type
         type = line[start_pos..pos-1]
+        column[:source_type] = type
         column[:type] = convert_to_flydata_type(type)
 
         cond = :options

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

@@ -31,37 +31,37 @@ describe MysqlTableDef do
       it 'should set correct table name' do
         expect(subject[:columns]).to eq(
           [
-            {: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_char", :type=>"varchar(18)", :default=>nil},
-            {:column=>"col_date", :type=>"date", :default=>nil},
-            {:column=>"col_datetime", :type=>"datetime", :default=>nil},
-            {:column=>"col_decimal", :type=>"numeric(5,2)", :default=>nil},
-            {:column=>"col_double", :type=>"float8", :default=>nil},
-            {:column=>"col_float", :type=>"float4", :default=>nil},
-            {:column=>"col_float_4_2", :type=>"float4(4,2)", :default=>nil},
-            {:column=>"col_int", :type=>"int4(11)", :default=>nil},
-            {:column=>"col_int_6", :type=>"int4(6)", :default=>nil},
-            {:column=>"col_json", :type=>"json", :default=>nil},
-            {:column=>"col_longblob", :type=>"varbinary(4294967295)"},
-            {:column=>"col_longtext", :type=>"text"},
-            {:column=>"col_mediumblob", :type=>"varbinary(16777215)"},
-            {:column=>"col_mediumint", :type=>"int3(9)", :default=>nil},
-            {:column=>"col_mediumtext", :type=>"text"},
-            {:column=>"col_smallint", :type=>"int2(6)", :default=>nil},
-            {:column=>"col_text", :type=>"text"},
-            {:column=>"col_time", :type=>"time", :default=>nil},
-            {:column=>"col_timestamp", :type=>"datetime", :not_null=>true, :default=>"CURRENT_TIMESTAMP"},
-            {:column=>"col_tinyblob", :type=>"varbinary(255)"},
-            {:column=>"col_tinyint", :type=>"int1(4)", :default=>nil},
-            {:column=>"col_tinytext", :type=>"text"},
-            {:column=>"col_varbinary", :type=>"varbinary(512)", :default=>nil},
-            {:column=>"col_varchar", :type=>"varchar(372)", :default=>nil},
-            {:column=>"col_year", :type=>"year", :default=>nil},
-            {:column=>"col_year_4", :type=>"year(4)", :default=>nil},
-            {:column=>"col_year_2", :type=>"year(2)", :default=>nil},
+            {:column=>"id", :source_type=>"bigint(20)", :type=>"int8(20)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
+            {:column=>"col_binary", :source_type=>"binary(100)", :type=>"binary(202)", :default=>nil},
+            {:column=>"col_blob", :source_type=>"blob", :type=>"varbinary(65535)"},
+            {:column=>"col_bool", :source_type=>"tinyint(1)", :type=>"int1(1)", :default=>"'0'"},
+            {:column=>"col_char", :source_type=>"char(6)", :type=>"varchar(18)", :default=>nil},
+            {:column=>"col_date", :source_type=>"date", :type=>"date", :default=>nil},
+            {:column=>"col_datetime", :source_type=>"datetime", :type=>"datetime", :default=>nil},
+            {:column=>"col_decimal", :source_type=>"decimal(5,2)", :type=>"numeric(5,2)", :default=>nil},
+            {:column=>"col_double", :source_type=>"double", :type=>"float8", :default=>nil},
+            {:column=>"col_float", :source_type=>"float", :type=>"float4", :default=>nil},
+            {:column=>"col_float_4_2", :source_type=>"float(4,2)", :type=>"float4(4,2)", :default=>nil},
+            {:column=>"col_int", :source_type=>"int(11)", :type=>"int4(11)", :default=>nil},
+            {:column=>"col_int_6", :source_type=>"int(6)", :type=>"int4(6)", :default=>nil},
+            {:column=>"col_json", :source_type=>"json", :type=>"json", :default=>nil},
+            {:column=>"col_longblob", :source_type=>"longblob", :type=>"varbinary(4294967295)"},
+            {:column=>"col_longtext", :source_type=>"longtext", :type=>"text"},
+            {:column=>"col_mediumblob", :source_type=>"mediumblob", :type=>"varbinary(16777215)"},
+            {:column=>"col_mediumint", :source_type=>"mediumint(9)", :type=>"int3(9)", :default=>nil},
+            {:column=>"col_mediumtext", :source_type=>"mediumtext", :type=>"text"},
+            {:column=>"col_smallint", :source_type=>"smallint(6)", :type=>"int2(6)", :default=>nil},
+            {:column=>"col_text", :source_type=>"text", :type=>"text"},
+            {:column=>"col_time", :source_type=>"time", :type=>"time", :default=>nil},
+            {:column=>"col_timestamp", :source_type=>"timestamp", :type=>"datetime", :not_null=>true, :default=>"CURRENT_TIMESTAMP"},
+            {:column=>"col_tinyblob", :source_type=>"tinyblob", :type=>"varbinary(255)"},
+            {:column=>"col_tinyint", :source_type=>"tinyint(4)", :type=>"int1(4)", :default=>nil},
+            {:column=>"col_tinytext", :source_type=>"tinytext", :type=>"text"},
+            {:column=>"col_varbinary", :source_type=>"varbinary(255)", :type=>"varbinary(512)", :default=>nil},
+            {:column=>"col_varchar", :source_type=>"varchar(124)", :type=>"varchar(372)", :default=>nil},
+            {:column=>"col_year", :source_type=>"year", :type=>"year", :default=>nil},
+            {:column=>"col_year_4", :source_type=>"year(4)", :type=>"year(4)", :default=>nil},
+            {:column=>"col_year_2", :source_type=>"year(2)", :type=>"year(2)", :default=>nil},
           ]
         )
       end
@@ -164,9 +164,9 @@ 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", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true, :default=>"'0'",
              :comment=>"this is primary key", :primary_key=>true},
-            {:column=>"value", :type=>"text"}
+            {:column=>"value", :source_type=>"text", :type=>"text"}
           ]
         )
       end
@@ -176,9 +176,9 @@ describe MysqlTableDef do
         it 'comment should be set with replaced chars' do
           expect(subject[:columns]).to eq(
             [
-              {:column=>"id", :type=>"int4(11)", :not_null=>true, :default=>"'0'",
+              {:column=>"id", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true, :default=>"'0'",
                :comment=>"a?2BY???i", :primary_key=>true},
-               {:column=>"value", :type=>"text", :comment=>"あいうえお"}
+               {:column=>"value", :source_type=>"text", :type=>"text", :comment=>"あいうえお"}
             ]
           )
         end
@@ -190,9 +190,9 @@ 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=>"value", :type=>"text"}
+            {:column=>"id1", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true, :default=>"'0'", :primary_key=>true},
+            {:column=>"id2", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true, :default=>"'0'", :primary_key=>true},
+            {:column=>"value", :source_type=>"text", :type=>"text"}
           ]
         )
       end
@@ -203,10 +203,10 @@ describe MysqlTableDef do
       it 'enum columns should be parsed' do
         expect(subject[:columns]).to eq(
           [
-            {: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_3", :type=>"enum('e','f','g')", :not_null=>true},
+            {:column=>"id", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true, :primary_key=>true},
+            {:column=>"enum_1", :source_type=>"enum('apple','orange','banana')", :type=>"enum('apple','orange','banana')", :default=>nil},
+            {:column=>"enum_2", :source_type=>"enum('a','b','c')", :type=>"enum('a','b','c')", :default=>"'a'"},
+            {:column=>"enum_3", :source_type=>"enum('e','f','g')", :type=>"enum('e','f','g')", :not_null=>true},
           ]
         )
       end
@@ -217,10 +217,10 @@ describe MysqlTableDef do
       it 'should parse the dump correctly' do
         expect(subject[:columns]).to eq(
           [
-            {:column=>"no", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
-            {:column=>"product_category", :type=>"int4(11)", :not_null=>true},
-            {:column=>"product_id", :type=>"int4(11)", :not_null=>true},
-            {:column=>"customer_id", :type=>"int4(11)", :not_null=>true},
+            {:column=>"no", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
+            {:column=>"product_category", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true},
+            {:column=>"product_id", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true},
+            {:column=>"customer_id", :source_type=>"int(11)", :type=>"int4(11)", :not_null=>true},
           ]
         )
       end
@@ -231,13 +231,13 @@ describe MysqlTableDef do
       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=>"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_small_int", :type=>"int2(5) unsigned", :default=>nil}
+            {:column=>"id", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
+            {:column=>"value_int", :source_type=>"int(10)", :type=>"int4(10) unsigned", :default=>nil},
+            {:column=>"value_float", :source_type=>"float", :type=>"float4 unsigned", :default=>nil},
+            {:column=>"value_dec", :source_type=>"decimal(10,2)", :type=>"numeric(10,2) unsigned", :default=>nil},
+            {:column=>"value_double", :source_type=>"double", :type=>"float8 unsigned", :default=>nil},
+            {:column=>"name", :source_type=>"varchar(256)", :type=>"varchar(768)", :default=>nil},
+            {:column=>"value_small_int", :source_type=>"smallint(5)", :type=>"int2(5) unsigned", :default=>nil}
           ]
         )
       end
@@ -248,10 +248,10 @@ describe MysqlTableDef do
       it 'should include unique in column def' do
         expect(subject[:columns]).to eq(
           [
-            {: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=>"id", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
+            {:column=>"title", :source_type=>"varchar(256)", :type=>"varchar(768)", :unique=>true, :default=>nil},
+            {:column=>"name", :source_type=>"text", :type=>"text"},
+            {:column=>"num", :source_type=>"int(11)", :type=>"int4(11)", :unique=>true, :default=>nil}
           ]
         )
       end
@@ -262,10 +262,10 @@ describe MysqlTableDef do
       it 'should include unique in column def' do
         expect(subject[:columns]).to eq(
           [
-            {: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=>"id", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
+            {:column=>"title", :source_type=>"varchar(256)", :type=>"varchar(768)", :unique=>true, :default=>nil},
+            {:column=>"name", :source_type=>"text", :type=>"text"},
+            {:column=>"num", :source_type=>"int(11)", :type=>"int4(11)", :unique=>true, :default=>nil}
           ]
         )
       end
@@ -314,10 +314,10 @@ describe MysqlTableDef do
       it 'should not include unique in column def' do
         expect(subject[:columns]).to eq(
            [
-               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
-               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not unique column."},
-               {:column=>"name", :type=>"text"},
-               {:column=>"num", :type=>"int4(11)", :default=>nil}
+               {:column=>"id", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :source_type=>"varchar(256)", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not unique column."},
+               {:column=>"name", :source_type=>"text", :type=>"text"},
+               {:column=>"num", :source_type=>"int(11)", :type=>"int4(11)", :default=>nil}
            ]
         )
       end
@@ -328,10 +328,10 @@ describe MysqlTableDef do
       it 'should not include AUTO_INCREMENT in column def' do
         expect(subject[:columns]).to eq(
            [
-               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
-               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not AUTO_INCREMENT column."},
-               {:column=>"name", :type=>"text"},
-               {:column=>"num", :type=>"int4(11)", :default=>nil}
+               {:column=>"id", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :source_type=>"varchar(256)", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not AUTO_INCREMENT column."},
+               {:column=>"name", :source_type=>"text", :type=>"text"},
+               {:column=>"num", :source_type=>"int(11)", :type=>"int4(11)", :default=>nil}
            ]
         )
       end
@@ -342,10 +342,10 @@ describe MysqlTableDef do
       it 'should not include unsigned in column def' do
         expect(subject[:columns]).to eq(
            [
-               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
-               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not unsigned column."},
-               {:column=>"name", :type=>"text"},
-               {:column=>"num", :type=>"int4(11)", :default=>nil}
+               {:column=>"id", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :source_type=>"varchar(256)", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not unsigned column."},
+               {:column=>"name", :source_type=>"text", :type=>"text"},
+               {:column=>"num", :source_type=>"int(11)", :type=>"int4(11)", :default=>nil}
            ]
         )
       end
@@ -357,10 +357,10 @@ describe MysqlTableDef do
       it 'should not include not null in column def' do
         expect(subject[:columns]).to eq(
            [
-               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
-               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not null column."},
-               {:column=>"name", :type=>"text"},
-               {:column=>"num", :type=>"int4(11)", :default=>nil}
+               {:column=>"id", :source_type=>"int(11)", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :source_type=>"varchar(256)", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not null column."},
+               {:column=>"name", :source_type=>"text", :type=>"text"},
+               {:column=>"num", :source_type=>"int(11)", :type=>"int4(11)", :default=>nil}
            ]
         )
       end
@@ -538,6 +538,7 @@ describe MysqlTableDef do
     let(:query) { "  `#{colname}` text," }
     let(:expected_result) {
       { column: colname,
+        source_type: 'text',
         type: 'text',
       }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -9,10 +9,11 @@ authors:
 - Matthew Luu
 - Mak Inada
 - Sriram NS
+- Chie Inada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client