flydata 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e60423bcd2e535f420b6cffae38bb02d4c4183b8
-  data.tar.gz: eff1e3250db8d8e036c977f7c5c0fb50232d4fe2
+  metadata.gz: eb04da6c165e8ace6ac6b7089c73eca79d2d1fc1
+  data.tar.gz: 77794c3f97103bd4090a70bdceb6036eb8e488ab
 SHA512:
-  metadata.gz: e30e9303ae3bfa61ccd55eda8837c3606b6502e3523cd4d476068f4ac34b7814ed4fd4858e3af0327705d6f26d2a17d3ec205277acfd92844c919f15ecce15be
-  data.tar.gz: d26ad0a84abdeaac414f75c357a5a10f5b6c918659f7be55cd17603940c8d9bf76bbe67535f2ed75ce891723c01554a2c6d2bbcc167282cc0380b6ace81fd748
+  metadata.gz: 305c9ace6887dcf12a1fa4dd62830e41c11a87b42acd0efa06a0032b28dabccdacafc9945e9fd7b4b6d23eb872db347481ca7f605b814363a2d39c34a425340c
+  data.tar.gz: 76a51648a3e4ba7b363072e99c397b7b8542a0b57135cc494de51d5a4d65fda5f81cc263d0ffbe2a006e3f1e0591073187580e65f6e5ac05cebdedb22356b736

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/circle.yml

@@ -0,0 +1,24 @@
+machine:
+  ruby:
+    version: 2.0.0-p481
+
+dependencies:
+  pre:
+    - sudo dpkg -l |grep libboost|grep 1.48|awk '{print $2}'|xargs sudo apt-get purge -y
+    - sudo apt-get autoremove
+    - sudo apt-get install -y libboost-system1.54.0
+    - sudo apt-get install -y libboost-system1.54-dev
+    - sudo apt-get install -y libboost-thread1.54.0
+    - sudo apt-get install -y libboost-thread1.54-dev
+    - sudo apt-get install -y libboost1.54-dev
+    - wget --no-check-certificate -O mysql-replication-listener.zip https://github.com/hapyrus/mysql-replication-listener/archive/master.zip
+    - unzip mysql-replication-listener.zip
+    - cd mysql-replication-listener-master; cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DBoost_NO_BOOST_CMAKE=ON .; make -j4; sudo make install
+
+database:
+  override:
+    - touch circle.yml
+
+test:
+  override:
+    - bundle exec rspec

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

@@ -138,10 +138,10 @@ EOS
       if default_value.upcase == "CURRENT_TIMESTAMP"
         'SYSDATE'
       else
-        "'#{self.parse_timestamp(default_value)}'"
+        "'#{self.parse_timestamp(remove_single_quote(default_value))}'"
       end
     when 'date'
-      "'#{self.parse_date(default_value)}'"
+      "'#{self.parse_date(remove_single_quote(default_value))}'"
     else
       if !default_value.kind_of?(String)
         "'#{default_value}'"
@@ -159,6 +159,11 @@ EOS
     end
   end
 
+  def self.remove_single_quote(value)
+    return value unless value.kind_of?(String)
+    /^'.*'$/.match(value) ? value[1..-2] : value
+  end
+
   def self.primary_key_sql(flydata_tabledef)
     pks = flydata_tabledef[:columns].select{|col| col[:primary_key]}.collect{|col| col[:column]}
     pks.empty? ? nil : "  PRIMARY KEY (#{pks.join(',')})"

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

@@ -271,13 +271,13 @@ EOT
         let(:not_null_default_sql) { " DEFAULT '0000-01-01'" }
 
         context 'when default_value is normal' do
-          let(:default_value) { '2014-10-17' }
-          let(:default_value_sql) { "'#{default_value}'" }
+          let(:default_value) { "'2014-10-17'" }
+          let(:default_value_sql) { default_value }
           it_behaves_like *examples
         end
 
         context 'when default_value is 0000-00-00' do
-          let(:default_value) { '0000-00-00' }
+          let(:default_value) { "'0000-00-00'" }
           let(:default_value_sql) { "'0001-01-01'" }
           it_behaves_like *examples
         end
@@ -292,8 +292,8 @@ EOT
         let(:not_null_default_sql) { " DEFAULT '0000-01-01'" }
 
         context 'when default_value is normal' do
-          let(:default_value) { '2014-10-17 22:22:22' }
-          let(:default_value_sql) { "'#{default_value}.000000'" }
+          let(:default_value) { "'2014-10-17 22:22:22'" }
+          let(:default_value_sql) { "'2014-10-17 22:22:22.000000'" }
           it_behaves_like *examples
         end
 
@@ -304,7 +304,7 @@ EOT
         end
 
         context 'when default_value is 0000-00-00 00:00:00' do
-          let(:default_value) { '0000-00-00 00:00:00' }
+          let(:default_value) { "'0000-00-00 00:00:00'" }
           let(:default_value_sql) { "'0001-01-01 00:00:00.000000'" }
           it_behaves_like *examples
         end

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   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-27"
+  s.date = "2014-12-03"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "bin/fdmysqldump",
     "bin/flydata",
     "bin/serverinfo",
+    "circle.yml",
     "flydata-core/.gitignore",
     "flydata-core/.rspec",
     "flydata-core/.travis.yml",

data/lib/flydata/command/sync.rb

@@ -195,7 +195,7 @@ module Flydata
         worker = Thread.new do
           begin
             flydata.data_entry.cleanup_sync(de['id'], tables)
-          rescue RestClient::RequestTimeout
+          rescue RestClient::RequestTimeout, RestClient::GatewayTimeout
             # server is taking time to cleanup.  Try again
             retry
           end

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

@@ -196,6 +196,13 @@ grammar MysqlAlterTable
         }
       end
     }
+    / rename_sym sp key_or_index sp field_ident sp to_sym sp field_ident {
+      def action
+        { action: :rename_key_or_index,
+          support_level: :nonbreaking,
+        }
+      end
+    }
     / rename_sym opt_to nsp table_ident {
       def action
         { action: :rename_table }

data/spec/flydata/command/sync_spec.rb

@@ -44,8 +44,27 @@ module Flydata
         end
       end
 
+      subject { Sync.new }
+      describe '#cleanup_sync_server' do
+        let(:rest_client) { double('rest_client') }
+
+        context "when rest client throws timeout errors" do
+          before do
+            allow(RestClient::Resource).to receive(:new).and_return(rest_client)
+          end
+          it "should retry in case of RestClient::RequestTimeout" do
+            expect(rest_client).to receive(:post).and_raise(RestClient::RequestTimeout)
+            expect(rest_client).to receive(:post).and_return("{}")
+            subject.send(:cleanup_sync_server, default_data_entry)
+          end
+          it "should retry in case of RestClient::GatewayTimeout" do
+            expect(rest_client).to receive(:post).and_raise(RestClient::GatewayTimeout)
+            expect(rest_client).to receive(:post).and_return("{}")
+            subject.send(:cleanup_sync_server, default_data_entry)
+          end
+        end
+      end
       describe '#do_generate_table_ddl' do
-        subject { Sync.new }
         shared_examples 'throws an error' do
           it "throws an error" do
             expect {

data/spec/flydata/parser/mysql/alter_table_parser_spec.rb

@@ -1307,6 +1307,12 @@ describe 'MysqlAlterTableParser' do
         end
       end
     end
+    context "rename key or index" do
+      let(:alter_table_action) { "rename#{key_or_index}#{identifier} TO#{identifier}" }
+      let(:action) { :rename_key_or_index }
+
+      it_behaves_like "test key or index", "test field identifier", "a parser parsing a nonbreaking query"
+    end
     context "order by" do
       let(:action) { :order_table }
       context "with single column" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -412,6 +412,7 @@ files:
 - bin/fdmysqldump
 - bin/flydata
 - bin/serverinfo
+- circle.yml
 - flydata-core/.gitignore
 - flydata-core/.rspec
 - flydata-core/.travis.yml