ridgepole 0.7.0 → 0.7.1.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397f77154e2eaba9b1bb914227a1d8bef6e2148c
-  data.tar.gz: b4d2ad1e8e5b9266f49aa2b10fa04ba182da18e3
+  metadata.gz: ed6f5b00c9332bcd40b24033c2419b08130a5879
+  data.tar.gz: 5eba0f7b43c51fcc70413bacf8c262f5224347fe
 SHA512:
-  metadata.gz: 683c61ce905d5ce16c248ddb4726d06e140869944cdc8de5831986abef540ea22437a3ce37227b5b62b092307df02dedc379566905aa1967ef2e7853eeeaedfb
-  data.tar.gz: 979d7cde2a6b5b0c2f5163a496c126c4831a8d98bb9319a7babe2f3c585a0c82c6db04cb239e983bd881f64b2df6409b99f6d9b56224f187f5671609d14e5377
+  metadata.gz: 606f4bbc6c975f8fbb8cb3ebfda3589b102e17eda2b807006a19e75ba2a9fe7bbced5e38bb53cec7764ba3cda125e84c76985aca5e2030107cca0997479513ca
+  data.tar.gz: c8316fbc6e3814f3cd5d974ab5ff1985832309b175181949d4dd37ee113de9aa12131889e1100fbe64cbba9a1bd01c6f12d86a9ce9bc92bae9b80186b4fce659

data/README.md

@@ -5,7 +5,7 @@ Ridgepole is a tool to manage DB schema.
 It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.html#types-of-schema-dumps), and updates DB schema according to DSL.
 (like Chef/Puppet)
 
-[![Prev Version](https://img.shields.io/badge/edge_version-0.6.6-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.rc1)
+[![Prev Version](https://img.shields.io/badge/prev_version-0.6.6-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.rc1)
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.6)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.6)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.6)
 
@@ -79,6 +79,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add `--skip-column-comment-change` option
   * Add `--default-bigint-limit` option
   * Add `--ignore-table-comment` option
+* `>= 0.7.1`
+  * Remove `--reverse` option
 
 ## Installation
 
@@ -120,7 +122,6 @@ Usage: ridgepole [options]
         --split
         --split-with-dir
     -d, --diff DSL1 DSL2
-        --reverse
         --with-apply
     -o, --output SCHEMAFILE
     -t, --tables TABLES
@@ -290,34 +291,6 @@ $ ridgepole --diff config.yml file1.schema
 remove_column("articles", "author")
 ```
 
-### Reverse diff
-```sh
-$ cat file1.schema
-create_table "articles", force: :cascade do |t|
-  t.string   "title"
-  t.text     "text"
-  t.datetime "created_at"
-  t.datetime "updated_at"
-end
-
-$ cat file2.schema
-create_table "articles", force: :cascade do |t|
-  t.string   "title"
-  t.text     "desc", renamed_from: "text"
-  t.text     "author"
-  t.datetime "created_at"
-  t.datetime "updated_at"
-end
-
-$ ridgepole --diff file1.schema file2.schema
-add_column("articles", "author", :text, {:after=>"title"})
-rename_column("articles", "text", "desc")
-
-$ ridgepole --diff file1.schema file2.schema --reverse
-rename_column("articles", "desc", "text")
-remove_column("articles", "author")
-```
-
 ## Execute SQL using external script
 
 ```sh

data/bin/ridgepole

@@ -111,7 +111,6 @@ ARGV.options do |opt|
       ARGV.shift
       diff_files = [diff_arg1, diff_arg2]
     }
-    opt.on('',   '--reverse')                                    {    options[:reverse] = true                             }
     opt.on('',   '--with-apply')                                 {    diff_with_apply = true                               }
     opt.on('-o', '--output SCHEMAFILE')                          {|v| output_file = v                                      }
     opt.on('-t', '--tables TABLES', Array)                       {|v| options[:tables] = v                                 }

data/lib/ridgepole/delta.rb

@@ -290,8 +290,9 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
 
     if not definition.empty? or not indices.empty?
       append_change_table(table_name, buf) do
+        append_delete_indices(table_name, indices, buf)
         append_change_definition(table_name, definition, buf)
-        append_change_indices(table_name, indices, buf)
+        append_add_indices(table_name, indices, buf)
       end
     end
 
@@ -392,16 +393,18 @@ remove_column(#{table_name.inspect}, #{column_name.inspect})
     end
   end
 
-  def append_change_indices(table_name, delta, buf)
-    (delta[:delete] || {}).each do |index_name, attrs|
-      append_remove_index(table_name, index_name, attrs, buf)
-    end
-
+  def append_add_indices(table_name, delta, buf)
     (delta[:add] || {}).each do |index_name, attrs|
       append_add_index(table_name, index_name, attrs, buf)
     end
   end
 
+  def append_delete_indices(table_name, delta, buf)
+    (delta[:delete] || {}).each do |index_name, attrs|
+      append_remove_index(table_name, index_name, attrs, buf)
+    end
+  end
+
   def append_add_index(table_name, index_name, attrs, buf)
     column_name = attrs.fetch(:column_name)
     options = attrs[:options] || {}

data/lib/ridgepole/diff.rb

@@ -8,17 +8,12 @@ class Ridgepole::Diff
     from = (from || {}).deep_dup
     to = (to || {}).deep_dup
 
-    if @options[:reverse]
-      from, to = to, from
-    end
     check_table_existence(to)
 
     delta = {}
     relation_info = {}
 
     scan_table_rename(from, to, delta)
-    # for reverse option
-    scan_table_rename(to, from, delta)
 
     to.each do |table_name, to_attrs|
       collect_relation_info!(table_name, to_attrs, relation_info)
@@ -65,20 +60,18 @@ class Ridgepole::Diff
         from_table_name = from_table_name.to_s if from_table_name
 
         # Already renamed
-        next if from[table_name]
+        if from[table_name]
+          @logger.warn("[WARNING] The table `#{from_table_name}` has already been renamed to the table `#{table_name}`.")
+          next
+        end
 
-        # No existence checking because there is that the table to be read is limited
-        #unless from.has_key?(from_table_name)
-        #  raise "Table `#{from_table_name}` not found"
-        #end
+        unless from[from_table_name]
+          @logger.warn("[WARNING] The table `#{from_table_name}` to be renamed does not exist.")
+          next
+        end
 
         delta[:rename] ||= {}
-
-        if @options[:reverse]
-          delta[:rename][from_table_name] = table_name
-        else
-          delta[:rename][table_name] = from_table_name
-        end
+        delta[:rename][table_name] = from_table_name
 
         from.delete(from_table_name)
         to.delete(table_name)
@@ -148,8 +141,6 @@ class Ridgepole::Diff
     definition_delta = {}
 
     scan_column_rename(from, to, definition_delta)
-    # for reverse option
-    scan_column_rename(to, from, definition_delta)
 
     if table_options[:id] == false or table_options[:primary_key].is_a?(Array)
       priv_column_name = nil
@@ -241,12 +232,7 @@ class Ridgepole::Diff
         end
 
         definition_delta[:rename] ||= {}
-
-        if @options[:reverse]
-          definition_delta[:rename][from_column_name] = column_name
-        else
-          definition_delta[:rename][column_name] = from_column_name
-        end
+        definition_delta[:rename][column_name] = from_column_name
 
         from.delete(from_column_name)
         to.delete(column_name)

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0'
+  VERSION = '0.7.1.beta'
 end

data/spec/mysql/cli/ridgepole_spec.rb

@@ -36,7 +36,6 @@ describe 'ridgepole' do
             --split
             --split-with-dir
         -d, --diff DSL1 DSL2
-            --reverse
             --with-apply
         -o, --output SCHEMAFILE
         -t, --tables TABLES

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -29,14 +29,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_foreign_key("child", {:name=>"child_ibfk_1"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
@@ -145,14 +137,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_foreign_key("child", "parent")
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -43,14 +43,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
@@ -148,14 +140,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_foreign_key("child", "parent", {})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_add_column_spec.rb

@@ -138,17 +138,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_column("employee_clubs", "any_col")
-
-        remove_column("employees", "age")
-        remove_column("employees", "updated_at")
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_change_column_spec.rb

@@ -135,17 +135,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_mysql_unsigned: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        change_column("employee_clubs", "club_id", :integer, <%= {:null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
-
-        change_column("employees", "last_name", :string,<%= {:limit=>16, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
-        change_column("employees", "gender", :string,<%= {:limit=>1, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_change_index_spec.rb

@@ -197,21 +197,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_index("dept_emp", {:name=>"emp_no"})
-        add_index("dept_emp", ["emp_no"], {:name=>"emp_no", :using=>:btree, :unique=>false})
-
-        remove_index("dept_manager", {:name=>"emp_no"})
-        add_index("dept_manager", ["emp_no"], {:name=>"emp_no", :using=>:btree, :unique=>false})
-
-        remove_index("salaries", {:name=>"emp_no"})
-        add_index("salaries", ["emp_no"], {:name=>"emp_no", :using=>:btree, :unique=>false})
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_change_table_option_spec.rb

@@ -39,16 +39,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy actual_dsl
     }
-
-    it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
-[WARNING] No difference of schema configuration for table `employees` but table options differ.
-  from: {:primary_key=>"emp_no2"}
-    to: {:primary_key=>"emp_no"}
-      EOS
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_falsey
-    }
   end
 
   context 'when create_table options are different (ignore comment)' do

data/spec/mysql/migrate/migrate_create_index_spec.rb

@@ -134,18 +134,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-       remove_index("clubs", {:name=>"idx_name"})
-
-       remove_index("employee_clubs", {:name=>"idx_emp_no_club_id"})
-
-       remove_index("titles", {:name=>"emp_no"})
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_create_table_spec.rb

@@ -117,17 +117,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        drop_table("clubs")
-
-        drop_table("employee_clubs")
-
-        drop_table("employees")
-      EOS
-    }
   end
 end

data/spec/mysql/migrate/migrate_drop_column_and_unique_index_spec.rb

@@ -0,0 +1,50 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when drop column and unique index' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.index ["first_name", "last_name"], name: "first_name_last_name", unique: true, <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.string "first_name", limit: 14, null: false
+        end
+      EOS
+    }
+
+    before do
+      subject.diff(actual_dsl).migrate
+      ActiveRecord::Base.connection.execute(<<-'SQL'
+        insert into
+          employees (first_name, last_name)
+        values
+          ('Taro', 'Yamada'), ('Taro', 'Sato')
+        ;
+      SQL
+      )
+    end
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate(:noop => true)
+      expect(subject.dump).to match_fuzzy actual_dsl
+    }
+  end
+end

data/spec/mysql/migrate/migrate_drop_column_spec.rb

@@ -128,22 +128,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_column("dept_emp", "from_date", :date, {:null=>false, :after=>"dept_no"})
-        add_column("dept_emp", "to_date", :date, {:null=>false, :after=>"from_date"})
-
-        add_column("dept_manager", "from_date", :date, {:null=>false, :after=>"emp_no"})
-        add_column("dept_manager", "to_date", :date, {:null=>false, :after=>"from_date"})
-
-        add_column("employees", "last_name", :string, {:limit=>16, :null=>false, :after=>"first_name"})
-        add_column("employees", "gender", :string, {:limit=>1, :null=>false, :after=>"last_name"})
-        add_column("employees", "hire_date", :date, {:null=>false, :after=>"gender"})
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_drop_index_spec.rb

@@ -134,18 +134,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        add_index("clubs", ["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
-
-        add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_emp_no_club_id"} + cond(5.0, using: :btree) %>)
-
-        add_index("titles", ["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_drop_table_spec.rb

@@ -117,30 +117,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        create_table("clubs", {}) do |t|
-          t.column("name", :"string", {:default=>"", :null=>false, :limit=>255})
-        end
-        add_index("clubs", ["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
-
-        create_table("employee_clubs", {}) do |t|
-          t.column("emp_no", :"integer", {:null=>false, :limit=>4})
-          t.column("club_id", :"integer", {:null=>false, :limit=>4})
-        end
-        add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_emp_no_club_id"} + cond(5.0, using: :btree) %>)
-
-        create_table("employees", {:primary_key=>"emp_no"}) do |t|
-          t.column("birth_date", :"date", {:null=>false})
-          t.column("first_name", :"string", {:limit=>14, :null=>false})
-          t.column("last_name", :"string", {:limit=>16, :null=>false})
-          t.column("gender", :"string", {:limit=>1, :null=>false})
-          t.column("hire_date", :"date", {:null=>false})
-        end
-      EOS
-    }
   end
 end

data/spec/mysql/migrate/migrate_empty_spec.rb

@@ -72,27 +72,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        drop_table("clubs")
-
-        drop_table("departments")
-
-        drop_table("dept_emp")
-
-        drop_table("dept_manager")
-
-        drop_table("employee_clubs")
-
-        drop_table("employees")
-
-        drop_table("salaries")
-
-        drop_table("titles")
-      EOS
-    }
   end
 end

data/spec/mysql/migrate/migrate_merge_mode_spec.rb

@@ -139,10 +139,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       # `clubs` table is not deleted
       expect(subject.dump).to match_fuzzy expected_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, merge: true, reverse: true)
-      expect(delta.differ?).to be_falsey
-    }
   end
 end

data/spec/mysql/migrate/migrate_rename_column_spec.rb

@@ -135,18 +135,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-       rename_column("dept_emp", "from_date2", "from_date")
-
-       rename_column("dept_manager", "to_date2", "to_date")
-
-       rename_column("employees", "gender2", "gender")
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/migrate/migrate_rename_table_spec.rb

@@ -134,15 +134,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: ('employees'|:titles)/, '')
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        rename_table("employees2", "employees")
-        rename_table("titles2", "titles")
-      EOS
-    }
   end
 
   context 'when rename table (dry-run)' do
@@ -219,10 +210,30 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     it {
-      # No existence checking because there is that the table to be read is limited
-      expect {
-        subject.diff(dsl)
-      }.to_not raise_error
+      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] The table `not_employees` to be renamed does not exist.")
+      subject.diff(dsl)
+    }
+  end
+
+  context 'when rename table (already exist)' do
+    before { subject.diff(dsl).migrate }
+    subject { client }
+
+    let(:dsl) {
+      erbh(<<-EOS)
+        create_table "employees2", primary_key: "emp_no", force: :cascade, renamed_from: 'employees' do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+        end
+      EOS
+    }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] The table `employees` has already been renamed to the table `employees2`.")
+      subject.diff(dsl)
     }
   end
 end

data/spec/mysql/migrate/migrate_skip_drop_table_spec.rb

@@ -139,10 +139,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       # `clubs` table is not deleted
       expect(subject.dump).to match_fuzzy expected_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, skip_drop_table: true, reverse: true)
-      expect(delta.differ?).to be_falsey
-    }
   end
 end

data/spec/mysql/migrate/migrate_skip_rename_column_spec.rb

@@ -134,10 +134,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_falsey
-    }
   end
 end

data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb

@@ -128,16 +128,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] The table `employees` has already been renamed to the table `employees2`.")
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
       expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: 'employees'/, '')
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_falsey
-    }
   end
 end

data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb

@@ -143,14 +143,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy after_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        change_column("employees", "first_name", :string, <%= {:limit=>14, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
-      EOS
-    }
   end
 
   context 'when with ignore tables option (target and ignore)' do
@@ -230,14 +222,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy after_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        change_column("employees", "first_name", :string, <%= {:limit=>14, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
-      EOS
-    }
   end
 
   context 'when with ignore tables option (target)' do
@@ -317,13 +301,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy after_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        change_column("employees", "first_name", :string, <%= {:limit=>14, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
-      EOS
-    }
   end
 end

data/spec/mysql/migrate/migrate_with_tables_spec.rb

@@ -143,13 +143,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy after_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(current_schema, dsl, tables: ['employees'], reverse: true, enable_mysql_awesome: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        change_column("employees", "first_name", :string, <%= {:limit=>14, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
-      EOS
-    }
   end
 end

data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb

@@ -29,14 +29,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -43,14 +43,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/fk/migrate_create_fk_spec.rb

@@ -29,14 +29,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_foreign_key("child", {:name=>"child_ibfk_1"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
@@ -148,14 +140,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_foreign_key("child", "parent")
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/fk/migrate_drop_fk_spec.rb

@@ -43,14 +43,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
@@ -148,14 +140,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_foreign_key("child", "parent", {})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/migrate/migrate_add_column_spec.rb

@@ -134,17 +134,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_column("employee_clubs", "any_col")
-
-        remove_column("employees", "age")
-        remove_column("employees", "updated_at")
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/migrate/migrate_change_column_spec.rb

@@ -131,16 +131,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        change_column("employee_clubs", "club_id", :integer, {:null=>false, :default=>nil})
-
-        change_column("employees", "last_name", :string, {:limit=>16, :default=>nil})
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/migrate/migrate_change_index_spec.rb

@@ -133,21 +133,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_index("dept_emp", {:name=>"idx_dept_emp_emp_no"})
-        add_index("dept_emp", ["emp_no"], {:name=>"idx_dept_emp_emp_no", :using=>:btree, :unique=>false})
-
-        remove_index("dept_manager", {:name=>"idx_dept_manager_emp_no"})
-        add_index("dept_manager", ["emp_no"], {:name=>"idx_dept_manager_emp_no", :using=>:btree, :unique=>false})
-
-        remove_index("salaries", {:name=>"idx_salaries_emp_no"})
-        add_index("salaries", ["emp_no"], {:name=>"idx_salaries_emp_no", :using=>:btree, :unique=>false})
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/migrate/migrate_create_table_spec.rb

@@ -114,17 +114,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        drop_table("clubs")
-
-        drop_table("employee_clubs")
-
-        drop_table("employees")
-      EOS
-    }
   end
 end

data/spec/postgresql/migrate/migrate_drop_column_spec.rb

@@ -127,21 +127,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_column("dept_emp", "from_date", :date, {:null=>false})
-        add_column("dept_emp", "to_date", :date, {:null=>false})
-
-        add_column("dept_manager", "from_date", :date, {:null=>false})
-        add_column("dept_manager", "to_date", :date, {:null=>false})
-
-        add_column("employees", "last_name", :string, {:limit=>16, :null=>false})
-        add_column("employees", "hire_date", :date, {:null=>false})
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/migrate/migrate_drop_index_spec.rb

@@ -132,18 +132,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        add_index("clubs", ["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
-
-        add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_employee_clubs_emp_no_club_id"} + cond(5.0, using: :btree) %>)
-
-        add_index("titles", ["emp_no"], <%= {:name=>"idx_titles_emp_no"} + cond(5.0, using: :btree) %>)
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/migrate/migrate_drop_table_spec.rb

@@ -116,29 +116,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        create_table("clubs", {}) do |t|
-          t.column("name", :"string", {:limit=>255, :default=>"", :null=>false})
-        end
-        add_index("clubs", ["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
-
-        create_table("employee_clubs", {}) do |t|
-          t.column("emp_no", :"integer", {:null=>false})
-          t.column("club_id", :"integer", {:null=>false})
-        end
-        add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_employee_clubs_emp_no_club_id"} + cond(5.0, using: :btree) %>)
-
-        create_table("employees", {:primary_key=>"emp_no"}) do |t|
-          t.column("birth_date", :"date", {:null=>false})
-          t.column("first_name", :"string", {:limit=>14, :null=>false})
-          t.column("last_name", :"string", {:limit=>16, :null=>false})
-          t.column("hire_date", :"date", {:null=>false})
-        end
-      EOS
-    }
   end
 end

data/spec/postgresql/migrate/migrate_rename_column_spec.rb

@@ -133,16 +133,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-       rename_column("dept_emp", "from_date2", "from_date")
-
-       rename_column("dept_manager", "to_date2", "to_date")
-      EOS
-    }
-
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/migrate/migrate_rename_table_spec.rb

@@ -132,14 +132,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: 'employees'/, '')
     }
-
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        rename_table("employees2", "employees")
-      EOS
-    }
   end
 
   context 'when rename table (dry-run)' do

data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb

@@ -29,14 +29,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -43,14 +43,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
 
-    it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
-      expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
-      EOS
-    }
-
     it {
       delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -295,6 +295,7 @@ files:
 - spec/mysql/migrate/migrate_create_table_with_script_spec.rb
 - spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb
 - spec/mysql/migrate/migrate_drop_column_and_index_spec.rb
+- spec/mysql/migrate/migrate_drop_column_and_unique_index_spec.rb
 - spec/mysql/migrate/migrate_drop_column_spec.rb
 - spec/mysql/migrate/migrate_drop_index_spec.rb
 - spec/mysql/migrate/migrate_drop_table_spec.rb
@@ -379,12 +380,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
@@ -442,6 +443,7 @@ test_files:
 - spec/mysql/migrate/migrate_create_table_with_script_spec.rb
 - spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb
 - spec/mysql/migrate/migrate_drop_column_and_index_spec.rb
+- spec/mysql/migrate/migrate_drop_column_and_unique_index_spec.rb
 - spec/mysql/migrate/migrate_drop_column_spec.rb
 - spec/mysql/migrate/migrate_drop_index_spec.rb
 - spec/mysql/migrate/migrate_drop_table_spec.rb