ridgepole 0.4.7 → 0.4.8.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1450957da8f5ba966dfab934b036b4a93d972e99
-  data.tar.gz: 2d323098fd39e4e86dea90279e40dad90a4c09a8
+  metadata.gz: 8bf1189c330df38c7b922e8d49efbe41345bf5ca
+  data.tar.gz: 7577f13cff3830ee86f19617b593c68a83d225d3
 SHA512:
-  metadata.gz: 07dacc0bce5cba26d9636bb5acbfb70a7db5bc6bcb5de2eaec9e4ad37ed84728891414d6c534560f1b59c3b3db16714141cdf03eb322274f563e3e682fd069b4
-  data.tar.gz: 3e064705391531a4918bfdf0c88ddcaa96ceab35d85b0e53a91966afd9fb3b0833365f2019098383407f441b51cd9b25d2a78f2a822ed46cfe0aeec0696ca61f
+  metadata.gz: 1599cba8ef9a7720d32b8da9d5f3403c4dec8a8a92930bd80072df35c6a190934ca61f990d97da47cf7464cfe9031b68f1cc69195dabf826fb5a09e8a5f3f0ff
+  data.tar.gz: 1709a0da42bb15ce7548b38a3b5bcfce395a4608c68201c8d1db16fd93c38172b9023cc5dcb8c47943abb6fb970792458552fabb414ccec36047c6e74effb4f1

data/README.md

@@ -128,6 +128,25 @@ create_table "user_comments", force: true, renamed_from: "comments" do |t|
 end
 ```
 
+## Execute
+```sh
+create_table "authors", force: true do |t|
+  t.string "name", null: false
+end
+
+create_table "books", force: true do |t|
+  t.string  "title",                     null: false
+  t.integer "author_id", unsigned: true, null: false
+end
+
+add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+
+execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
+  # Execute SQL only if there is no foreign key
+  c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = 'bookshelf' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+end
+```
+
 ## Diff
 ```sh
 $ ridgepole --diff file1.schema file2.schema

data/bin/ridgepole

@@ -34,11 +34,23 @@ set_mode = proc do |m|
 end
 
 def noop_migrate(delta)
-  puts delta.script + "\n\n"
+  unless delta.script.empty?
+    puts delta.script + "\n\n"
+  end
+
+  migrated, out = delta.migrate(:noop => true)
 
-  delta.migrate(:noop => true).each_line do |line|
-    puts line.strip.gsub(/([^\d])([(),])([^\d])/) { "#{$1}#{$2}\n#{$3}" }.each_line.map {|i| "# #{i.gsub(/^\s+/, '')}"}.join + "\n\n"
+  if migrated
+    out.each_line do |line|
+      if line =~ /\A\s+/
+        puts "# #{line}"
+      else
+        puts line.strip.gsub(/([^\d])([(),])([^\d])/) { "#{$1}#{$2}\n#{$3}" }.each_line.map {|i| "# #{i.gsub(/^\s+/, '')}"}.join + "\n"
+      end
+    end
   end
+
+  return migrated
 end
 
 ARGV.options do |opt|
@@ -161,17 +173,18 @@ begin
 
     dsl = File.read(file)
     delta = client.diff(dsl, :path => file)
+    differ = delta.differ?
 
     if options[:dry_run]
-      if delta.differ?
-        noop_migrate(delta)
+      if differ
+        differ = noop_migrate(delta)
       end
     else
       logger.verbose_info('# Update schema')
-      delta.migrate
+      differ, out = delta.migrate
     end
 
-    unless delta.differ?
+    unless differ
       logger.info('No change')
     end
   when :diff
@@ -193,15 +206,18 @@ begin
 
     if diff_with_apply
       logger.verbose_info('# Update schema')
+      differ = delta.differ?
 
-      if delta.differ?
-        delta.migrate
-      else
+      if differ
+        differ, out = delta.migrate
+      end
+
+      if differ
         logger.info('No change')
       end
     elsif delta.differ?
-      noop_migrate(delta)
-      exit_code = 1
+      differ = noop_migrate(delta)
+      exit_code = 1 if differ
     end
   end
 rescue => e

data/lib/ridgepole/client.rb

@@ -22,11 +22,11 @@ class Ridgepole::Client
     logger = Ridgepole::Logger.instance
 
     logger.verbose_info('# Parse DSL')
-    expected_definition = @parser.parse(dsl, opts)
+    expected_definition, expected_execute = @parser.parse(dsl, opts)
     logger.verbose_info('# Load tables')
-    current_definition = @parser.parse(@dumper.dump)
+    current_definition, current_execute = @parser.parse(@dumper.dump)
     logger.verbose_info('# Compare definitions')
-    @diff.diff(current_definition, expected_definition)
+    @diff.diff(current_definition, expected_definition, :execute => expected_execute)
   end
 
   class << self
@@ -34,9 +34,9 @@ class Ridgepole::Client
       logger = Ridgepole::Logger.instance
 
       logger.verbose_info('# Parse DSL1')
-      definition1 = load_definition(dsl_or_config1)
+      definition1, execute1 = load_definition(dsl_or_config1)
       logger.verbose_info('# Parse DSL2')
-      definition2 = load_definition(dsl_or_config2)
+      definition2, execute2 = load_definition(dsl_or_config2)
 
       logger.verbose_info('# Compare definitions')
       diff = Ridgepole::Diff.new(options)

data/lib/ridgepole/delta.rb

@@ -4,6 +4,7 @@ class Ridgepole::Delta
   def initialize(delta, options = {})
     @delta = delta
     @options = options
+    @logger = Ridgepole::Logger.instance
   end
 
   def migrate(options = {})
@@ -41,12 +42,15 @@ class Ridgepole::Delta
   end
 
   def differ?
-    not script.empty?
+    not script.empty? or not delta_execute.empty?
   end
 
   private
 
   def migrate0(options = {})
+    migrated = false
+    out = nil
+
     if options[:noop]
       disable_logging_orig = ActiveRecord::Migration.disable_logging
 
@@ -59,26 +63,74 @@ class Ridgepole::Delta
         end
 
         Ridgepole::ExecuteExpander.without_operation(callback) do
-          eval_script(script, options.merge(:out => buf))
+          migrated = eval_script(script, options.merge(:out => buf))
         end
 
-        buf.string.strip
+        out = buf.string.strip
       ensure
         ActiveRecord::Migration.disable_logging = disable_logging_orig
       end
     else
-      eval_script(script, options)
+      migrated = eval_script(script, options)
     end
+
+    [migrated, out]
   end
 
   def eval_script(script, options = {})
+    execute_count = 0
+
     begin
       with_pre_post_query(options) do
-        ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1)
+        unless script.empty?
+          ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1)
+        end
+
+        execute_count = execute_sqls(options)
       end
     rescue => e
       raise_exception(script, e)
     end
+
+    not script.empty? or execute_count.nonzero?
+  end
+
+  def execute_sqls(options = {})
+    es = @delta[:execute] || []
+    out = options[:out] || $stdout
+    execute_count = 0
+
+    es.each do |exec|
+      sql, cond = exec.values_at(:sql, :condition)
+      executable = false
+
+      begin
+        executable = cond.nil? || cond.call(ActiveRecord::Base.connection)
+      rescue => e
+        errmsg = "[WARN] `#{sql}` is not executed: #{e.message}"
+
+        if @options[:debug]
+          errmsg = ([errmsg] + e.backtrace).join("\n\tfrom ")
+        end
+
+        Ridgepole::Logger.instance.warn(errmsg)
+
+        executable = false
+      end
+
+      next unless executable
+
+      if options[:noop]
+        out.puts(sql.strip_heredoc)
+      else
+        @logger.info(sql.strip_heredoc)
+        ActiveRecord::Base.connection.execute(sql)
+      end
+
+      execute_count += 1
+    end
+
+    return execute_count
   end
 
   def with_pre_post_query(options = {})
@@ -324,4 +376,8 @@ remove_index(#{table_name.inspect}, #{target.inspect})
       EOS
     end
   end
+
+  def delta_execute
+    @delta[:execute] || []
+  end
 end

data/lib/ridgepole/diff.rb

@@ -3,9 +3,9 @@ class Ridgepole::Diff
     @options = options
   end
 
-  def diff(from, to)
-    from = (from || {}).dup
-    to = (to || {}).dup
+  def diff(from, to, options = {})
+    from = (from || {}).deep_dup
+    to = (to || {}).deep_dup
 
     if @options[:reverse]
       from, to = to, from
@@ -36,6 +36,8 @@ class Ridgepole::Diff
       end
     end
 
+    delta[:execute] = options[:execute]
+
     Ridgepole::Delta.new(delta, @options)
   end
 

data/lib/ridgepole/dsl_parser.rb

@@ -40,26 +40,28 @@ class Ridgepole::DSLParser
 
       def timestamps(*args)
         options = {:null => false}.merge(args.extract_options!)
-        column(:created_at, :datetime, options.dup)
-        column(:updated_at, :datetime, options.dup)
+        column(:created_at, :datetime, options)
+        column(:updated_at, :datetime, options)
       end
 
       def references(*args)
         options = args.extract_options!
         polymorphic = options.delete(:polymorphic)
         args.each do |col|
-          column("#{col}_id", :integer, options.dup)
-          column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options.dup) unless polymorphic.nil?
+          column("#{col}_id", :integer, options)
+          column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) unless polymorphic.nil?
         end
       end
       alias :belongs_to :references
     end
 
     attr_reader :__definition
+    attr_reader :__execute
 
     def initialize(opts = {})
       @__working_dir = File.expand_path(opts[:path] ? File.dirname(opts[:path]) : Dir.pwd)
       @__definition = {}
+      @__execute = []
     end
 
     def self.eval(dsl, opts = {})
@@ -71,7 +73,7 @@ class Ridgepole::DSLParser
         ctx.instance_eval(dsl)
       end
 
-      ctx.__definition
+      [ctx.__definition, ctx.__execute]
     end
 
     def create_table(table_name, options = {})
@@ -123,6 +125,13 @@ class Ridgepole::DSLParser
         Kernel.require(file)
       end
     end
+
+    def execute(sql, name = nil, &cond)
+      @__execute << {
+        :sql => sql,
+        :condition => cond,
+      }
+    end
   end
 
   def initialize(options = {})
@@ -130,15 +139,15 @@ class Ridgepole::DSLParser
   end
 
   def parse(dsl, opts = {})
-    parsed = Context.eval(dsl, opts)
-    check_orphan_index(parsed)
-    parsed
+    definition, execute = Context.eval(dsl, opts)
+    check_orphan_index(definition)
+    [definition, execute]
   end
 
   private
 
-  def check_orphan_index(parsed)
-    parsed.each do |table_name, attrs|
+  def check_orphan_index(definition)
+    definition.each do |table_name, attrs|
       if attrs.length == 1 and attrs[:indices]
         raise "Table `#{table_name}` to create the index is not defined: #{attrs[:indices].keys.join(',')}"
       end

data/lib/ridgepole/version.rb

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

data/spec/cli/ridgepole_spec.rb

@@ -110,8 +110,8 @@ describe 'ridgepole' do
         Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
         Apply `Schemafile`
         Ridgepole::Client#diff
-        Ridgepole::Delta#migrate
         Ridgepole::Delta#differ?
+        Ridgepole::Delta#migrate
         No change
       EOS
     end
@@ -131,8 +131,8 @@ describe 'ridgepole' do
           Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, {:dry_run=>false, :debug=>true}])
           Apply `Schemafile`
           Ridgepole::Client#diff
-          Ridgepole::Delta#migrate
           Ridgepole::Delta#differ?
+          Ridgepole::Delta#migrate
           No change
         EOS
       end
@@ -157,8 +157,8 @@ describe 'ridgepole' do
           Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_development"}, {:dry_run=>false, :debug=>true}])
           Apply `Schemafile`
           Ridgepole::Client#diff
-          Ridgepole::Delta#migrate
           Ridgepole::Delta#differ?
+          Ridgepole::Delta#migrate
           No change
         EOS
       end
@@ -173,7 +173,6 @@ describe 'ridgepole' do
         Apply `Schemafile` (dry-run)
         Ridgepole::Client#diff
         Ridgepole::Delta#differ?
-        Ridgepole::Delta#differ?
         No change
       EOS
     end
@@ -189,8 +188,8 @@ describe 'ridgepole' do
           Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
           Apply `Schemafile`
           Ridgepole::Client#diff
-          Ridgepole::Delta#migrate
           Ridgepole::Delta#differ?
+          Ridgepole::Delta#migrate
         EOS
       end
 
@@ -204,15 +203,13 @@ describe 'ridgepole' do
           Ridgepole::Client#diff
           Ridgepole::Delta#differ?
           Ridgepole::Delta#script
+          Ridgepole::Delta#script
           create_table :table do
           end
 
           Ridgepole::Delta#migrate
           # create_table :table do
-
           # end
-
-          Ridgepole::Delta#differ?
         EOS
       end
     end
@@ -244,12 +241,12 @@ describe 'ridgepole' do
           Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
           Ridgepole::Delta#differ?
           Ridgepole::Delta#script
+          Ridgepole::Delta#script
           create_table :table do
           end
 
           Ridgepole::Delta#migrate
           # create_table :table do
-
           # end
         EOS
       end

data/spec/migrate/migrate_add_column2_spec.rb

@@ -30,7 +30,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-      sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_truthy
       expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
 
       sql = sql.each_line.map {|i| i.strip }.join("\n")
@@ -69,7 +70,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-      sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_truthy
       expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
 
       sql = sql.each_line.map {|i| i.strip }.join("\n")
@@ -108,7 +110,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-      sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_truthy
       expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
 
       sql = sql.each_line.map {|i| i.strip }.join("\n")

data/spec/migrate/migrate_execute_spec.rb

@@ -0,0 +1,285 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when execute' do
+    let(:dsl) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+      RUBY
+    }
+
+    let(:dsl_with_execute) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+
+        execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '#{TEST_SCHEMA}' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+        end
+      RUBY
+    }
+
+    before { subject.diff(dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl_with_execute)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE,
+          CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+    }
+  end
+
+  context 'when not execute' do
+    let(:dsl) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+      RUBY
+    }
+
+    let(:dsl_with_execute) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+
+        execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '#{TEST_SCHEMA}' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+        end
+      RUBY
+    }
+
+    before { subject.diff(dsl_with_execute).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl_with_execute)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE,
+          CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+
+      migrated, out = delta.migrate
+      expect(migrated).to be_falsey
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE,
+          CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+    }
+  end
+
+  context 'when execute (noop)' do
+    let(:dsl) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+      RUBY
+    }
+
+    let(:dsl_with_execute) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+
+        execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '#{TEST_SCHEMA}' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+        end
+      RUBY
+    }
+
+    before { subject.diff(dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl_with_execute)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(sql.strip).to eq "ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)"
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+    }
+  end
+
+  context 'when not execute (noop)' do
+    let(:dsl) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+      RUBY
+    }
+
+    let(:dsl_with_execute) {
+      <<-RUBY
+        create_table "authors", force: true do |t|
+          t.string "name", null: false
+        end
+
+        create_table "books", force: true do |t|
+          t.string  "title",                     null: false
+          t.integer "author_id", unsigned: true, null: false
+        end
+
+        add_index "books", ["author_id"], name: "idx_author_id", using: :btree
+
+        execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '#{TEST_SCHEMA}' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+        end
+      RUBY
+    }
+
+    before { subject.diff(dsl_with_execute).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl_with_execute)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE,
+          CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_falsey
+      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+
+      expect(sql.strip).to eq ""
+
+      expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
+        CREATE TABLE `books` (
+          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+          `title` varchar(255) NOT NULL,
+          `author_id` int(10) unsigned NOT NULL,
+          PRIMARY KEY (`id`),
+          KEY `idx_author_id` (`author_id`) USING BTREE,
+          CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      SQL
+    }
+  end
+end

data/spec/migrate/migrate_noop_spec.rb

@@ -75,7 +75,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_truthy
       expect(subject.dump).to eq actual_dsl
 
       sql = sql.each_line.map {|i| i.strip }.join("\n")
@@ -104,7 +105,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_truthy
       expect(subject.dump).to eq actual_dsl
 
       sql = sql.each_line.map {|i| i.strip }.join("\n")
@@ -205,7 +207,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(:noop => true)
+      expect(migrated).to be_truthy
       expect(subject.dump).to eq actual_dsl
 
       sql = sql.each_line.map {|i| i.strip }.join("\n")

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'open3'
 require 'tempfile'
 require 'json'
 
+TEST_SCHEMA = 'ridgepole_test'
+
 ActiveRecord::Migration.verbose = false
 Ridgepole::Logger.instance.level = ::Logger::ERROR
 
@@ -38,10 +40,15 @@ end
 def conn_spec(config = {})
   {
     adapter: 'mysql2',
-    database: 'ridgepole_test',
+    database: TEST_SCHEMA,
   }.merge(config)
 end
 
+def show_create_table(table_name)
+  raw_conn = ActiveRecord::Base.connection.raw_connection
+  raw_conn.query("SHOW CREATE TABLE `#{table_name}`").first[1]
+end
+
 def default_cli_hook
   <<-RUBY.strip_heredoc
     require 'ridgepole'
@@ -51,7 +58,7 @@ def default_cli_hook
       end
       def migrate(*args)
         puts "Ridgepole::Delta#migrate"
-        "create_table :table do\\nend"
+        [#{differ}, "create_table :table do\\nend"]
       end
       def script
         puts "Ridgepole::Delta#script"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8.rc1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,6 +153,7 @@ files:
 - spec/migrate/migrate_duplicate_index_spec.rb
 - spec/migrate/migrate_duplicate_table_spec.rb
 - spec/migrate/migrate_empty_spec.rb
+- spec/migrate/migrate_execute_spec.rb
 - spec/migrate/migrate_merge_mode_spec.rb
 - spec/migrate/migrate_noop_spec.rb
 - spec/migrate/migrate_rename_column_spec.rb
@@ -185,12 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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.
@@ -224,6 +225,7 @@ test_files:
 - spec/migrate/migrate_duplicate_index_spec.rb
 - spec/migrate/migrate_duplicate_table_spec.rb
 - spec/migrate/migrate_empty_spec.rb
+- spec/migrate/migrate_execute_spec.rb
 - spec/migrate/migrate_merge_mode_spec.rb
 - spec/migrate/migrate_noop_spec.rb
 - spec/migrate/migrate_rename_column_spec.rb