flydata 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2014-05-10"
+  s.date = "2014-05-15"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["fdmysqldump", "flydata"]

data/lib/flydata/command/sync.rb

@@ -36,13 +36,15 @@ module Flydata
 
       def check
         de = retrieve_data_entries.first
-        ret = do_check(de)
-        if ret['complete']
-          puts "No buffer data on FlyData. #{ret.inspect}"
-          true
-        else
-          puts "Now processing data on FlyData. #{ret.inspect}"
-          false
+        retry_on(RestClient::Exception) do
+          ret = do_check(de)
+          if ret['complete']
+            puts "No buffer data on FlyData. #{ret.inspect}"
+            true
+          else
+            puts "Now processing data on FlyData. #{ret.inspect}"
+            false
+          end
         end
       end
 

data/lib/flydata/helpers.rb

@@ -75,5 +75,22 @@ You can check the logs of sender(flydata) process.
     def flydata_conf_file
       File.join(FLYDATA_HOME, 'flydata.conf')
     end
+
+    # Retry the given block if +exception+ happens
+    def retry_on(exception = StandardError, try_count = 3, interval = 1.0)
+      count = 0
+      begin
+        count += 1
+        yield
+      rescue exception
+        if count < try_count
+          sleep interval
+          interval *= 2
+          retry
+        else
+          raise
+        end
+      end
+    end
   end
 end

data/lib/flydata/table_def/mysql_table_def.rb

@@ -71,19 +71,24 @@ class MysqlTableDef
       when :in_create_table
         table_def += line.chomp
 
+        stripped_line = line.strip
         # `col_smallint` smallint(6) DEFAULT NULL,
-        if line.strip.start_with?('`')
+        if stripped_line.start_with?('`')
           columns << parse_column_line(line)
         # PRIMARY KEY (`id`)
-        elsif line.strip.start_with?("PRIMARY KEY")
+        elsif stripped_line.start_with?("PRIMARY KEY")
           parse_primary_key(line, columns)
         #) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='test table';
-        elsif line.strip.start_with?(')')
+        elsif stripped_line.start_with?(')')
           default_charset = $1 if line =~ /DEFAULT CHARSET\s*=\s*([^\s]+)/
           comment = $1 if /COMMENT='((?:\\'|[^'])*)'/.match(line)
           position = :after_create_table
+        elsif stripped_line.start_with?("KEY")
+          # index creation.  No action required.
+        elsif stripped_line.start_with?("CONSTRAINT")
+          # constraint definition.  No acction required.
         else
-          raise "Invalid mysqldump file. It must be a bug...\n#{line}"
+          $stderr.puts "Unknown table definition. Skip. (#{line})"
         end
 
       when :after_create_table

data/spec/flydata/table_def/mysql_table_def_spec.rb

@@ -116,6 +116,20 @@ describe MysqlTableDef do
         )
       end
     end
+
+    context 'when table has index and foreign key constraints' do
+      let(:dump_file_io) { file_io('mysqldump_test_foreign_key.dump') }
+      it 'should parse the dump correctly' do
+        expect(subject[:columns]).to eq(
+          [
+            {:name=>"no", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
+            {:name=>"product_category", :type=>"int4(11)", :not_null=>true},
+            {:name=>"product_id", :type=>"int4(11)", :not_null=>true},
+            {:name=>"customer_id", :type=>"int4(11)", :not_null=>true},
+          ]
+        )
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -390,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1932242309607756156
+      hash: -913931267445812581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: