flydata 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79c609aea9b48dabaf04f5bb1e45d702bb1ccd8
-  data.tar.gz: bf30492871ede7150012351b0092af04c273315f
+  metadata.gz: a3b273dc439a9c6c58398ed75794f67ab7fcd785
+  data.tar.gz: 20a9d323a93ebb65865e5dbee86750d3c71b8dbe
 SHA512:
-  metadata.gz: a271b10b00eb8897e51853b74d9ea19cde03f89457dbc38709e9c2a6f889de75680c76f963a67cd3cf2f822f72203d216f59bd60f8e384e9b329b78a2941a89f
-  data.tar.gz: d9985f166994b103fff6a10a7e842f67d03aebd4104c3c758ad3b64a8b849993f6ea580502bb7830a9a72caf1bc3029b6afa851684854708d406c61922c38768
+  metadata.gz: 1596629dd6c036e157db63f20ffef8fb84f9201f1677b201892e8b59b2f81c5178535a58a3b2f6a4e35fca908ac87a6b5cc3d8af10ecdbd8408734532a9f4a57
+  data.tar.gz: c113a7bdce48f2d683769b50c134efdc6925e6b40897ce14e90ac3c51cf8e54d6c018d1c9ef967ced2e7f957bb78584d7e0fdf10eac182ab3853757d3c6ec369

data/VERSION

@@ -1 +1 @@
-0.2.16
+0.2.17

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.2.16"
+  s.version = "0.2.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2014-11-19"
+  s.date = "2014-11-24"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]

data/lib/flydata/command/sync.rb

@@ -242,16 +242,16 @@ module Flydata
           while !stdout.eof?
             begin
               mysql_tabledef = Flydata::TableDef::MysqlTableDef.create(stdout)
-            rescue TableDefError => e
+              if mysql_tabledef.nil?
+                # stream had no more create table definition
+                break
+              end
+              flydata_tabledef = mysql_tabledef.to_flydata_tabledef
+              puts Flydata::TableDef::RedshiftTableDef.from_flydata_tabledef(flydata_tabledef, flydata_ctl_table: create_flydata_ctl_table, schema_name: schema_name, ctl_only: opts.ctl_only?)
+            rescue TableDefError=> e
               error_list << e.err_hash
               next
             end
-            if mysql_tabledef.nil?
-              # stream had no more create table definition
-              break
-            end
-            flydata_tabledef = mysql_tabledef.to_flydata_tabledef
-            puts Flydata::TableDef::RedshiftTableDef.from_flydata_tabledef(flydata_tabledef, flydata_ctl_table: create_flydata_ctl_table, schema_name: schema_name, ctl_only: opts.ctl_only?)
             create_flydata_ctl_table = false
           end
           errors = ""
@@ -270,7 +270,7 @@ module Flydata
               $stderr.puts "  - #{hash[:table]}" if hash[:table]
             end
           end
-          $stderr.puts "Please fix the above error(s) and try again."
+          $stderr.puts "Please fix the above error(s) to try to sync those table(s) or contact us for further help."
         end
       end
 

data/lib/flydata/compatibility_check.rb

@@ -54,7 +54,7 @@ module Flydata
       end
 
       unless errors.empty?
-        message = "Cannot connect to outisde ports. Please check to make sure you have these outgoing ports open."
+        message = "Cannot connect to outside ports. Please check to make sure you have these outgoing ports open."
         errors.each do |port, e|
           message += "  Port #{port}, Error #{e.class.name}: #{e.to_s}"
         end

data/lib/flydata/table_def/mysql_table_def.rb

@@ -30,6 +30,7 @@ class MysqlTableDef
   TYPE_MAP_M2F = {
     'bigint' => {type: 'int8'},
     'binary' => {type: 'binary', override: PROC_override_varbinary},
+    'bit' => {type: 'bit'},
     'blob' => {type: 'varbinary(65535)'},
     'bool' => {type: 'int1'},
     'boolean' => {type: 'int1'},
@@ -51,6 +52,7 @@ class MysqlTableDef
     'mediumint' => {type: 'int3'},
     'mediumtext' => {type: 'text'},
     'numeric' => {type: 'numeric'},
+    'set' => {type: 'set'},
     'smallint' => {type: 'int2'},
     'text' => {type: 'text'},
     'time' => {type: 'time'},
@@ -130,7 +132,7 @@ class MysqlTableDef
         elsif stripped_line.start_with?("UNIQUE KEY")
           parse_key(line, columns, :unique)
         else
-          $stderr.puts "Unknown table definition. Skip. (#{line})"
+          # "Unknown table definition. Skip. (#{line})"
         end
 
       when :after_create_table

data/lib/flydata/table_def/redshift_table_def.rb

@@ -4,6 +4,7 @@ module TableDef
 class RedshiftTableDef
   TYPE_MAP_F2R = {
     'binary' => {type: 'varchar', use_params: true, default_value: ''},
+    'bit' => {type: 'bigint', default_value: '0'},
     'char' => {type: 'char', use_params: true, default_value: ''},
     'date' => {type: 'date', default_value: '0000-01-01'},
     'datetime' => {type: 'timestamp', default_value: '0000-01-01'},
@@ -24,6 +25,7 @@ class RedshiftTableDef
     'int8 unsigned' => {type: 'numeric(20,0)', unsigned: true, default_value: '0'},
     'numeric' => {type: 'numeric', use_params: true, max_size: [38,37], default_value: '0'},
     'numeric unsigned' => {type: 'numeric', use_params: true, max_size: [38,37], default_value: '0'},
+    'set' => {type: 'varchar encode bytedict', default_value: ''},
     'text' => {type: 'varchar(max)', default_value: ''},
     'time' => {type: 'timestamp', default_value: '0000-01-01'},
     'varbinary' => {type: 'varchar', use_params: true, max_size: 65535, default_value: ''},
@@ -33,11 +35,16 @@ class RedshiftTableDef
     options[:flydata_ctl_table] = true unless options.has_key?(:flydata_ctl_table)
     schema_name = options[:schema_name]
 
-    tabledef = ""
-    tabledef += create_flydata_ctl_table_sql(schema_name) if options[:flydata_ctl_table]
-    tabledef += create_table_sql(flydata_tabledef, schema_name) unless options[:ctl_only]
-    tabledef += comment_sql(flydata_tabledef, schema_name) unless options[:ctl_only]
-    tabledef += flydata_ctl_sql(flydata_tabledef, schema_name)
+    begin
+      tabledef = ""
+      tabledef += create_flydata_ctl_table_sql(schema_name) if options[:flydata_ctl_table]
+      tabledef += create_table_sql(flydata_tabledef, schema_name) unless options[:ctl_only]
+      tabledef += comment_sql(flydata_tabledef, schema_name) unless options[:ctl_only]
+      tabledef += flydata_ctl_sql(flydata_tabledef, schema_name)
+    rescue => e
+      # Catch errors from generating schema. Generally an unsupported data type
+      raise TableDefError, {error: "errors generating schema. Please contact us for further instructions", table: flydata_tabledef[:table_name]}
+    end
   end
 
   FLYDATA_CTL_COLUMNS_TABLE = "flydata_ctl_columns"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client