convergence 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a027af56db0ff232518fea7d157ddaf5a883ded7
-  data.tar.gz: 9e17636aee309f7fd85cf18533cd8c719dd36537
+  metadata.gz: 137446e613d09e9f82e5126fef9b15f42f53b258
+  data.tar.gz: 80f689389a919a431063b0ca9a8ff023701f64dd
 SHA512:
-  metadata.gz: ba040edebd34bdb1f90a0a29ea42dd19540e904f3a4996ceb0daa65b33bc58f2f6484e109be17183157b7071adf4d13ab0058d23248a0be8289004758073150f
-  data.tar.gz: e9569909621306dc9a87dc39b2fff9431fefbbeab83f9eafced75bc8391718991e844b49200772e7796945f8a3a39b2dacff9c4723b2277d56baba88ce8a8b3e
+  metadata.gz: 45ec8cd62c1824db046585a7e069a62d2ad7b408ab1a4d74089429d7bc3f18a2768764af4c75d50a66bda662e735d0e12320f8ac2b6168d5df1c253822fa815a
+  data.tar.gz: a329fe4c6cb6e15455b979083c3374cb731b032a26dd39c6aa675942f782e51a3a150dc22ae8fe2af3525d4e903fd49f65e1de839b3d30847bb29653d5e018fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    convergence (0.1.2)
+    convergence (0.1.3)
       diff-lcs
       diffy
       mysql2
@@ -36,7 +36,7 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mysql2 (0.3.18)
+    mysql2 (0.4.2)
     parser (2.2.0.pre.5)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
@@ -86,3 +86,6 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec
   rubocop
+
+BUNDLED WITH
+   1.10.5

data/lib/convergence/diff.rb

@@ -6,7 +6,10 @@ class Convergence::Diff
     from_database = {} if from_database.nil?
     delta[:add_table] = scan_add_table(from_database, to_database)
     delta[:remove_table] = scan_remove_table(from_database, to_database)
-    delta[:change_table] = scan_change_table(from_database, to_database)
+    change_table = scan_change_table(from_database, to_database)
+    delta[:change_table] = change_table[:change]
+    delta[:remove_table].merge!(change_table[:remove])
+    delta[:add_table].merge!(change_table[:add])
     delta
   end
 
@@ -14,8 +17,9 @@ class Convergence::Diff
     from = from_table.dup
     to = to_table.dup
     delta = {}
-    delta[:add_column] = scan_add_column(from, to)
     delta[:remove_column] = scan_remove_column(from, to)
+    return delta if removed_all_columns?(from, delta)
+    delta[:add_column] = scan_add_column(from, to)
     delta[:change_column] = scan_change_column(from, to)
     scan_change_order_column(from, to, delta)
     delta[:remove_index] = scan_change_index(to, from)
@@ -37,14 +41,19 @@ class Convergence::Diff
   end
 
   def scan_change_table(from, to)
-    delta = {}
+    delta = { change: {}, remove: {}, add: {}}
     target_tables = from.map { |name, _| name } & to.map { |name, _| name }
     target_tables.each do |target_table|
       from_table = from.find { |name, _| name == target_table }[1]
       to_table = to.find { |name, _| name == target_table }[1]
       diff = diff_table(from_table, to_table)
       unless diff.values.all?(&:empty?)
-        delta[target_table] = diff
+        if removed_all_columns?(from_table, diff)
+          delta[:remove][target_table] = from_table
+          delta[:add][target_table] = to_table
+        else
+          delta[:change][target_table] = diff
+        end
       end
     end
     delta
@@ -79,7 +88,7 @@ class Convergence::Diff
       end
     change_columns
       .compact
-      .reduce { |a, e| a.merge(e) }
+      .reduce({}) { |a, e| a.merge(e) }
       .reject { |_k, v| v.empty? }
   end
 
@@ -145,4 +154,8 @@ class Convergence::Diff
       end
     Hash[change_options]
   end
+
+  def removed_all_columns?(from_table, diff)
+    from_table.columns.each_key.all? { |name| diff[:remove_column].each_key.include?(name) }
+  end
 end

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -15,8 +15,8 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
     sqls = []
     sqls << change_table_sql(to_table, delta)
     sqls << ['']
-    sqls << create_table_sqls(delta)
     sqls << drop_table_sqls(delta)
+    sqls << create_table_sqls(delta)
     sqls.join("\n")
   end
 

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/convergence/diff_spec.rb

@@ -110,6 +110,25 @@ describe Convergence::DSL do
           expect(results[:change_table]).not_to be_empty
         end
       end
+
+      context 'all columns are replaced' do
+        let(:table_to) do
+          Convergence::Table.new('table1').tap do |t|
+            t.int('id_rename', primary_key: true)
+            t.varchar('name_rename', limit: 200, null: false)
+            t.varchar('data_rename', limit: 300, null: false)
+          end
+        end
+
+        it do
+          results = Convergence::Diff.new.diff({ 'table1' => table_from }, { 'table1' => table_to })
+          expect(results[:add_table]).not_to be_empty
+          expect(results[:remove_table]).not_to be_empty
+          expect(results[:change_table]).to be_empty
+          included_after_option = results[:add_table].each_value.map { |t| t.columns.each_value.map { |c| c.options.key?(:after) } }.flatten.any?
+          expect(included_after_option).to eq false
+        end
+      end
     end
   end
 

data/spec/convergence/dsl_spec.rb

@@ -5,8 +5,13 @@ describe Convergence::DSL do
     <<-DSL
     create_table "users", comment: 'Users' do |t|
       t.int "id", primary_key: true, null: false, limit: 11, extra: "auto_increment"
+      t.varchar "email"
+      t.varchar "first_name"
+      t.varchar "last_name"
       t.datetime "created_at", null: true
 
+      t.index 'email', length: 100
+      t.index ['first_name', 'last_name'], length: { first_name: 15, last_name: 20 }
       t.index 'created_at'
       t.foreign_key "user_id", reference: "users", reference_column: "id"
     end
@@ -58,7 +63,13 @@ describe Convergence::DSL do
       end
 
       it 'should be able to parse indexes' do
-        expect(subject['users'].indexes).not_to be_nil
+        indexes = subject['users'].indexes
+        expect(indexes).not_to be_nil
+        expect(indexes['index_users_on_email']).not_to be_nil
+        expect(indexes['index_users_on_email'].options[:length]['email']).to eq(100)
+        expect(indexes['index_users_on_first_name_last_name']).not_to be_nil
+        expect(indexes['index_users_on_first_name_last_name'].options[:length]['first_name']).to eq(15)
+        expect(indexes['index_users_on_first_name_last_name'].options[:length]['last_name']).to eq(20)
       end
 
       it 'should be able to parse foreign keys' do

data/spec/convergence/dumper/mysql_schema_dumper_spec.rb

@@ -67,11 +67,18 @@ describe Convergence::Dumper::MysqlSchemaDumper do
     end
 
     describe 'indexes' do
-      it do
+      it 'should be dump index of authors' do
         index = subject['authors'].indexes['index_authors_on_created_at']
         expect(index).not_to be_nil
         expect(index.index_columns).to eq(['created_at'])
       end
+
+      it 'should be dump 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)
+      end
     end
 
     describe 'foreign keys' do

data/spec/fixtures/test_db.sql

@@ -7,7 +7,8 @@ CREATE TABLE `papers` (
   `title1` varchar(300) NOT NULL COMMENT 'Title 1',
   `title2` varchar(300) NOT NULL COMMENT 'Title 2',
   `description` text COMMENT 'Description',
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `index_papers_on_title1_title2` (`title1` (100), `title2` (200))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='Paper';
 
 CREATE TABLE `authors` (

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2