convergence 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b12f3181a2e03ee7b621f7792ff9eb989b75703
-  data.tar.gz: b39515cf01e432fa897b8ccf519f71e84bf9b38f
+  metadata.gz: fdccd6dd4ac4264484a20ecc96f23604c2f618a3
+  data.tar.gz: 6c57e11df4937fb26b2653bf73de9db2b33874ff
 SHA512:
-  metadata.gz: d89e181a5b46fc35c8018d24f624c6affc7ca15f6f0653d064f6b3748617ebcab8ec45625427e0a4d8b61d444739f60d218ef023b5c82cdce153616df670330a
-  data.tar.gz: fe642c65fd73b6387bb5ca9e11d062afedab91820766410984a4c503768b8f47bbe8c7c6773dad9c15d892153fdff5790fde83b6e9cf85f5fecb22b64050c933
+  metadata.gz: f233f12b82e650eaf5c26fc3977d594e00a884ce2975a4743167ea4e07b428b72eddb40f7fc732e9eddc229f4166abadf745afcb3e7f422c2b6a3b6f6564f8be
+  data.tar.gz: ceb6d83654161df8f3253825b098294f52f5e81b4620a9679c6d720ae556539838a0017f18c3761ed4a09e61600d5e475f4ec093a922c3d08b8a2d2065aac815

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    convergence (0.2.1)
+    convergence (0.2.2)
       diff-lcs
       diffy
       mysql2
@@ -36,7 +36,7 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mysql2 (0.4.5)
+    mysql2 (0.4.6)
     parser (2.2.0.pre.5)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
@@ -88,4 +88,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.13.6
+   1.15.1

data/lib/convergence/default_parameter/mysql_default_parameter.rb

@@ -70,7 +70,7 @@ class Convergence::DefaultParameter::MysqlDefaultParameter
       limit: 255
     }
   }
-  DEFAULT_INDEX_PARAMETERS = { type: 'BTREE' }
+  DEFAULT_INDEX_PARAMETERS = { type: 'BTREE', unique: false }
 
   def initialize
   end

data/lib/convergence/dumper/mysql_schema_dumper.rb

@@ -158,8 +158,7 @@ class Convergence::Dumper::MysqlSchemaDumper
           table.columns[column].options = options
         end
       when 'INDEX', 'UNIQUE'
-        options = { name: index_name, type: indexes.first['INDEX_TYPE'] }
-        options.merge!(unique: true) if type == 'UNIQUE'
+        options = { name: index_name, type: indexes.first['INDEX_TYPE'], unique: type == 'UNIQUE' }
         length = indexes.reject { |v| v['SUB_PART'].nil? }.reduce({}) { |a, e| a[e['COLUMN_NAME']] = e['SUB_PART']; a }
         options.merge!(length: length) unless length.empty?
         table.index(columns, options)

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -28,17 +28,17 @@ 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)
+      unless table_delta[:remove_foreign_key].empty?
+        results << alter_remove_foreign_keys_sql(table_name, table_delta[:remove_foreign_key].keys)
       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)
+      unless table_delta[:remove_column].empty?
+        results << alter_remove_columns_sql(table_name, table_delta[:remove_column].values)
       end
-      table_delta[:add_column].each do |_column_name, column|
-        results << alter_add_column_sql(table_name, column)
+      unless table_delta[:add_column].empty?
+        results << alter_add_columns_sql(table_name, table_delta[:add_column].values)
       end
       table_delta[:change_column].each do |column_name, column|
         results << alter_change_column_sql(table_name, column_name, column, to_table)
@@ -46,8 +46,8 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
       table_delta[:add_index].each do |_index_name, index|
         results << alter_add_index_sql(table_name, index)
       end
-      table_delta[:add_foreign_key].each do |_index_name, foreign_key|
-        results << alter_add_foreign_key_sql(table_name, foreign_key)
+      unless table_delta[:add_foreign_key].empty?
+        results << alter_add_foreign_keys_sql(table_name, table_delta[:add_foreign_key].values)
       end
       unless table_delta[:change_table_option].empty?
         results << alter_change_table_sql(table_name, table_delta[:change_table_option])
@@ -56,12 +56,18 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
     results
   end
 
-  def alter_add_column_sql(table_name, column)
-    %(ALTER TABLE `#{table_name}` ADD COLUMN #{create_column_sql(column, output_primary_key: true)};)
+  def alter_add_columns_sql(table_name, columns)
+    sql = %(ALTER TABLE `#{table_name}`\n)
+    sql += columns.map { |column| %(  ADD COLUMN #{create_column_sql(column, output_primary_key: true)}) }.join(",\n")
+    sql += ';'
+    sql
   end
 
-  def alter_remove_column_sql(table_name, column)
-    %(ALTER TABLE `#{table_name}` DROP COLUMN `#{column.column_name}`;)
+  def alter_remove_columns_sql(table_name, columns)
+    sql = %(ALTER TABLE `#{table_name}`\n)
+    sql += columns.map { |column| %(  DROP COLUMN `#{column.column_name}`) }.join(",\n")
+    sql += ';'
+    sql
   end
 
   def alter_change_column_sql(table_name, column_name, change_column_option, to_table)
@@ -104,16 +110,25 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
     sql
   end
 
-  def alter_remove_foreign_key_sql(table_name, index_name)
-    sql = %(ALTER TABLE `#{table_name}` DROP FOREIGN KEY `#{index_name}`;\n)
-    sql += alter_remove_index_sql(table_name, index_name)
+  def alter_remove_foreign_keys_sql(table_name, index_names)
+    sql = %(ALTER TABLE `#{table_name}`\n)
+    sql += index_names.map { |index_name| %(  DROP FOREIGN KEY `#{index_name}`) }.join(",\n")
+    sql += ';'
+    sql += index_names.map { |index_name| alter_remove_index_sql(table_name, index_name) }.join("\n")
+    sql
+  end
+
+  def alter_add_foreign_keys_sql(table_name, foreign_keys)
+    sql = %(ALTER TABLE `#{table_name}`\n)
+    sql += foreign_keys.map { |foreign_key| alter_add_foreign_key_sql(foreign_key) }.join(",\n")
+    sql += ';'
     sql
   end
 
-  def alter_add_foreign_key_sql(table_name, foreign_key)
-    sql = %(ALTER TABLE `#{table_name}` ADD CONSTRAINT `#{foreign_key.key_name}` FOREIGN KEY )
+  def alter_add_foreign_key_sql(foreign_key)
+    sql = %(  ADD CONSTRAINT `#{foreign_key.key_name}` FOREIGN KEY )
     sql += "(#{[foreign_key.from_columns].join(',')}) REFERENCES `#{foreign_key.to_table}`"
-    sql += "(#{[foreign_key.to_columns].join(',')});"
+    sql += "(#{[foreign_key.to_columns].join(',')})"
     sql
   end
 

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/convergence/dumper/mysql_schema_dumper_spec.rb

@@ -39,7 +39,7 @@ describe Convergence::Dumper::MysqlSchemaDumper do
 
       it 'should be dump columns in the correct order' do
         papers = subject['papers']
-        expect(papers.columns.keys).to eq(%w(id title1 title2 description))
+        expect(papers.columns.keys).to eq(%w(id slug title1 title2 description))
       end
 
       describe 'table options' do
@@ -75,13 +75,22 @@ describe Convergence::Dumper::MysqlSchemaDumper do
         index = subject['authors'].indexes['index_authors_on_created_at']
         expect(index).not_to be_nil
         expect(index.index_columns).to eq(['created_at'])
+        expect(index.options[:unique]).to eq(false)
       end
 
-      it 'should be dump index of papers' do
+      it 'should be dump unique index of papers' do
+        index = subject['papers'].indexes['index_papers_on_slug']
+        expect(index).not_to be_nil
+        expect(index.index_columns).to eq(['slug'])
+        expect(index.options[:unique]).to eq(true)
+      end
+
+      it 'should be dump non-unique index of papers' do
         index = subject['papers'].indexes['index_papers_on_title1_title2']
         expect(index).not_to be_nil
         expect(index.index_columns).to eq(['title1', 'title2'])
         expect(index.options[:length]).to eq('title1' => 100, 'title2' => 200)
+        expect(index.options[:unique]).to eq(false)
       end
     end
 

data/spec/fixtures/add_columns_to_paper.schema

@@ -11,6 +11,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/add_table.schema

@@ -10,6 +10,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/change_comment_columns_to_paper.schema

@@ -10,6 +10,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/change_foreign_key.schema

@@ -10,6 +10,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/change_table_comment_to_paper.schema

@@ -10,6 +10,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/drop_foreign_key.schema

@@ -10,6 +10,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/drop_table.schema

@@ -10,6 +10,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/remove_columns_to_paper.schema

@@ -9,6 +9,7 @@ end
 
 create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
   t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
   t.varchar "title1", limit: 300, comment: "Title 1"
   t.varchar "title2", limit: 300, comment: "Title 2"
   t.text "description", null: true, comment: "Description"

data/spec/fixtures/test_db.sql

@@ -4,10 +4,12 @@ DROP TABLE IF EXISTS `authors`;
 
 CREATE TABLE `papers` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `slug` varchar(255) NOT NULL COMMENT 'Slug',
   `title1` varchar(300) NOT NULL COMMENT 'Title 1',
   `title2` varchar(300) NOT NULL COMMENT 'Title 2',
   `description` text COMMENT 'Description',
   PRIMARY KEY (`id`),
+  UNIQUE KEY `index_papers_on_slug` (`slug`),
   KEY `index_papers_on_title1_title2` (`title1` (100), `title2` (200))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='Paper';
 

data/spec/integrations/command_dryrun.rb

@@ -49,7 +49,7 @@ describe 'Command::Dryrun#execute' do
 
     it 'should be output alter add column query' do
       result = execute(exec_dsl)
-      expect(result).to be_include('# ALTER TABLE `authors` ADD COLUMN `add_column` varchar(110) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL AFTER `name`;')
+      expect(result).to be_include("# ALTER TABLE `authors`\n#   ADD COLUMN `add_column` varchar(110) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL AFTER `name`;")
     end
   end
 
@@ -58,7 +58,7 @@ describe 'Command::Dryrun#execute' do
 
     it 'should be output alter drop column query' do
       result = execute(exec_dsl)
-      expect(result).to be_include('# ALTER TABLE `authors` DROP COLUMN `name`;')
+      expect(result).to be_include("# ALTER TABLE `authors`\n#   DROP COLUMN `name`;")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2