ridgepole 0.7.0.beta → 0.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396b70e0da23ec61bcfcbf048b12ddce3b982372
-  data.tar.gz: 42cd06dddcc39e058530cb7593bfa24163ad3252
+  metadata.gz: 2de5f94990fb6c37ed124d73e965aefb87b65bf8
+  data.tar.gz: ed39dba231ba693c1631ea4d94f5d321004773ce
 SHA512:
-  metadata.gz: 055eff66d521e0a05b3d7bd5000833cd59abc9f93d363dd2dba91ace2cd0d5812c77fc197d5a0d16033d280d414a7da6974daf3b35af41f5981fb16a331656e4
-  data.tar.gz: a2340a631b404bf1341c0a6d9de8350fdb221ac33492ba16b3d08161fc362ff46f9e838d502c1a161734e77424e2004761e1b5e85562cf2e514de60ecadae2ee
+  metadata.gz: 4909ca73aee2594f904db3fa9dba647f812746265f88e875f951733636c9fdb9a5dc8b2ad694774e30d51e1fea9701afe220e21a1a3766a03e76ddc797dd4af6
+  data.tar.gz: 1861b9094313e0e668687f27ab5854798a97db35136cd10c8d0ab9cd88397940d01fb333f0cebe421c6d1e2405d7b6a5028a8aa4cb0071c2a5ccfa2c91fd010b

data/README.md

@@ -6,9 +6,11 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
-[![Edge Version](https://img.shields.io/badge/edge%20version-0.7.0.beta-green.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta)
-[![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=master)](https://travis-ci.org/winebarrel/ridgepole)
-[![Coverage Status](https://coveralls.io/repos/winebarrel/ridgepole/badge.svg?branch=master)](https://coveralls.io/r/winebarrel/ridgepole?branch=master)
+[![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)
+[![Edge Version](https://img.shields.io/badge/edge%20version-0.7.0.beta-green.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta2)
+[![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.7)](https://travis-ci.org/winebarrel/ridgepole)
+[![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.7)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.7)
 
 **Notice**
 
@@ -71,6 +73,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support MySQL JSON Type and Generated Columns
   * Add `--mysql-change-table-options` option
   * Pass config from env
+  * Fix change fk order
 
 ## Installation
 

data/lib/ridgepole/delta.rb

@@ -22,10 +22,11 @@ class Ridgepole::Delta
 
   def script
     buf = StringIO.new
-    buf_for_fk = StringIO.new
+    pre_buf_for_fk = StringIO.new
+    post_buf_for_fk = StringIO.new
 
     (@delta[:add] || {}).each do |table_name, attrs|
-      append_create_table(table_name, attrs, buf, buf_for_fk)
+      append_create_table(table_name, attrs, buf, post_buf_for_fk)
     end
 
     (@delta[:rename] || {}).each do |table_name, attrs|
@@ -33,14 +34,18 @@ class Ridgepole::Delta
     end
 
     (@delta[:change] || {}).each do |table_name, attrs|
-      append_change(table_name, attrs, buf, buf_for_fk)
+      append_change(table_name, attrs, buf, pre_buf_for_fk, post_buf_for_fk)
     end
 
     (@delta[:delete] || {}).each do |table_name, attrs|
       append_drop_table(table_name, attrs, buf)
     end
 
-    (buf.string.strip + "\n\n" + buf_for_fk.string.strip).strip
+    [
+      pre_buf_for_fk,
+      buf,
+      post_buf_for_fk,
+    ].map {|b| b.string.strip }.join("\n\n").strip
   end
 
   def differ?
@@ -211,7 +216,7 @@ class Ridgepole::Delta
     end
   end
 
-  def append_create_table(table_name, attrs, buf, buf_for_fk)
+  def append_create_table(table_name, attrs, buf, post_buf_for_fk)
     options = attrs[:options] || {}
     options[:options] ||= @options[:table_options] if @options[:table_options]
     definition = attrs[:definition] || {}
@@ -245,12 +250,12 @@ end
 
     unless (foreign_keys = attrs[:foreign_keys] || {}).empty?
       foreign_keys.each do |_, foreign_key_attrs|
-        append_add_foreign_key(table_name, foreign_key_attrs, buf_for_fk, @options)
+        append_add_foreign_key(table_name, foreign_key_attrs, post_buf_for_fk, @options)
       end
     end
 
     buf.puts
-    buf_for_fk.puts
+    post_buf_for_fk.puts
   end
 
   def append_rename_table(to_table_name, from_table_name, buf)
@@ -278,7 +283,7 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
     buf.puts
   end
 
-  def append_change(table_name, attrs, buf, buf_for_fk)
+  def append_change(table_name, attrs, buf, pre_buf_for_fk, post_buf_for_fk)
     definition = attrs[:definition] || {}
     indices = attrs[:indices] || {}
     foreign_keys = attrs[:foreign_keys] || {}
@@ -292,7 +297,7 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
     end
 
     unless foreign_keys.empty?
-      append_change_foreign_keys(table_name, foreign_keys, buf_for_fk, @options)
+      append_change_foreign_keys(table_name, foreign_keys, pre_buf_for_fk, post_buf_for_fk, @options)
     end
 
     if table_options
@@ -300,7 +305,8 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
     end
 
     buf.puts
-    buf_for_fk.puts
+    pre_buf_for_fk.puts
+    post_buf_for_fk.puts
   end
 
   def append_change_table(table_name, buf)
@@ -428,13 +434,13 @@ remove_index(#{table_name.inspect}, #{target.inspect})
     end
   end
 
-  def append_change_foreign_keys(table_name, delta, buf, options)
+  def append_change_foreign_keys(table_name, delta, pre_buf_for_fk, post_buf_for_fk, options)
     (delta[:delete] || {}).each do |_, attrs|
-      append_remove_foreign_key(table_name, attrs, buf, options)
+      append_remove_foreign_key(table_name, attrs, pre_buf_for_fk, options)
     end
 
     (delta[:add] || {}).each do |_, attrs|
-      append_add_foreign_key(table_name, attrs, buf, options)
+      append_add_foreign_key(table_name, attrs, post_buf_for_fk, options)
     end
   end
 

data/lib/ridgepole/version.rb

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

data/spec/mysql/fk/migrate_change_fk_spec.rb

@@ -110,4 +110,86 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
+
+  context 'when drop/add fk with parent table' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent2_id"
+          t.index ["parent2_id"], name: "par2_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent2", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent2", name: "child_ibfk_2"
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    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
+    }
+  end
+
+  context 'when drop/add fk with parent table without name' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent"
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent2_id"
+          t.index ["parent2_id"], name: "par2_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent2", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent2"
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    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
+    }
+  end
 end

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -208,4 +208,76 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy ''
     }
   end
+
+  context 'when drop fk with parent table' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    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
+    }
+  end
+
+  context 'when drop fk with parent table without name' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent"
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    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
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta
+  version: 0.7.0.beta2
 platform: ruby
 authors:
 - Genki Sugawara