convergence 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea4f99911ec8bb7d35f4360bd8250a352c1770b
-  data.tar.gz: e3fac7b60fa6d9d4c2763b1edccd5f20c5f018d8
+  metadata.gz: cee0b72015626223c127eed7acc9c03bc22d6f43
+  data.tar.gz: 6808f1b1410f9d13cc16d262041a8bebce648032
 SHA512:
-  metadata.gz: c6e7845828fa110a66878c2caeee56d3c0d9b040708135fde89b7245f4804462331bf6fcc538826d0ab852212ac9cd43b3e2dd6df4f176dda54d89939288e557
-  data.tar.gz: 18d96bd003a0d6e641bd9ca8e4b4fae0fbf428ace56c72faa344c8561e0bc21861f85257054759710859d06ca25f2562348c8aee04324f17c98fa8f66b863ca3
+  metadata.gz: eb06eb3d249a49e916da9504216c66ff5f0de9b7f91245dbdaa17c23d0c6ca855cd0bbb7967e17e1ed8eb47d441dd66de2c4c3e1b3dd30205d36611d049c4de0
+  data.tar.gz: f7e76021eda3071e9223ac80c175bfb2b79de681451c3cece17a26c38041013296cec5ba08a86b777c6890c23da63160c36abe8c0bc200de1ad74df5925ff0a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    convergence (0.0.3)
+    convergence (0.0.4)
       diff-lcs
       diffy
       mysql2

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -24,6 +24,12 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
     change_table = delta[:change_table]
     results = []
     change_table.each do |table_name, table_delta|
+      table_delta[:remove_foreign_key].each do |index_name, _foreign_key|
+        results << alter_remove_foreign_key_sql(table_name, index_name)
+      end
+      table_delta[:remove_index].each do |index_name, _index|
+        results << alter_remove_index_sql(table_name, index_name)
+      end
       table_delta[:remove_column].each do |_column_name, column|
         results << alter_remove_column_sql(table_name, column)
       end
@@ -33,15 +39,9 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
       table_delta[:change_column].each do |column_name, column|
         results << alter_change_column_sql(table_name, column_name, column, to_table)
       end
-      table_delta[:remove_index].each do |index_name, _index|
-        results << alter_remove_index_sql(table_name, index_name)
-      end
       table_delta[:add_index].each do |_index_name, index|
         results << alter_add_index_sql(table_name, index)
       end
-      table_delta[:remove_foreign_key].each do |index_name, _foreign_key|
-        results << alter_remove_foreign_key_sql(table_name, index_name)
-      end
       table_delta[:add_foreign_key].each do |_index_name, foreign_key|
         results << alter_add_foreign_key_sql(table_name, foreign_key)
       end

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/fixtures/change_foreign_key.schema

@@ -0,0 +1,24 @@
+create_table "authors", collate: "utf8_general_ci", comment: "" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "name", limit: 110
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "title1", limit: 300, comment: "Title 1"
+  t.varchar "title2", limit: 300, comment: "Title 2"
+  t.text "description", null: true, comment: "Description"
+end
+
+create_table "paper_authors", collate: "utf8_general_ci", comment: "Paper Author Relation" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id2", comment: "Paper id"
+  t.int "author_id2", comment: "Paper author id"
+
+  t.foreign_key "author_id2", reference: "authors", reference_column: "id", name: "paper_authors_author_id_fk"
+  t.foreign_key "paper_id2", reference: "papers", reference_column: "id", name: "paper_authors_paper_id_fk"
+end

data/spec/fixtures/drop_foreign_key.schema

@@ -0,0 +1,22 @@
+create_table "authors", collate: "utf8_general_ci", comment: "" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "name", limit: 110
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "title1", limit: 300, comment: "Title 1"
+  t.varchar "title2", limit: 300, comment: "Title 2"
+  t.text "description", null: true, comment: "Description"
+end
+
+create_table "paper_authors", collate: "utf8_general_ci", comment: "Paper Author Relation" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id", comment: "Paper id"
+  t.int "author_id", comment: "Paper author id"
+end
+

data/spec/fixtures/test_db.sql

@@ -1,3 +1,7 @@
+DROP TABLE IF EXISTS `paper_authors`;
+DROP TABLE IF EXISTS `papers`;
+DROP TABLE IF EXISTS `authors`;
+
 CREATE TABLE `papers` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `title1` varchar(300) NOT NULL COMMENT 'Title 1',

data/spec/integrations/command_dryrun.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'Command::Dryrun#execute' do
   def execute(dsl_path)
     parse_option = {

data/spec/integrations/drop_foreign_key.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'Changeable Foreign key' do
+  after(:each) do
+    rollback
+  end
+
+  def execute(dsl_path)
+    parse_option = {
+      apply: true,
+      input: File.expand_path("#{File.dirname(__FILE__)}/../fixtures/#{dsl_path}")
+    }
+    Convergence::Command.new(parse_option, config: mysql_settings).execute
+  end
+
+  describe 'drop foreign key' do
+    let(:exec_dsl) { 'drop_foreign_key.schema' }
+
+    it 'should be drop foreign key' do
+      expect { execute(exec_dsl) }.not_to raise_error
+    end
+  end
+
+  describe 'change foreign key' do
+    let(:exec_dsl) { 'change_foreign_key.schema' }
+
+    it 'should be drop foreign key' do
+      expect { execute(exec_dsl) }.not_to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,21 @@ def mysql_settings
   Convergence::Config.new(Hash[mysql_settings.map { |k, v| [k.to_sym, v] }])
 end
 
+def rollback
+  # FIXME But I have no idea to rollback create/drop/alter table of mysql
+  sqls = File.open("#{File.dirname(__FILE__)}/fixtures/test_db.sql")
+    .read
+    .split(';')
+    .map(&:strip)
+    .reject(&:empty?)
+  sqls.each do |sql|
+    Convergence::Command.new({}, config: mysql_settings)
+      .connector
+      .client
+      .query("#{sql};")
+  end
+end
+
 RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -219,11 +219,14 @@ files:
 - spec/fixtures/add_columns_to_paper.schema
 - spec/fixtures/add_table.schema
 - spec/fixtures/change_comment_columns_to_paper.schema
+- spec/fixtures/change_foreign_key.schema
 - spec/fixtures/change_table_comment_to_paper.schema
+- spec/fixtures/drop_foreign_key.schema
 - spec/fixtures/drop_table.schema
 - spec/fixtures/remove_columns_to_paper.schema
 - spec/fixtures/test_db.sql
 - spec/integrations/command_dryrun.rb
+- spec/integrations/drop_foreign_key.rb
 - spec/spec_helper.rb
 homepage: https://github.com/nishio-dens/convergence
 licenses:
@@ -259,9 +262,12 @@ test_files:
 - spec/fixtures/add_columns_to_paper.schema
 - spec/fixtures/add_table.schema
 - spec/fixtures/change_comment_columns_to_paper.schema
+- spec/fixtures/change_foreign_key.schema
 - spec/fixtures/change_table_comment_to_paper.schema
+- spec/fixtures/drop_foreign_key.schema
 - spec/fixtures/drop_table.schema
 - spec/fixtures/remove_columns_to_paper.schema
 - spec/fixtures/test_db.sql
 - spec/integrations/command_dryrun.rb
+- spec/integrations/drop_foreign_key.rb
 - spec/spec_helper.rb