ridgepole 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab7f38bb9a9792744ec9d0be95c424623bebc485
-  data.tar.gz: b0c4a492af6b717721f638151ff2551179db198c
+  metadata.gz: 7f20d24b4955d4b21970f0795d9202541c64387b
+  data.tar.gz: ca0f973959d8c8a4580282240938ff40b0c8f064
 SHA512:
-  metadata.gz: 0d98972b1adb24a14092700c87640bcdeb392807a1040f15ca919c4516366f49a93db7ba1c24aab4c8b44e4fb7e812cbdce672bc2cd3ae52dc9dc7e8732ce33f
-  data.tar.gz: d081472f63fcd0e1fec7adf35336965f1e8946edb41f524423c47261b84b2f57ea283e6d43cb0ce1753f98f041b740aa4c531b17b65aa3a32c98cfc08cdc2679
+  metadata.gz: a1956f2233beaf59f6d664fba626b79faa3594ef1fbc565e9f3ecd33c538a5801976bca703f8c5c8c50c94894e07073269a1e477ba1aaf084d0e0a90aeac2edd
+  data.tar.gz: bfbd7ec8f1edd90ff24ce5f3c8cee7860b60a262f020c2b98ee1dfc4eba6bb98743fbd8397b73706b087d11dbcfdfe964ed3bced3772bfb20b0ba0d95f73d4fc

data/lib/ridgepole/delta.rb

@@ -213,13 +213,13 @@ remove_column(#{table_name.inspect}, #{column_name.inspect})
   end
 
   def append_change_indices(table_name, delta, buf)
-    (delta[:add] || {}).each do |index_name, attrs|
-      append_add_index(table_name, index_name, attrs, buf)
-    end
-
     (delta[:delete] || {}).each do |index_name, attrs|
       append_remove_index(table_name, index_name, attrs, buf)
     end
+
+    (delta[:add] || {}).each do |index_name, attrs|
+      append_add_index(table_name, index_name, attrs, buf)
+    end
   end
 
   def append_add_index(table_name, index_name, attrs, buf)

data/lib/ridgepole/diff.rb

@@ -74,8 +74,8 @@ class Ridgepole::Diff
     table_delta = {}
 
     scan_options_change(table_name, from[:options], to[:options], table_delta)
-    scan_definition_change(from[:definition], to[:definition], table_delta)
-    scan_indices_change(from[:indices], to[:indices], table_delta)
+    scan_definition_change(from[:definition], to[:definition], from[:indices], table_delta)
+    scan_indices_change(from[:indices], to[:indices], to[:definition], table_delta)
 
     unless table_delta.empty?
       delta[:change] ||= {}
@@ -89,7 +89,7 @@ class Ridgepole::Diff
     end
   end
 
-  def scan_definition_change(from, to, table_delta)
+  def scan_definition_change(from, to, from_indices, table_delta)
     from = (from || {}).dup
     to = (to || {}).dup
     definition_delta = {}
@@ -131,6 +131,16 @@ class Ridgepole::Diff
       from.each do |column_name, from_attrs|
         definition_delta[:delete] ||= {}
         definition_delta[:delete][column_name] = from_attrs
+
+        if from_indices
+          from_indices.each do |name, attrs|
+            attrs[:column_name].delete(column_name)
+          end
+
+          from_indices.reject! do |name, attrs|
+            attrs[:column_name].empty?
+          end
+        end
       end
     end
 
@@ -163,7 +173,7 @@ class Ridgepole::Diff
     end
   end
 
-  def scan_indices_change(from, to, table_delta)
+  def scan_indices_change(from, to, to_columns, table_delta)
     from = (from || {}).dup
     to = (to || {}).dup
     indices_delta = {}
@@ -175,8 +185,10 @@ class Ridgepole::Diff
           indices_delta[:add][index_name] = to_attrs
 
           unless @options[:merge]
-            indices_delta[:delete] ||= {}
-            indices_delta[:delete][index_name] = from_attrs
+            if from_attrs[:column_name].all? {|i| to_columns[i] }
+              indices_delta[:delete] ||= {}
+              indices_delta[:delete][index_name] = from_attrs
+            end
           end
         end
       else
@@ -187,8 +199,10 @@ class Ridgepole::Diff
 
     unless @options[:merge]
       from.each do |index_name, from_attrs|
-        indices_delta[:delete] ||= {}
-        indices_delta[:delete][index_name] = from_attrs
+        if from_attrs[:column_name].all? {|i| to_columns[i] }
+          indices_delta[:delete] ||= {}
+          indices_delta[:delete][index_name] = from_attrs
+        end
       end
     end
 

data/lib/ridgepole/execute_expander.rb

@@ -40,3 +40,25 @@ class Ridgepole::ExecuteExpander
     end
   end # of class methods
 end
+
+require 'active_record/connection_adapters/abstract/schema_statements'
+
+module ActiveRecord::ConnectionAdapters::SchemaStatements
+  def add_index_with_noop(table_name, column_name, options = {})
+    begin
+      add_index_without_noop(table_name, column_name, options)
+    rescue => e
+      raise e unless Ridgepole::ExecuteExpander.noop
+    end
+  end
+  alias_method_chain :add_index, :noop
+
+  def remove_index_with_noop(table_name, options = {})
+    begin
+      remove_index_without_noop(table_name, options)
+    rescue => e
+      raise e unless Ridgepole::ExecuteExpander.noop
+    end
+  end
+  alias_method_chain :remove_index, :noop
+end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.2.9'
+  VERSION = '0.3.0'
 end

data/spec/migrate/check_orphan_index_spec.rb

@@ -1,5 +1,5 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when database is empty' do
+  context 'when there is an index of orphans' do
     let(:actual_dsl) { '' }
     let(:expected_dsl) {
       <<-RUBY

data/spec/migrate/migrate_drop_column_and_index_2_spec.rb

@@ -0,0 +1,152 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when drop column and index (2)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true 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
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no2",           null: false
+          t.string  "dept_no", limit: 4, null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no2"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string "dept_no", limit: 4, null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",   unsigned: true, null: false
+          t.integer "club_id2", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id2"], name: "idx_emp_no_club_id2", using: :btree
+        add_index "employee_clubs", ["emp_no"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no", "salary"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+    }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate(:noop => true)
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+    }
+  end
+end

data/spec/migrate/migrate_drop_column_and_index_spec.rb

@@ -0,0 +1,148 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when drop column and index' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true 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
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.string "dept_no", limit: 4, null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string "dept_no", limit: 4, null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+    }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate(:noop => true)
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+    }
+  end
+end

data/spec/migrate/migrate_noop_spec.rb

@@ -1,5 +1,5 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when database is empty' do
+  context 'when no operation' do
     let(:actual_dsl) { '' }
     let(:expected_dsl) {
       <<-RUBY

data/spec/migrate/migrate_script_error_spec.rb

@@ -1,5 +1,5 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when database is empty' do
+  context 'when there is an error in the script' do
     let(:actual_dsl) { '' }
     let(:expected_dsl) {
       <<-RUBY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Genki Sugawara
@@ -134,6 +134,8 @@ files:
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb
 - spec/migrate/migrate_create_table_spec.rb
+- spec/migrate/migrate_drop_column_and_index_2_spec.rb
+- spec/migrate/migrate_drop_column_and_index_spec.rb
 - spec/migrate/migrate_drop_column_spec.rb
 - spec/migrate/migrate_drop_index_spec.rb
 - spec/migrate/migrate_drop_table_spec.rb
@@ -192,6 +194,8 @@ test_files:
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb
 - spec/migrate/migrate_create_table_spec.rb
+- spec/migrate/migrate_drop_column_and_index_2_spec.rb
+- spec/migrate/migrate_drop_column_and_index_spec.rb
 - spec/migrate/migrate_drop_column_spec.rb
 - spec/migrate/migrate_drop_index_spec.rb
 - spec/migrate/migrate_drop_table_spec.rb