ridgepole 0.6.4.beta5 → 0.6.4.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ade1dcbc7f445d902258dd4f800d5753d44c2fc
-  data.tar.gz: 10157b046ddc87eb64d77f6cc19476625ab25f0d
+  metadata.gz: 5656989ac8ac6af8579e4280dd2a62faeebd4251
+  data.tar.gz: 37efd93b1be528a4d2e15dd30e0c28ed52448d11
 SHA512:
-  metadata.gz: 25133d89cc2b7b768c06e9166196df029e16af4eb49afb80f774513ed37a0e5d165dc9e7d3ae7b91d3eca87aed3b93f6d1060c3246899a5a87cf0650051f3c5f
-  data.tar.gz: 4da5e0c7910df14d8873c84d18ceb24cd833a5a5b62c9eda883e0f054d211a567e9e8a7327cb883a3af098f88864ace7477c2a8978068a918b49fabfd41bcb71
+  metadata.gz: 5737d53986f3364fad3e6714055b8b35fa53da440034a9125bd3d3ef8babaa2982933b470b431b98df2c975f2c3359599a3fc64bb00a735987621b290ed39185
+  data.tar.gz: 4117e40778af880a1d74e0193f8d0fb3ec0f51e6e394a4b1e307452205af3346ba5ac70d6fbce514057a70f91e28461921a03ed9fb5f9dc7655668f89fdab154

data/.travis.yml

@@ -13,10 +13,8 @@ script:
   - bundle exec rake
 env:
   matrix:
-    - ENABLE_MYSQL_AWESOME=0 ENABLE_MIGRATION_COMMENTS=0
-    - ENABLE_MYSQL_AWESOME=1 ENABLE_MIGRATION_COMMENTS=0
-    - ENABLE_MYSQL_AWESOME=0 ENABLE_MIGRATION_COMMENTS=1
-    - ENABLE_MYSQL_AWESOME=1 ENABLE_MIGRATION_COMMENTS=1
+    - ENABLE_MYSQL_AWESOME=0
+    - ENABLE_MYSQL_AWESOME=1
     - POSTGRESQL=1
 addons:
   postgresql: "9.4"

data/README.md

@@ -48,6 +48,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add `--alter-extra` option
   * Add `--dump-with-default-fk-name` option
   * Support `t.index` ([pull#64](https://github.com/winebarrel/ridgepole/pull/64))
+  * Remove migration_comments
 
 ## Installation
 

data/bin/ridgepole

@@ -114,7 +114,6 @@ ARGV.options do |opt|
     opt.on('',   '--dump-without-table-options')  {    options[:dump_without_table_options] = true          }
     opt.on('',   '--dump-with-default-fk-name')   {    options[:dumb_with_default_fk_name] = true           }
     opt.on('',   '--index-removed-drop-column')   {    options[:index_removed_drop_column] = true           }
-    opt.on('',   '--enable-migration-comments')   {    options[:enable_migration_comments] = true           }
     opt.on('-r', '--require LIBS', Array)         {|v| v.each {|i| require i }                              }
     opt.on(''  , '--log-file LOG_FILE')           {|v| options[:log_file] = v                               }
     opt.on(''  , '--verbose')                     {    Ridgepole::Logger.verbose = true                     }

data/lib/ridgepole/client.rb

@@ -14,15 +14,7 @@ class Ridgepole::Client
     @parser = Ridgepole::DSLParser.new(@options)
     @diff = Ridgepole::Diff.new(@options)
 
-    if @options[:enable_migration_comments]
-      require 'migration_comments'
-    end
-
     if @options[:enable_mysql_awesome]
-      if @options[:enable_migration_comments]
-        require 'ridgepole/ext/migration_comments'
-      end
-
       require 'activerecord/mysql/awesome/base'
     end
 

data/lib/ridgepole/execute_expander.rb

@@ -5,6 +5,48 @@ class Ridgepole::ExecuteExpander
     end
   end
 
+  module ConnectionAdapterExt
+    def execute(sql, name = nil)
+      if Ridgepole::ExecuteExpander.noop
+        if (callback = Ridgepole::ExecuteExpander.callback)
+          sql = append_alter_extra(sql)
+          callback.call(sql, name)
+        end
+
+        if sql =~ /\A(SELECT|SHOW)\b/i
+          begin
+            super(sql, name)
+          rescue => e
+            Stub.new
+          end
+        else
+          Stub.new
+        end
+      elsif Ridgepole::ExecuteExpander.use_script
+        if sql =~ /\A(SELECT|SHOW)\b/i
+          super(sql, name)
+        else
+          sql = append_alter_extra(sql)
+          Ridgepole::ExecuteExpander.sql_executer.execute(sql)
+          nil
+        end
+      else
+        sql = append_alter_extra(sql)
+        super(sql, name)
+      end
+    end
+
+    private
+
+    def append_alter_extra(sql)
+      if Ridgepole::ExecuteExpander.alter_extra and sql =~ /\AALTER\b/i
+        sql = sql + ',' + Ridgepole::ExecuteExpander.alter_extra
+      end
+
+      sql
+    end
+  end
+
   cattr_accessor :noop,         :instance_writer => false, :instance_reader => false
   cattr_accessor :callback,     :instance_writer => false, :instance_reader => false
   cattr_accessor :use_script,   :instance_writer => false, :instance_reader => false
@@ -44,71 +86,11 @@ class Ridgepole::ExecuteExpander
     end
 
     def expand_execute(connection)
-      return if connection.respond_to?(:execute_with_ext)
-
-      class << connection
-        def execute_with_ext(sql, name = nil)
-          if Ridgepole::ExecuteExpander.noop
-            if (callback = Ridgepole::ExecuteExpander.callback)
-              sql = append_alter_extra(sql)
-              callback.call(sql, name)
-            end
+      return if connection.is_a?(ConnectionAdapterExt)
 
-            if sql =~ /\A(SELECT|SHOW)\b/i
-              begin
-                execute_without_ext(sql, name)
-              rescue => e
-                Stub.new
-              end
-            else
-              Stub.new
-            end
-          elsif Ridgepole::ExecuteExpander.use_script
-            if sql =~ /\A(SELECT|SHOW)\b/i
-              execute_without_ext(sql, name)
-            else
-              sql = append_alter_extra(sql)
-              Ridgepole::ExecuteExpander.sql_executer.execute(sql)
-              nil
-            end
-          else
-            sql = append_alter_extra(sql)
-            execute_without_ext(sql, name)
-          end
-        end
-        alias_method_chain :execute, :ext
-
-        private
-
-        def append_alter_extra(sql)
-          if Ridgepole::ExecuteExpander.alter_extra and sql =~ /\AALTER\b/i
-            sql = sql + ',' + Ridgepole::ExecuteExpander.alter_extra
-          end
-
-          sql
-        end
+      connection.class_eval do
+        prepend ConnectionAdapterExt
       end
     end
   end # of class methods
 end
-
-require 'active_record/connection_adapters/abstract/schema_statements'
-
-module ActiveRecord::ConnectionAdapters::SchemaStatements
-  def index_name_exists_with_noop?(table_name, column_name, options = {})
-    if Ridgepole::ExecuteExpander.noop
-      caller_methods = caller.map {|i| i =~ /:\d+:in `(.+)'/ ? $1 : '' }
-
-      if caller_methods.any? {|i| i =~ /\Aremove_index/ }
-        true
-      elsif caller_methods.any? {|i| i =~ /\Aadd_index/ }
-        false
-      else
-        index_name_exists_without_noop?(table_name, column_name, options)
-      end
-    else
-      index_name_exists_without_noop?(table_name, column_name, options)
-    end
-  end
-  alias_method_chain :index_name_exists?, :noop
-end

data/lib/ridgepole/ext/abstract_mysql_adapter.rb

@@ -1,16 +1,26 @@
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
-class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
-  def add_index_with_alter(table_name, column_name, options = {})
-    index_name, index_type, index_columns, index_options, index_algorithm, index_using = add_index_options(table_name, column_name, options)
+module Ridgepole
+  module Ext
+    module AbstractMysqlAdapter
+      def add_index(table_name, column_name, options = {})
+        index_name, index_type, index_columns, index_options, index_algorithm, index_using = add_index_options(table_name, column_name, options)
 
-    # cannot specify index_algorithm
-    execute "ALTER TABLE #{quote_table_name(table_name)} ADD #{index_type} INDEX #{quote_column_name(index_name)} #{index_using} (#{index_columns})#{index_options}"
+        # cannot specify index_algorithm
+        execute "ALTER TABLE #{quote_table_name(table_name)} ADD #{index_type} INDEX #{quote_column_name(index_name)} #{index_using} (#{index_columns})#{index_options}"
+      end
+
+      def remove_index!(table_name, index_name)
+        execute "ALTER TABLE #{quote_table_name(table_name)} DROP INDEX #{quote_column_name(index_name)}"
+      end
+    end
   end
-  alias_method_chain :add_index, :alter
+end
 
-  def remove_index_with_alter!(table_name, index_name)
-    execute "ALTER TABLE #{quote_table_name(table_name)} DROP INDEX #{quote_column_name(index_name)}"
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter
+      include Ridgepole::Ext::AbstractMysqlAdapter
+    end
   end
-  alias_method_chain :remove_index!, :alter
 end

data/lib/ridgepole/ext/schema_dumper.rb

@@ -1,32 +1,41 @@
 require 'active_record/schema_dumper'
 
-class ActiveRecord::SchemaDumper
-  def foreign_keys_with_default_name(table, stream)
-    if (foreign_keys = @connection.foreign_keys(table)).any?
-      add_foreign_key_statements = foreign_keys.map do |foreign_key|
-        parts = [
-          "add_foreign_key #{remove_prefix_and_suffix(foreign_key.from_table).inspect}",
-          remove_prefix_and_suffix(foreign_key.to_table).inspect,
-        ]
-
-        if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)
-          parts << "column: #{foreign_key.column.inspect}"
-        end
+module Ridgepole
+  module Ext
+    module SchemaDumper
+      def foreign_keys(table, stream)
+        if (foreign_keys = @connection.foreign_keys(table)).any?
+          add_foreign_key_statements = foreign_keys.map do |foreign_key|
+            parts = [
+              "add_foreign_key #{remove_prefix_and_suffix(foreign_key.from_table).inspect}",
+              remove_prefix_and_suffix(foreign_key.to_table).inspect,
+            ]
 
-        if foreign_key.custom_primary_key?
-          parts << "primary_key: #{foreign_key.primary_key.inspect}"
-        end
+            if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)
+              parts << "column: #{foreign_key.column.inspect}"
+            end
 
-        parts << "name: #{foreign_key.name.inspect}"
+            if foreign_key.custom_primary_key?
+              parts << "primary_key: #{foreign_key.primary_key.inspect}"
+            end
 
-        parts << "on_update: #{foreign_key.on_update.inspect}" if foreign_key.on_update
-        parts << "on_delete: #{foreign_key.on_delete.inspect}" if foreign_key.on_delete
+            parts << "name: #{foreign_key.name.inspect}"
 
-        "  #{parts.join(', ')}"
-      end
+            parts << "on_update: #{foreign_key.on_update.inspect}" if foreign_key.on_update
+            parts << "on_delete: #{foreign_key.on_delete.inspect}" if foreign_key.on_delete
 
-      stream.puts add_foreign_key_statements.sort.join("\n")
+            "  #{parts.join(', ')}"
+          end
+
+          stream.puts add_foreign_key_statements.sort.join("\n")
+        end
+      end
     end
   end
-  alias_method_chain :foreign_keys, :default_name
+end
+
+module ActiveRecord
+  class SchemaDumper
+    prepend Ridgepole::Ext::SchemaDumper
+  end
 end

data/lib/ridgepole/migration_ext.rb

@@ -1,58 +1,69 @@
 require 'active_record/migration'
 
-class ActiveRecord::Migration
-  cattr_accessor :time_recorder
-  cattr_accessor :disable_logging
-
-  def write_with_logging(text = '')
-    logger = Ridgepole::Logger.instance
-    logger.info(text) unless self.disable_logging
-    parse_text(text)
-  end
-  alias_method_chain :write, :logging
-
-  def parse_text(text)
-    return unless self.time_recorder
+module Ridgepole
+  module MigrationExt
+    def self.included(klass)
+      klass.class_eval do
+        cattr_accessor :time_recorder
+        cattr_accessor :disable_logging
+      end
+    end
 
-    case text
-    when /\A--\s+(.+)\Z/
-      self.time_recorder.add_key($1)
-    when /\A\s+->\s+(\d+\.\d+)s\Z/
-      self.time_recorder.add_value($1.to_f)
+    def write(text = '')
+      logger = Ridgepole::Logger.instance
+      logger.info(text) unless self.disable_logging
+      parse_text(text)
     end
-  end
 
-  def self.record_time
-    result = nil
+    def parse_text(text)
+      return unless self.time_recorder
 
-    begin
-      self.time_recorder = TimeRecorder.new
-      yield
-      result = self.time_recorder.result
-    ensure
-      self.time_recorder = nil
+      case text
+      when /\A--\s+(.+)\Z/
+        self.time_recorder.add_key($1)
+      when /\A\s+->\s+(\d+\.\d+)s\Z/
+        self.time_recorder.add_value($1.to_f)
+      end
     end
 
-    return result
-  end
+    def self.record_time
+      result = nil
 
-  class TimeRecorder
-    attr_reader :result
+      begin
+        self.time_recorder = TimeRecorder.new
+        yield
+        result = self.time_recorder.result
+      ensure
+        self.time_recorder = nil
+      end
 
-    def initialize
-      @result = {}
+      result
     end
 
-    def add_key(key)
-      @key = key
-    end
+    class TimeRecorder
+      attr_reader :result
+
+      def initialize
+        @result = {}
+      end
 
-    def add_value(value)
-      if @key
-        @result[@key] = value
+      def add_key(key)
+        @key = key
       end
 
-      @key = nil
+      def add_value(value)
+        if @key
+          @result[@key] = value
+        end
+
+        @key = nil
+      end
     end
   end
 end
+
+module ActiveRecord
+  class Migration
+    include Ridgepole::MigrationExt
+  end
+end

data/lib/ridgepole/schema_dumper_ext.rb

@@ -1,10 +1,17 @@
 require 'active_record/schema_dumper'
 
-class ActiveRecord::SchemaDumper
-  def table_with_logging(table, stream)
-    logger = Ridgepole::Logger.instance
-    logger.verbose_info("#   #{table}")
-    table_without_logging(table, stream)
+module Ridgepole
+  module SchemaDumperExt
+    def table(table, stream)
+      logger = Ridgepole::Logger.instance
+      logger.verbose_info("#   #{table}")
+      super
+    end
+  end
+end
+
+module ActiveRecord
+  class SchemaDumper
+    prepend Ridgepole::SchemaDumperExt
   end
-  alias_method_chain :table, :logging
 end

data/lib/ridgepole/schema_statements_ext.rb

@@ -1,9 +1,32 @@
 require 'active_record/connection_adapters/abstract/schema_statements'
 
-module ActiveRecord::ConnectionAdapters::SchemaStatements
-  def rename_table_indexes_with_ignore(table_name, new_name)
-    # Nothing to do
+module Ridgepole
+  module SchemaStatementsExt
+    def index_name_exists?(table_name, column_name, options = {})
+      if Ridgepole::ExecuteExpander.noop
+        caller_methods = caller.map {|i| i =~ /:\d+:in `(.+)'/ ? $1 : '' }
+        if caller_methods.any? {|i| i =~ /\Aremove_index/ }
+          true
+        elsif caller_methods.any? {|i| i =~ /\Aadd_index/ }
+          false
+        else
+          super
+        end
+      else
+        super
+      end
+    end
+
+    def rename_table_indexes(table_name, new_name)
+      # Nothing to do
+    end
   end
+end
 
-  alias_method_chain :rename_table_indexes, :ignore
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractAdapter
+      include Ridgepole::SchemaStatementsExt
+    end
+  end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.4.beta5'
+  VERSION = '0.6.4.beta6'
 end

data/ridgepole.gemspec

@@ -26,5 +26,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'activerecord-mysql-awesome', '>= 0.0.7'
-  spec.add_development_dependency 'migration_comments'
 end

data/spec/mysql/cli/ridgepole_spec.rb

@@ -42,7 +42,6 @@ describe 'ridgepole' do
             --dump-without-table-options
             --dump-with-default-fk-name
             --index-removed-drop-column
-            --enable-migration-comments
         -r, --require LIBS
             --log-file LOG_FILE
             --verbose

data/spec/spec_helper.rb

@@ -210,10 +210,6 @@ def mysql_awesome_enabled?
   ENV['ENABLE_MYSQL_AWESOME'] == '1'
 end
 
-def migration_comments_enabled?
-  ENV['ENABLE_MIGRATION_COMMENTS'] == '1'
-end
-
 def postgresql?
   ENV['POSTGRESQL'] == '1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.4.beta5
+  version: 0.6.4.beta6
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,128 +14,114 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   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:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-mysql-awesome
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
-- !ruby/object:Gem::Dependency
-  name: migration_comments
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email:
@@ -145,9 +131,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -163,7 +149,6 @@ files:
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
 - lib/ridgepole/ext/abstract_mysql_adapter.rb
-- lib/ridgepole/ext/migration_comments.rb
 - lib/ridgepole/ext/schema_dumper.rb
 - lib/ridgepole/external_sql_executer.rb
 - lib/ridgepole/logger.rb
@@ -172,8 +157,6 @@ files:
 - lib/ridgepole/schema_statements_ext.rb
 - lib/ridgepole/version.rb
 - ridgepole.gemspec
-- spec/mysql/0_comment/comment_mysql_awesome_spec.rb
-- spec/mysql/0_comment/comment_spec.rb
 - spec/mysql/bigint_pk/bigint_pkspec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
@@ -275,23 +258,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files:
-- spec/mysql/0_comment/comment_mysql_awesome_spec.rb
-- spec/mysql/0_comment/comment_spec.rb
 - spec/mysql/bigint_pk/bigint_pkspec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb

data/lib/ridgepole/ext/migration_comments.rb

@@ -1,37 +0,0 @@
-require 'migration_comments/active_record/schema_dumper'
-
-module MigrationComments::ActiveRecord
-  module SchemaDumper
-    def append_comments(table, stream)
-      table_name = table.inspect.gsub('"', '')
-      column_comments = @connection.retrieve_column_comments(table_name)
-      comment_stream = StringIO.new
-      lines = []
-      col_names = {}
-
-      while (line = stream.gets)
-        content = line.chomp
-
-        if content =~ /t\.\w+\s+"(\w+)"/
-          col_names[lines.size] = $1.to_sym
-        end
-
-        lines << content
-      end
-
-      len = col_names.keys.map{|index| lines[index]}.map(&:length).max + 2 unless col_names.empty?
-
-      lines.each_with_index do |line, index|
-        if col_names[index]
-          comment = column_comments[col_names[index]]
-          line << ' ' * (len - line.length) << "# #{comment}" unless comment.blank?
-        end
-
-        comment_stream.puts line
-      end
-
-      comment_stream.rewind
-      comment_stream
-    end
-  end
-end

data/spec/mysql/0_comment/comment_mysql_awesome_spec.rb

@@ -1,45 +0,0 @@
-unless postgresql?
-if migration_comments_enabled?
-if mysql_awesome_enabled?
-describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when change column (add comment)' do
-    let(:dsl) {
-      <<-RUBY
-        create_table "employee_clubs", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='テーブルコメント'" do |t|
-          t.integer "emp_no",  limit: 4,     null: false, unsigned: true
-          t.integer "club_id", limit: 4,     null: false
-          t.string  "string",  limit: 255,   null: false,                 collation: "utf8mb4_bin"  # カラムコメント
-          t.text    "text",    limit: 65535, null: false
-        end
-      RUBY
-    }
-
-    before do
-      subject.diff('').migrate
-
-      ActiveRecord::Base.connection.raw_connection.query(<<-EOS)
-        CREATE TABLE `employee_clubs` (
-          `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-          `emp_no` int(11) unsigned NOT NULL ,
-          `club_id` int(11) NOT NULL ,
-          `string` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'カラムコメント',
-          `text` text NOT NULL,
-          PRIMARY KEY (`id`)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='テーブルコメント';
-      EOS
-    end
-
-    subject do
-      client(enable_migration_comments: true, dump_without_table_options: false)
-    end
-
-    it {
-      delta = subject.diff(dsl)
-      expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq dsl.strip_heredoc.strip
-    }
-  end
-end
-end
-end
-end

data/spec/mysql/0_comment/comment_spec.rb

@@ -1,183 +0,0 @@
-unless postgresql?
-if migration_comments_enabled?
-unless mysql_awesome_enabled?
-describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when change column (add comment)' do
-    let(:actual_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false
-          t.string  "string",  limit: 255,   null: false
-          t.text    "text",    limit: 65535, null: false
-        end
-      RUBY
-    }
-
-    let(:expected_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false, comment: "any comment"
-          t.integer "club_id", limit: 4,     null: false, comment: "any comment2"
-          t.string  "string",  limit: 255,   null: false, comment: "any comment3"
-          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
-        end
-      RUBY
-    }
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(enable_migration_comments: true) }
-
-    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
-    }
-  end
-
-  context 'when change column (delete comment)' do
-    let(:actual_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false, comment: "any comment"
-          t.integer "club_id", limit: 4,     null: false, comment: "any comment2"
-          t.string  "string",  limit: 255,   null: false, comment: "any comment3"
-          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
-        end
-      RUBY
-    }
-
-    let(:expected_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false
-          t.string  "string",  limit: 255,   null: false
-          t.text    "text",    limit: 65535, null: false
-        end
-      RUBY
-    }
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(enable_migration_comments: true) }
-
-    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
-    }
-  end
-
-  context 'when change column (change comment)' do
-    let(:actual_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false, comment: "any comment"
-          t.integer "club_id", limit: 4,     null: false, comment: "any comment2"
-          t.string  "string",  limit: 255,   null: false, comment: "any comment3"
-          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
-        end
-      RUBY
-    }
-
-    let(:expected_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false, comment: "other comment"
-          t.integer "club_id", limit: 4,     null: false, comment: "other comment2"
-          t.string  "string",  limit: 255,   null: false, comment: "other comment3"
-          t.text    "text",    limit: 65535, null: false, comment: "other comment4"
-        end
-      RUBY
-    }
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(enable_migration_comments: true) }
-
-    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
-    }
-  end
-
-  context 'when change column (no change comment)' do
-    let(:actual_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false, comment: "any comment"
-          t.integer "club_id", limit: 4,     null: false, comment: "any comment2"
-          t.string  "string",  limit: 255,   null: false, comment: "any comment3"
-          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
-        end
-      RUBY
-    }
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(enable_migration_comments: true) }
-
-    it {
-      delta = subject.diff(actual_dsl)
-      expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-      delta.migrate
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-    }
-  end
-
-  context 'when create table (with comment)' do
-    let(:expected_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade, comment: "table comment" do |t|
-          t.integer "emp_no",  limit: 4,     null: false, comment: "other comment"
-          t.integer "club_id", limit: 4,     null: false, comment: "other comment2"
-          t.string  "string",  limit: 255,   null: false, comment: "other comment3"
-          t.text    "text",    limit: 65535, null: false, comment: "other comment4"
-        end
-      RUBY
-    }
-
-    subject { client(enable_migration_comments: true) }
-
-    it {
-      delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_truthy
-      expect(subject.dump.strip).to be_empty
-      delta.migrate
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
-    }
-  end
-
-  context 'when drop table (with comment)' do
-    let(:actual_dsl) {
-      <<-RUBY
-        create_table "employee_clubs", force: :cascade, comment: "table comment" do |t|
-          t.integer "emp_no",  limit: 4,     null: false, comment: "other comment"
-          t.integer "club_id", limit: 4,     null: false, comment: "other comment2"
-          t.string  "string",  limit: 255,   null: false, comment: "other comment3"
-          t.text    "text",    limit: 65535, null: false, comment: "other comment4"
-        end
-      RUBY
-    }
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(enable_migration_comments: true) }
-
-    it {
-      delta = subject.diff('')
-      expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-      delta.migrate
-      expect(subject.dump).to be_empty
-    }
-  end
-end
-end
-end
-end