ridgepole 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c176eaae904de1588223d175a7ba36e49e04a2db
-  data.tar.gz: 2aeecdcaf4989e90ab383e8d8df9b0bfd13e98cc
+  metadata.gz: 56ee14dd171b5e6888ea56c015bbc37c65105ec6
+  data.tar.gz: 39425456d6e6a931918122ef2791f55f17e03154
 SHA512:
-  metadata.gz: c6f5adb0cae77d47f9ebea477a9219c87c58ca2dfd65774533ede9058a0aa86a6cd2032f67481f79c6b00746987108847682c416a3e615078d369ebae78fd841
-  data.tar.gz: bf5a941c4e33fea0010d7ea7caab81aa10f239d3658aa8fe55f11d5f1c27563a725a44f2b8e0db9fd74d1d6f6c439b755c54aba48acad4e87649ad5642a5d42f
+  metadata.gz: be023093493f6c5ab36f58e13f7a7c4ea1482c7f9b3955d83a0727627297921cc5cf380e4f7252a16a34cb7ca409468665421cc13383c3bf55abaf5f2a1182fc
+  data.tar.gz: ac0a15b7d6e76bccdcb07df562cb9e7f8e16d835761d80c3783c4def499da72e35b57f2d5d5b9dc449cd9b8203a309b63e1203b3f43a61839bc870d2be45fd6d

data/lib/ridgepole/diff.rb

@@ -75,7 +75,7 @@ class Ridgepole::Diff
 
     scan_options_change(table_name, from[:options], to[:options], table_delta)
     scan_definition_change(from[:definition], to[:definition], from[:indices], table_delta)
-    scan_indices_change(from[:indices], to[:indices], to[:definition], table_delta)
+    scan_indices_change(from[:indices], to[:indices], to[:definition], table_delta, from[:options], to[:options])
 
     unless table_delta.empty?
       delta[:change] ||= {}
@@ -171,7 +171,7 @@ class Ridgepole::Diff
     end
   end
 
-  def scan_indices_change(from, to, to_columns, table_delta)
+  def scan_indices_change(from, to, to_columns, table_delta, from_table_options, to_table_options)
     from = (from || {}).dup
     to = (to || {}).dup
     indices_delta = {}
@@ -197,7 +197,7 @@ class Ridgepole::Diff
           indices_delta[:add][index_name] = to_attrs
 
           unless @options[:merge]
-            if from_attrs[:column_name].all? {|i| to_columns[i] }
+            if columns_all_include?(from_attrs[:column_name], to_columns.keys, to_table_options)
               indices_delta[:delete] ||= {}
               indices_delta[:delete][index_name] = from_attrs
             end
@@ -211,7 +211,7 @@ class Ridgepole::Diff
 
     unless @options[:merge]
       from.each do |index_name, from_attrs|
-        if from_attrs[:column_name].all? {|i| to_columns[i] }
+        if columns_all_include?(from_attrs[:column_name], to_columns.keys, to_table_options)
           indices_delta[:delete] ||= {}
           indices_delta[:delete][index_name] = from_attrs
         end
@@ -246,4 +246,12 @@ class Ridgepole::Diff
     # XXX: MySQL only?
     opts[:using] = :btree unless opts.has_key?(:using)
   end
+
+  def columns_all_include?(expected_columns, actual_columns, table_options)
+    if table_options[:id] != false
+      actual_columns = actual_columns + [(table_options[:primary_key] || 'id').to_s]
+    end
+
+    expected_columns.all? {|i| actual_columns.include?(i) }
+  end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/spec/migrate/migrate_change_index4_spec.rb

@@ -0,0 +1,116 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change index (same name)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", 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", "id"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", 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", ["salary", "id"], 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.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+    }
+  end
+
+  context 'when change index (same name) (2)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        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
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        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", ["salary"], 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.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+    }
+  end
+
+  context 'when change index (same name) (3)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", primary_key: "emp_no", force: true do |t|
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["salary", "emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", primary_key: "emp_no", force: true do |t|
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["from_date", "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.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,6 +136,7 @@ files:
 - spec/migrate/migrate_change_column_spec.rb
 - spec/migrate/migrate_change_index2_spec.rb
 - spec/migrate/migrate_change_index3_spec.rb
+- spec/migrate/migrate_change_index4_spec.rb
 - spec/migrate/migrate_change_index_spec.rb
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
@@ -204,6 +205,7 @@ test_files:
 - spec/migrate/migrate_change_column_spec.rb
 - spec/migrate/migrate_change_index2_spec.rb
 - spec/migrate/migrate_change_index3_spec.rb
+- spec/migrate/migrate_change_index4_spec.rb
 - spec/migrate/migrate_change_index_spec.rb
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb