flydata 0.2.17 → 0.2.18

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

@@ -621,7 +621,7 @@ describe 'MysqlAlterTableParser' do
         end
       end
     end
-    shared_examples "test key list" do |*examples|
+    shared_examples "test key list without order" do |*examples|
       context "with a single key" do
         it_behaves_like *examples do
           let(:key_list) { " testKey" }
@@ -634,6 +634,15 @@ describe 'MysqlAlterTableParser' do
           let(:expected_key_list) { [ "testKey" ] }
         end
       end
+      context "with multiple keys" do
+        it_behaves_like *examples do
+          let(:key_list) { " testKey1, testKey2" }
+          let(:expected_key_list) { [ "testKey1", "testKey2" ] }
+        end
+      end
+    end
+    shared_examples "test key list" do |*examples|
+      include_examples "test key list without order", *examples
       context "with multiple keys with order" do
         it_behaves_like *examples do
           let(:key_list) { " testKey1 ASC, testKey2 desc" }
@@ -644,11 +653,16 @@ describe 'MysqlAlterTableParser' do
 
     shared_examples "test constraint keyword" do |*examples|
       context "with constraint keyword" do
-        context "with constraint name" do
+        context "with backticked constraint name" do
           it_behaves_like *examples do
             let(:constraint_keyword) { " CONSTRAINT `chkName`" }
           end
         end
+        context "with constraint name" do
+          it_behaves_like *examples do
+            let(:constraint_keyword) { " CONSTRAINT chkName" }
+          end
+        end
         context "without constraint name" do
           it_behaves_like *examples do
             let(:constraint_keyword) { " CONSTRAINT" }
@@ -944,6 +958,123 @@ describe 'MysqlAlterTableParser' do
         end
       end
     end
+    shared_examples "test optional equal" do |*examples|
+      context "with EQ" do
+        it_behaves_like *examples do
+          let(:equal){"="}
+        end
+      end
+      context "with EQ and a space before it" do
+        it_behaves_like *examples do
+          let(:equal){" ="}
+        end
+      end
+      context "with SET_VAR" do
+        it_behaves_like *examples do
+          let(:equal){":="}
+        end
+      end
+      context "with none" do
+        it_behaves_like *examples do
+          let(:equal){""}
+        end
+      end
+    end
+    shared_examples "test signed literal" do |*examples|
+      context "number literal" do
+        it_behaves_like *examples do
+          let(:signed_literal){"100"}
+        end
+      end
+      context "signed number literal" do
+        it_behaves_like *examples do
+          let(:signed_literal){"100"}
+        end
+      end
+      context "signed number literal within quotes" do
+        it_behaves_like *examples do
+          let(:signed_literal){"'+100'"}
+        end
+      end
+      context "null" do
+        it_behaves_like *examples do
+          let(:signed_literal){"NULL"}
+        end
+      end
+      context "boolean" do
+        it_behaves_like *examples do
+          let(:signed_literal){"TRUE"}
+        end
+      end
+      context "quoted string" do
+        it_behaves_like *examples do
+          let(:signed_literal){"'Hello World!'"}
+        end
+      end
+    end
+    shared_examples "test optional reference list" do |*examples|
+      context "with no references" do
+        it_behaves_like *examples do
+          let(:opt_ref_list) {""}
+        end
+      end
+      context "with single reference" do
+        it_behaves_like *examples do
+          let(:opt_ref_list) {"(id)"}
+        end
+      end
+      context "with multiple references" do
+        it_behaves_like *examples do
+          let(:opt_ref_list) {" (id_1, id2)"}
+        end
+      end
+    end
+    shared_examples "test optional match clause" do |*examples|
+      context "no match clause" do
+        it_behaves_like *examples do
+          let(:opt_match_clause) {""}
+        end
+      end
+      context "match full" do
+        it_behaves_like *examples do
+          let(:opt_match_clause) {" MATCH FULL"}
+        end
+      end
+      context "match partial" do
+        it_behaves_like *examples do
+          let(:opt_match_clause) {" match PARTIAL"}
+        end
+      end
+    end
+    shared_examples "test optional on update delete" do |*examples|
+      context "no on update delete clause" do
+        it_behaves_like *examples do
+          let(:opt_on_update_delete) {""}
+        end
+      end
+      context "on update and on delete" do
+        it_behaves_like "test delete option", *examples do
+          let(:opt_on_update_delete) {" on update #{delete_option} on delete #{delete_option}"}
+        end
+      end
+      context "on update only" do
+        it_behaves_like "test delete option", *examples do
+          let(:opt_on_update_delete) {" ON UPDATE #{delete_option}"}
+        end
+      end
+    end
+    shared_examples "test delete option" do |*examples|
+      context "restrict" do
+        it_behaves_like *examples do
+          let(:delete_option) {"restrict"}
+        end
+      end
+      context "set null" do
+        it_behaves_like *examples do
+          let(:delete_option) {"SET NULL"}
+        end
+      end
+    end
     context 'add index' do
       let(:action) { :add_index }
       context "with a simple add index" do
@@ -1112,6 +1243,16 @@ describe 'MysqlAlterTableParser' do
 #                      "a debug parser"
                       "a parser parsing a single action alter table query"
     end
+    context 'add foreign key' do
+      let(:action) { :add_foreign_key_constraint }
+      let(:alter_table_action) { "add#{constraint_keyword} foreign key#{key_name}(#{key_list}) references employees#{opt_ref_list}#{opt_match_clause}#{opt_on_update_delete}"}
+      it_behaves_like "test constraint keyword",
+                      "test key name", "test key list without order",
+                      "test optional reference list",
+                      "test optional match clause",
+                      "test optional on update delete",
+                      "a parser parsing a nonbreaking query"
+    end
     context "enable keys" do
       let(:alter_table_action) { "ENABLE KEYS" }
       let(:action) { :enable_keys }
@@ -1589,5 +1730,35 @@ describe 'MysqlAlterTableParser' do
       }
       it_behaves_like "test optional column", "test column definition", "test position", "test parser parsing a change column"
     end
+    context 'algorithm and lock option' do
+      ["ALGORITHM", "LOCK"].each do |op|
+        context "#{op}" do
+          let(:action) { op.downcase.to_sym }
+          context "with default #{op}" do
+            let(:alter_table_action) { "#{op}#{equal} DEFAULT" }
+            it_behaves_like "test optional equal", "a parser parsing a nonbreaking query"
+          end
+          context "with any #{op}" do
+            let(:alter_table_action) { "#{op.downcase}#{equal} #{ident}" }
+            it_behaves_like "test optional equal", "test identifier", "a parser parsing a nonbreaking query"
+          end
+          context "without spaces between eq and #{op}" do
+            let(:alter_table_action) { "#{op}=#{ident}" }
+            it_behaves_like "test identifier", "a parser parsing a nonbreaking query"
+          end
+        end
+      end
+    end
+    context 'alter column' do
+      let(:action) { :alter_column }
+      context 'set default' do
+        let(:alter_table_action) { "alter#{column} #{ident} set DEFAULT #{signed_literal}" }
+        it_behaves_like "test optional column", "test field identifier", "test signed literal", "a parser parsing a nonbreaking query"
+      end
+      context 'drop default' do
+        let(:alter_table_action) { "alter#{column} #{ident} DROP default" }
+        it_behaves_like "test optional column", "test field identifier", "a parser parsing a nonbreaking query"
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'rspec'
 require 'active_record'  # for Flydata::Heroku
 require 'protected_attributes'
@@ -30,6 +30,8 @@ RSpec.configure do |config|
           example.run
           raise ActiveRecord::Rollback
         end
+      else
+        example.run
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -399,7 +399,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -413,6 +412,38 @@ files:
 - bin/fdmysqldump
 - bin/flydata
 - bin/serverinfo
+- flydata-core/.gitignore
+- flydata-core/.rspec
+- flydata-core/.travis.yml
+- flydata-core/Gemfile
+- flydata-core/Gemfile.lock
+- flydata-core/lib/flydata-core.rb
+- flydata-core/lib/flydata-core/core_ext.rb
+- flydata-core/lib/flydata-core/core_ext/module.rb
+- flydata-core/lib/flydata-core/core_ext/module/include.rb
+- flydata-core/lib/flydata-core/core_ext/object.rb
+- flydata-core/lib/flydata-core/core_ext/object/prepend.rb
+- flydata-core/lib/flydata-core/errors.rb
+- flydata-core/lib/flydata-core/logger.rb
+- flydata-core/lib/flydata-core/table_def.rb
+- flydata-core/lib/flydata-core/table_def/mysql_table_def.rb
+- flydata-core/lib/flydata-core/table_def/redshift_table_def.rb
+- flydata-core/lib/flydata-core/thread_context.rb
+- flydata-core/spec/spec_helper.rb
+- flydata-core/spec/table_def/mysql_table_def_spec.rb
+- flydata-core/spec/table_def/mysql_to_redshift_table_def_spec.rb
+- flydata-core/spec/table_def/mysqldump_test_bit_table.dump
+- flydata-core/spec/table_def/mysqldump_test_foreign_key.dump
+- flydata-core/spec/table_def/mysqldump_test_table_all.dump
+- flydata-core/spec/table_def/mysqldump_test_table_column_comment.dump
+- flydata-core/spec/table_def/mysqldump_test_table_enum.dump
+- flydata-core/spec/table_def/mysqldump_test_table_multi_pk.dump
+- flydata-core/spec/table_def/mysqldump_test_table_no_pk.dump
+- flydata-core/spec/table_def/mysqldump_test_unique_key.dump
+- flydata-core/spec/table_def/mysqldump_test_unique_key2.dump
+- flydata-core/spec/table_def/mysqldump_test_unique_key3.dump
+- flydata-core/spec/table_def/mysqldump_test_unsigned.dump
+- flydata-core/spec/table_def/redshift_table_def_spec.rb
 - flydata.gemspec
 - lib/fly_data_model.rb
 - lib/flydata.rb
@@ -468,9 +499,6 @@ files:
 - lib/flydata/preference/data_entry_preference.rb
 - lib/flydata/proxy.rb
 - lib/flydata/sync_file_manager.rb
-- lib/flydata/table_def.rb
-- lib/flydata/table_def/mysql_table_def.rb
-- lib/flydata/table_def/redshift_table_def.rb
 - lib/flydata/util/encryptor.rb
 - spec/fluent_plugins_spec_helper.rb
 - spec/fly_data_model_spec.rb
@@ -488,18 +516,6 @@ files:
 - spec/flydata/parser/mysql/alter_table_parser_spec.rb
 - spec/flydata/parser/mysql/dump_parser_spec.rb
 - spec/flydata/sync_file_manager_spec.rb
-- spec/flydata/table_def/mysql_table_def_spec.rb
-- spec/flydata/table_def/mysqldump_test_foreign_key.dump
-- spec/flydata/table_def/mysqldump_test_table_all.dump
-- spec/flydata/table_def/mysqldump_test_table_column_comment.dump
-- spec/flydata/table_def/mysqldump_test_table_enum.dump
-- spec/flydata/table_def/mysqldump_test_table_multi_pk.dump
-- spec/flydata/table_def/mysqldump_test_table_no_pk.dump
-- spec/flydata/table_def/mysqldump_test_unique_key.dump
-- spec/flydata/table_def/mysqldump_test_unique_key2.dump
-- spec/flydata/table_def/mysqldump_test_unique_key3.dump
-- spec/flydata/table_def/mysqldump_test_unsigned.dump
-- spec/flydata/table_def/redshift_table_def_spec.rb
 - spec/flydata/util/encryptor_spec.rb
 - spec/flydata_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,49 +0,0 @@
-# rcov generated
-coverage
-coverage.data
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-
-# For TextMate
-#*.tmproj
-#tmtags
-
-# For emacs:
-#*~
-#\#*
-#.\#*
-
-# For vim:
-#*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc

data/lib/flydata/table_def.rb

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