ridgepole 0.4.8.rc1 → 0.4.8.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf1189c330df38c7b922e8d49efbe41345bf5ca
-  data.tar.gz: 7577f13cff3830ee86f19617b593c68a83d225d3
+  metadata.gz: 022ee45d7a37fd8e93846164f89d98e055151c0d
+  data.tar.gz: c5f6572a791eb0c45097a3732905e8e091a6e6f4
 SHA512:
-  metadata.gz: 1599cba8ef9a7720d32b8da9d5f3403c4dec8a8a92930bd80072df35c6a190934ca61f990d97da47cf7464cfe9031b68f1cc69195dabf826fb5a09e8a5f3f0ff
-  data.tar.gz: 1709a0da42bb15ce7548b38a3b5bcfce395a4608c68201c8d1db16fd93c38172b9023cc5dcb8c47943abb6fb970792458552fabb414ccec36047c6e74effb4f1
+  metadata.gz: 458892f33c8d977dada755c86bd7f6c99410a1ed660f3673c4af92c8af6be0a77a196e0f5e64143f2f3f5ff0c6252d9ed3ab42bc0c9b6bba19c17a96f3396c3b
+  data.tar.gz: 354bca90dbb3a9b8720d8e7c8a814eeb5de11dd83e7ec4860cbd315de638f6b44f8076a8bbe379211d753fd834f66b6b203a2f50942fd9052e46f7caf1ef9263

data/README.md

@@ -7,6 +7,13 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.png)](http://badge.fury.io/rb/ridgepole)
 [![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.png?branch=master)](https://coveralls.io/r/winebarrel/ridgepole?branch=master)
+
+**Notice**
+
+* `>= 0.4.8`
+  * `activerecord-mysql-unsigned` is now optional. Please pass `--enable-mysql-unsigned` after you install [activerecord-mysql-unsigned](https://github.com/waka/activerecord-mysql-unsigned) if you want to use.
+  * Please pass `--enable-foreigner` after you install [foreigner](https://github.com/matthuhiggins/foreigner) if you want to use the foreign key.
 
 ## Installation
 
@@ -45,7 +52,8 @@ Usage: ridgepole [options]
     -o, --output FILE
     -t, --tables TABLES
         --ignore-tables TABLES
-        --disable-mysql-unsigned
+        --enable-mysql-unsigned
+        --enable-foreigner
         --log-file LOG_FILE
         --verbose
         --debug
@@ -110,7 +118,7 @@ Apply `Schemafile`
 ```
 
 ## Rename
-```sh
+```ruby
 create_table "articles", force: true do |t|
   t.string   "title"
   t.text     "desc", renamed_from: "text"
@@ -128,8 +136,26 @@ create_table "user_comments", force: true, renamed_from: "comments" do |t|
 end
 ```
 
+## Foreign Key
+You can use the foreign key by passing `--enable-foreigner` ([foreigner](https://github.com/matthuhiggins/foreigner) is required)
+
+```ruby
+create_table "parent", force: true do |t|
+end
+
+create_table "child", id: false, force: true do |t|
+  t.integer "id"
+  t.integer "parent_id"
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+```
+
+
 ## Execute
-```sh
+```ruby
 create_table "authors", force: true do |t|
   t.string "name", null: false
 end

data/bin/ridgepole

@@ -91,7 +91,8 @@ ARGV.options do |opt|
     opt.on('-o', '--output FILE')                 {|v| output_file = v                                      }
     opt.on('-t', '--tables TABLES', Array)        {|v| options[:tables] = v                                 }
     opt.on('',   '--ignore-tables TABLES', Array) {|v| options[:ignore_tables] = v.map {|i| Regexp.new(i) } }
-    opt.on('',   '--disable-mysql-unsigned')      {    options[:disable_mysql_unsigned] = true              }
+    opt.on('',   '--enable-mysql-unsigned')       {    options[:enable_mysql_unsigned] = true               }
+    opt.on('',   '--enable-foreigner')            {    options[:enable_foreigner] = true                    }
     opt.on(''  , '--log-file LOG_FILE')           {|v| options[:log_file] = v                               }
     opt.on(''  , '--verbose')                     {    Ridgepole::Logger.verbose = true                     }
     opt.on(''  , '--debug')                       {    options[:debug] = true                               }

data/lib/ridgepole.rb

@@ -4,7 +4,7 @@ require 'stringio'
 
 require 'active_record'
 require 'active_support'
-require 'active_support/core_ext/string/strip'
+require 'active_support/core_ext'
 
 module Ridgepole; end
 require 'ridgepole/client'
@@ -13,6 +13,7 @@ require 'ridgepole/diff'
 require 'ridgepole/dsl_parser'
 require 'ridgepole/dumper'
 require 'ridgepole/execute_expander'
+require 'ridgepole/ext/foreign_key'
 require 'ridgepole/logger'
 require 'ridgepole/migration_ext'
 require 'ridgepole/schema_dumper_ext'

data/lib/ridgepole/client.rb

@@ -7,9 +7,13 @@ class Ridgepole::Client
     @parser = Ridgepole::DSLParser.new(@options)
     @diff = Ridgepole::Diff.new(@options)
 
-    unless @options[:disable_mysql_unsigned]
+    if @options[:enable_mysql_unsigned]
       require 'activerecord-mysql-unsigned'
     end
+
+    if @options[:enable_foreigner]
+      Ridgepole::ForeignKey.init
+    end
   end
 
   def dump(&block)

data/lib/ridgepole/delta.rb

@@ -226,6 +226,14 @@ end
       end
     end
 
+    if @options[:enable_foreigner] and not (foreign_keys = attrs[:foreign_keys] || {}).empty?
+      append_change_table(table_name, buf) do
+        foreign_keys.each do |foreign_key_name, foreign_key_attrs|
+          Ridgepole::ForeignKey.append_add_foreign_key(table_name, foreign_key_name, foreign_key_attrs, buf, @options)
+        end
+      end
+    end
+
     buf.puts
   end
 
@@ -249,6 +257,10 @@ drop_table(#{table_name.inspect})
     append_change_table(table_name, buf) do
       append_change_definition(table_name, attrs[:definition] || {}, buf)
       append_change_indices(table_name, attrs[:indices] || {}, buf)
+
+      if @options[:enable_foreigner]
+        Ridgepole::ForeignKey.append_change_foreign_keys(table_name, attrs[:foreign_keys] || {}, buf, @options)
+      end
     end
 
     buf.puts

data/lib/ridgepole/diff.rb

@@ -79,6 +79,10 @@ class Ridgepole::Diff
     scan_definition_change(from[:definition], to[:definition], from[:indices], table_delta)
     scan_indices_change(from[:indices], to[:indices], to[:definition], table_delta, from[:options], to[:options])
 
+    if @options[:enable_foreigner]
+      Ridgepole::ForeignKey.scan_foreign_keys_change(from[:foreign_keys], to[:foreign_keys], table_delta, @options)
+    end
+
     unless table_delta.empty?
       delta[:change] ||= {}
       delta[:change][table_name] = table_delta
@@ -251,7 +255,7 @@ class Ridgepole::Diff
     end
 
     # XXX: MySQL only?
-    unless @options[:disable_mysql_unsigned]
+    if @options[:enable_mysql_unsigned]
       opts[:unsigned] = false unless opts.has_key?(:unsigned)
     end
   end

data/lib/ridgepole/dsl_parser.rb

@@ -1,5 +1,11 @@
 class Ridgepole::DSLParser
   class Context
+    def self.include_module(mod)
+      unless self.included_modules.include?(mod)
+        include mod
+      end
+    end
+
     class TableDefinition
       attr_reader :__definition
 
@@ -141,6 +147,11 @@ class Ridgepole::DSLParser
   def parse(dsl, opts = {})
     definition, execute = Context.eval(dsl, opts)
     check_orphan_index(definition)
+
+    if @options[:enable_foreigner]
+      Ridgepole::ForeignKey.check_orphan_foreign_key(definition)
+    end
+
     [definition, execute]
   end
 
@@ -148,7 +159,7 @@ class Ridgepole::DSLParser
 
   def check_orphan_index(definition)
     definition.each do |table_name, attrs|
-      if attrs.length == 1 and attrs[:indices]
+      if attrs[:indices] and not attrs[:definition]
         raise "Table `#{table_name}` to create the index is not defined: #{attrs[:indices].keys.join(',')}"
       end
     end

data/lib/ridgepole/ext/foreign_key.rb

@@ -0,0 +1,121 @@
+class Ridgepole::ForeignKey
+  class << self
+    def init
+      require 'foreigner'
+
+      ActiveSupport.on_load :active_record do
+        Foreigner.load
+      end
+
+      Ridgepole::DSLParser::Context.include_module(Ridgepole::ForeignKey::DSL)
+    end
+
+    def check_orphan_foreign_key(definition)
+      definition.each do |table_name, attrs|
+        if attrs[:foreign_keys] and not attrs[:definition]
+          raise "Table `#{table_name}` to create the foreign key is not defined: #{attrs[:foreign_keys].keys.join(',')}"
+        end
+      end
+    end
+
+    def scan_foreign_keys_change(from, to, table_delta, options)
+      from = (from || {}).dup
+      to = (to || {}).dup
+      foreign_keys_delta = {}
+
+      to.each do |foreign_key_name, to_attrs|
+        from_attrs = from.delete(foreign_key_name)
+
+        if from_attrs
+          if from_attrs != to_attrs
+            foreign_keys_delta[:add] ||= {}
+            foreign_keys_delta[:add][foreign_key_name] = to_attrs
+
+            unless options[:merge]
+              foreign_keys_delta[:delete] ||= {}
+              foreign_keys_delta[:delete][foreign_key_name] = from_attrs
+            end
+          end
+        else
+          foreign_keys_delta[:add] ||= {}
+          foreign_keys_delta[:add][foreign_key_name] = to_attrs
+        end
+      end
+
+      unless options[:merge]
+        from.each do |foreign_key_name, from_attrs|
+          foreign_keys_delta[:delete] ||= {}
+          foreign_keys_delta[:delete][foreign_key_name] = from_attrs
+        end
+      end
+
+      unless foreign_keys_delta.empty?
+        table_delta[:foreign_keys] = foreign_keys_delta
+      end
+    end
+
+    def append_change_foreign_keys(table_name, delta, buf, options)
+      (delta[:delete] || {}).each do |foreign_key_name, attrs|
+        append_remove_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+      end
+
+      (delta[:add] || {}).each do |foreign_key_name, attrs|
+        append_add_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+      end
+    end
+
+    def append_add_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+      to_table = attrs.fetch(:to_table)
+      attrs_options = attrs[:options] || {}
+
+      if options[:bulk_change]
+        buf.puts(<<-EOS)
+  t.foreign_key(#{to_table.inspect}, #{attrs_options.inspect})
+        EOS
+      else
+        buf.puts(<<-EOS)
+add_foreign_key(#{table_name.inspect}, #{to_table.inspect}, #{attrs_options.inspect})
+        EOS
+      end
+    end
+
+    def append_remove_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+      attrs_options = attrs[:options] || {}
+      target = {:name => attrs_options.fetch(:name)}
+
+      if options[:bulk_change]
+        buf.puts(<<-EOS)
+  t.remove_foreign_key(#{target.inspect})
+        EOS
+      else
+        buf.puts(<<-EOS)
+remove_foreign_key(#{table_name.inspect}, #{target.inspect})
+        EOS
+      end
+    end
+  end # of class methods
+
+  module DSL
+    def add_foreign_key(from_table, to_table, options = {})
+      unless options[:name]
+        raise "Foreign key name in `#{from_table}` is undefined"
+      end
+
+      from_table = from_table.to_s
+      to_table = to_table.to_s
+      options[:name] = options[:name].to_s
+      @__definition[from_table] ||= {}
+      @__definition[from_table][:foreign_keys] ||= {}
+      idx = options[:name]
+
+      if @__definition[from_table][:foreign_keys][idx]
+        raise "Foreign Key `#{from_table}(#{idx})` already defined"
+      end
+
+      @__definition[from_table][:foreign_keys][idx] = {
+        :to_table => to_table,
+        :options => options,
+      }
+    end
+  end
+end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.4.8.rc1'
+  VERSION = '0.4.8.rc2'
 end

data/ridgepole.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord'
-  spec.add_dependency 'activerecord-mysql-unsigned', '>= 0.2.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'activerecord-mysql-unsigned', '>= 0.2.0'
+  spec.add_development_dependency 'foreigner'
 end

data/spec/0_diff/dump_disable_unsigned_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#dump' do
   context 'when there is a tables (disable unsigned)' do
     before { restore_tables }
-    subject { client(disable_mysql_unsigned: true) }
+    subject { client(enable_mysql_unsigned: false) }
 
     it {
       expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip

data/spec/cli/ridgepole_spec.rb

@@ -29,7 +29,8 @@ describe 'ridgepole' do
         -o, --output FILE
         -t, --tables TABLES
             --ignore-tables TABLES
-            --disable-mysql-unsigned
+            --enable-mysql-unsigned
+            --enable-foreigner
             --log-file LOG_FILE
             --verbose
             --debug

data/spec/diff/diff_spec.rb

@@ -141,7 +141,7 @@ describe 'Ridgepole::Client.diff' do
     subject { Ridgepole::Client }
 
     it {
-      delta = subject.diff(actual_dsl, expected_dsl)
+      delta = subject.diff(actual_dsl, expected_dsl, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})

data/spec/dump/dump_class_method_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client.dump' do
     subject { Ridgepole::Client }
 
     it {
-      expect(subject.dump(conn_spec)).to eq <<-RUBY.strip_heredoc.strip
+      expect(subject.dump(conn_spec, enable_mysql_unsigned: true)).to eq <<-RUBY.strip_heredoc.strip
         create_table "clubs", force: true do |t|
           t.string "name", default: "", null: false
         end

data/spec/migrate/migrate_change_column_spec.rb

@@ -150,7 +150,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>true, :null=>false})

data/spec/migrate/migrate_with_ignore_tables_spec.rb

@@ -145,7 +145,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     it {
-      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true)
+      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})

data/spec/migrate/migrate_with_tables_spec.rb

@@ -145,7 +145,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     it {
-      delta = Ridgepole::Client.diff(current_schema, dsl, tables: ['employees'], reverse: true)
+      delta = Ridgepole::Client.diff(current_schema, dsl, tables: ['employees'], reverse: true, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})

data/spec/migrate_0/migrate_change_fk_spec.rb

@@ -0,0 +1,60 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change fk' do
+    let(:actual_dsl) {
+      <<-RUBY
+create_table "parent", force: true do |t|
+end
+
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    let(:sorted_actual_dsl) {
+      <<-RUBY
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+create_table "parent", force: true do |t|
+end
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+create_table "parent", force: true do |t|
+end
+
+add_foreign_key "child", "parent", name: "child_ibfk_1"
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+
+    subject { client(enable_foreigner: true) }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq sorted_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

data/spec/migrate_0/migrate_create_fk_spec.rb

@@ -0,0 +1,172 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when create fk' do
+    let(:actual_dsl) {
+      <<-RUBY
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+create_table "parent", force: true do |t|
+end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      actual_dsl + (<<-RUBY)
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(enable_foreigner: true) }
+
+    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
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_foreigner: true)
+      expect(delta.differ?).to be_truthy
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        remove_foreign_key("child", {:name=>"child_ibfk_1"})
+      RUBY
+    }
+
+    it {
+      delta = client(enable_foreigner: true, bulk_change: true).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
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        change_table("child", {:bulk => true}) do |t|
+          t.foreign_key("parent", {:name=>"child_ibfk_1", :dependent=>:delete})
+        end
+      RUBY
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+    }
+  end
+
+  context 'when create fk when create table' do
+    let(:dsl) {
+      <<-RUBY
+# Define parent before child
+create_table "parent", force: true do |t|
+end
+
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    let(:sorted_dsl) {
+      <<-RUBY
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+create_table "parent", force: true do |t|
+end
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    subject { client(enable_foreigner: true) }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.strip).to eq ''
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq sorted_dsl.strip_heredoc.strip.delete_empty_lines
+    }
+  end
+
+  context 'already defined' do
+    let(:dsl) {
+      <<-RUBY
+# Define parent before child
+create_table "parent", force: true do |t|
+end
+
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    subject { client(enable_foreigner: true) }
+
+    it {
+      expect {
+        subject.diff(dsl)
+      }.to raise_error('Foreign Key `child(child_ibfk_1)` already defined')
+    }
+  end
+
+  context 'no name' do
+    let(:dsl) {
+      <<-RUBY
+# Define parent before child
+create_table "parent", force: true do |t|
+end
+
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+add_foreign_key "child", "parent", dependent: :delete
+      RUBY
+    }
+
+    subject { client(enable_foreigner: true) }
+
+    it {
+      expect {
+        subject.diff(dsl)
+      }.to raise_error('Foreign key name in `child` is undefined')
+    }
+  end
+
+  context 'orphan fk' do
+    let(:dsl) {
+      <<-RUBY
+# Define parent before child
+create_table "parent", force: true do |t|
+end
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    subject { client(enable_foreigner: true) }
+
+    it {
+      expect {
+        subject.diff(dsl)
+      }.to raise_error('Table `child` to create the foreign key is not defined: child_ibfk_1')
+    }
+  end
+end

data/spec/migrate_0/migrate_drop_fk_spec.rb

@@ -0,0 +1,113 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when drop fk' do
+    let(:actual_dsl) {
+      <<-RUBY
+create_table "parent", force: true do |t|
+end
+
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    let(:sorted_actual_dsl) {
+      expected_dsl + (<<-RUBY)
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+create_table "parent", force: true do |t|
+end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(enable_foreigner: true) }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq sorted_actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.strip_heredoc.strip.each_line.select {|i| i !~ /\A\Z/ }.join
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_foreigner: true)
+      expect(delta.differ?).to be_truthy
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        add_foreign_key("child", "parent", {:name=>"child_ibfk_1", :dependent=>:delete})
+      RUBY
+    }
+
+    it {
+      delta = client(enable_foreigner: true, bulk_change: true).diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq sorted_actual_dsl.strip_heredoc.strip
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        change_table("child", {:bulk => true}) do |t|
+          t.remove_foreign_key({:name=>"child_ibfk_1"})
+        end
+      RUBY
+      delta.migrate
+      expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.strip_heredoc.strip.each_line.select {|i| i !~ /\A\Z/ }.join
+    }
+  end
+
+  context 'when drop fk when drop table' do
+    let(:dsl) {
+      <<-RUBY
+create_table "parent", force: true do |t|
+end
+
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    let(:sorted_dsl) {
+      <<-RUBY
+create_table "child", force: true do |t|
+  t.integer "parent_id", unsigned: true
+end
+
+add_index "child", ["parent_id"], name: "par_ind", using: :btree
+
+create_table "parent", force: true do |t|
+end
+
+add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+      RUBY
+    }
+
+    before { subject.diff(dsl).migrate }
+    subject { client(enable_foreigner: true) }
+
+    it {
+      delta = subject.diff('')
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq sorted_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump.strip).to eq ''
+    }
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,15 @@
 $: << File.expand_path('..', __FILE__)
+
+if ENV['TRAVIS']
+  require 'simplecov'
+  require 'coveralls'
+
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter "spec/"
+  end
+end
+
 require 'ridgepole'
 require 'ridgepole/cli/config'
 require 'active_support/core_ext/string/strip'
@@ -9,8 +20,15 @@ require 'json'
 
 TEST_SCHEMA = 'ridgepole_test'
 
-ActiveRecord::Migration.verbose = false
-Ridgepole::Logger.instance.level = ::Logger::ERROR
+if ENV['DEBUG']
+  ActiveRecord::Migration.verbose = true
+  logger = Ridgepole::Logger.instance
+  logger.level = ::Logger::DEBUG
+  ActiveRecord::Base.logger = logger
+else
+  ActiveRecord::Migration.verbose = false
+  Ridgepole::Logger.instance.level = ::Logger::ERROR
+end
 
 RSpec.configure do |config|
   config.before(:each) do
@@ -32,6 +50,8 @@ def client(options = {}, config = {})
   config = conn_spec(config)
 
   options = {
+    :enable_mysql_unsigned => true,
+    :debug => !!ENV['DEBUG'],
   }.merge(options)
 
   Ridgepole::Client.new(config, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.4.8.rc1
+  version: 0.4.8.rc2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-mysql-unsigned
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,21 +81,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: activerecord-mysql-unsigned
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: foreigner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -119,6 +147,7 @@ files:
 - lib/ridgepole/dsl_parser.rb
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
+- lib/ridgepole/ext/foreign_key.rb
 - lib/ridgepole/logger.rb
 - lib/ridgepole/migration_ext.rb
 - lib/ridgepole/schema_dumper_ext.rb
@@ -167,6 +196,9 @@ files:
 - spec/migrate/migrate_with_ignore_tables_spec.rb
 - spec/migrate/migrate_with_pre_post_query_spec.rb
 - spec/migrate/migrate_with_tables_spec.rb
+- spec/migrate_0/migrate_change_fk_spec.rb
+- spec/migrate_0/migrate_create_fk_spec.rb
+- spec/migrate_0/migrate_drop_fk_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql
 - spec/spec_helper.rb
@@ -191,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
@@ -239,6 +271,9 @@ test_files:
 - spec/migrate/migrate_with_ignore_tables_spec.rb
 - spec/migrate/migrate_with_pre_post_query_spec.rb
 - spec/migrate/migrate_with_tables_spec.rb
+- spec/migrate_0/migrate_change_fk_spec.rb
+- spec/migrate_0/migrate_create_fk_spec.rb
+- spec/migrate_0/migrate_drop_fk_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql
 - spec/spec_helper.rb