ridgepole 0.9.0.beta → 0.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df81adabc9afddf2d409c647190e217dd71a3948b8d3b9c3753f36c8519df701
-  data.tar.gz: 3df1478fbdaa3ef5ac2ac192cf1a022901753f1f4adac72f20b93f17b49dcb2d
+  metadata.gz: 10f8b6443da2ed263c957eb68325c4fa6d96ff3e5b0b8b0c32970c39a70e7fdb
+  data.tar.gz: f46637323aee71ad24e87c0fed171ecdf96903a0f43bb20aea270db5e454b609
 SHA512:
-  metadata.gz: ae3fa69120a6ba5103f512092694abd151073ae3e7ed27c23677aa9f617b4a986565c29e6088fbb0f4ae1a0da0cfc425b5c67c8e8b1b19b956164dd8c7fcdf87
-  data.tar.gz: bce34561a3ac8489bbc3466e7d63fd0c4c4a557659e28751bfc06fe3f058d3725493c34426cab2a1171ea86e1e35d4fdde8be3b1e31186599a73748a3a2563a3
+  metadata.gz: dbf4ef4b329627688da0d8ae61e3190ab3773c4b6b9e3d46b55b481db5ece42fcba73395f2f2b4980430930479fea27ce039c51892e981b2cf7e55276e36dbac
+  data.tar.gz: 9d4dd03ace90b791ffd33924204cb785491569a859227db9bd0e18f186e27b716f325663249625bba378608a0e3c3fadedbeb306e9cf03634af19adf010db491

data/.github/workflows/test.yml

@@ -60,6 +60,24 @@ jobs:
         env:
           BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
-      - run: ${{ matrix.env }} bundle exec rake
+      - name: Run tests
+        run: ${{ matrix.env }} bundle exec rake
         env:
           BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@v1.1.2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: run-${{ matrix.ruby }}-${{ matrix.env }}-${{ matrix.gemfile }}
+          parallel: true
+
+  finish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@v1.1.2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

data/.simplecov

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+SimpleCov.start do
+  # exclude directories and files
+  add_filter '/spec/'
+end

data/README.md

@@ -6,8 +6,9 @@ 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)
+[![Unstable Version](https://img.shields.io/badge/unstable-0.9.0.beta-brightgreen.svg?longCache=true&style=flat)](https://rubygems.org/gems/ridgepole/versions/0.9.0.beta)
 [![Build Status](https://github.com/winebarrel/ridgepole/workflows/test/badge.svg?branch=0.9)](https://github.com/winebarrel/ridgepole/actions)
-[![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.9)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.8)
+[![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.9)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.9)
 
 <details><summary>ChangeLog</summary>
 
@@ -131,8 +132,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Remove `--mysql-alter-index` option ([pull#330](https://github.com/winebarrel/ridgepole/pull/330))
   * Add `--table-hash-options` option ([pull#331](https://github.com/winebarrel/ridgepole/pull/331))
   * Support Rails 6.1 ([pull#323](https://github.com/winebarrel/ridgepole/pull/323))
-  * Disable Rails 5.0 support([pull#335](https://github.com/winebarrel/ridgepole/pull/335))
-  * Fix PK AUTO_INCREMENT change bug([pull#334](https://github.com/winebarrel/ridgepole/pull/334))
+  * Disable Rails 5.0 support ([pull#335](https://github.com/winebarrel/ridgepole/pull/335))
+  * Fix PK AUTO_INCREMENT change bug ([pull#334](https://github.com/winebarrel/ridgepole/pull/334))
 </details>
 
 **Notice**
@@ -157,26 +158,6 @@ Or install it yourself as:
 
     $ gem install ridgepole
 
-## Omnibus Package (deb/rpm)
-
-see https://github.com/winebarrel/ridgepole/releases.
-
-### Install from deb
-
-```sh
-sudo dpkg -i ridgepole_x.x.x+xxx-x_amd64.deb
-sudo apt install build-essential libmysqlclient-dev
-sudo /opt/ridgepole/embedded/bin/gem install mysql2
-```
-
-### Install from rpm
-
-```sh
-sudo yum install ridgepole-x.x.x+xxx-x.el7.x86_64.rpm
-sudo yum install make gcc mariadb-devel
-sudo /opt/ridgepole/embedded/bin/gem install mysql2
-```
-
 ## Help
 ```
 Usage: ridgepole [options]
@@ -466,6 +447,3 @@ bundle exec appraisal activerecord-5.1 rake
 * https://github.com/winebarrel/ridgepole-example
   * https://github.com/winebarrel/ridgepole-example/pull/1
   * https://github.com/winebarrel/ridgepole-example/pull/2
-
-## Similar tools
-* [Codenize.tools](http://codenize.tools/)

data/bin/ridgepole

@@ -147,8 +147,6 @@ ARGV.options do |opt|
     opt.on('',   '--create-table-with-index') { options[:create_table_with_index] = true }
 
     opt.on('',   '--mysql-dump-auto-increment') do
-      raise OptionParser::InvalidOption, '`mysql-dump-auto-increment` is not available in `activerecord < 5.1`' if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('5.1')
-
       options[:mysql_dump_auto_increment] = true
     end
 

data/lib/ridgepole/diff.rb

@@ -159,7 +159,7 @@ module Ridgepole
         to.delete(:collation)
       end
 
-      pk_attrs = build_primary_key_attrs_if_changed(from, to, table_name)
+      pk_attrs = build_primary_key_attrs_if_changed(from, to)
       if pk_attrs
         if @options[:allow_pk_change]
           if from[:id] == false
@@ -207,20 +207,20 @@ module Ridgepole
       { type: type, options: options }
     end
 
-    def build_attrs_if_changed(to_attrs, from_attrs, table_name, primary_key: false)
+    def build_attrs_if_changed(to_attrs, from_attrs, primary_key: false)
       normalize_column_options!(from_attrs, primary_key)
       normalize_column_options!(to_attrs, primary_key)
 
-      new_to_attrs = fix_change_column_options(table_name, from_attrs, to_attrs) unless compare_column_attrs(from_attrs, to_attrs)
+      new_to_attrs = fix_change_column_options(from_attrs, to_attrs) unless compare_column_attrs(from_attrs, to_attrs)
       new_to_attrs
     end
 
-    def build_primary_key_attrs_if_changed(from, to, table_name)
+    def build_primary_key_attrs_if_changed(from, to)
       from_column_attrs = convert_to_primary_key_attrs(from.slice(*PRIMARY_KEY_OPTIONS))
       to_column_attrs = convert_to_primary_key_attrs(to.slice(*PRIMARY_KEY_OPTIONS))
       return if from_column_attrs == to_column_attrs
 
-      build_attrs_if_changed(to_column_attrs, from_column_attrs, table_name, primary_key: true)
+      build_attrs_if_changed(to_column_attrs, from_column_attrs, primary_key: true)
     end
 
     def scan_definition_change(from, to, from_indices, table_name, table_options, table_delta)
@@ -242,7 +242,7 @@ module Ridgepole
         next if ignore_column
 
         if from_attrs
-          to_attrs = build_attrs_if_changed(to_attrs, from_attrs, table_name)
+          to_attrs = build_attrs_if_changed(to_attrs, from_attrs)
           if to_attrs
             definition_delta[:change] ||= {}
             definition_delta[:change][column_name] = to_attrs
@@ -471,7 +471,7 @@ module Ridgepole
     # XXX: MySQL only?
     # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L760
     # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb#L102
-    def fix_change_column_options(table_name, from_attrs, to_attrs)
+    def fix_change_column_options(from_attrs, to_attrs)
       # default: 0, null: false -> default: nil, null: false | default: nil
       # default: 0, null: false ->               null: false | default: nil
       # default: 0, null: false -> default: nil, null: true  | default: nil, null: true
@@ -486,10 +486,6 @@ module Ridgepole
         to_attrs[:options].delete(:null)
       end
 
-      if Ridgepole::ConnectionAdapters.mysql? && ActiveRecord::VERSION::STRING.start_with?('5.0.')
-        Ridgepole::Logger.instance.warn("[WARNING] Table `#{table_name}`: `default: nil` is ignored when `null: false`. Please apply twice") if to_attrs[:options][:default].nil? && (to_attrs[:options][:null] == false)
-      end
-
       to_attrs
     end
 

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -20,7 +20,7 @@ module Ridgepole
         }
       end
 
-      DEFAULT_PRIMARY_KEY_TYPE = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.1') ? :bigint : :integer
+      DEFAULT_PRIMARY_KEY_TYPE = :bigint
 
       TYPES = {
         # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.9.0.beta'
+  VERSION = '0.9.0.rc1'
 end

data/ridgepole.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'appraisal', '>= 2.2.0'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'erbh', '>= 0.1.2'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
   spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
@@ -39,4 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '>= 1.7.0'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-lcov'
 end

data/spec/erb_helper.rb

@@ -14,11 +14,7 @@ ERBh.define_method(:i) do |obj|
 end
 
 ERBh.define_method(:cond) do |conds, m, e = nil|
-  if conds.is_a?(Hash)
-    conds.find do |c, _|
-      condition(c)
-    end&.last || m
-  elsif condition(conds)
+  if condition(conds)
     m
   else
     e || (begin

data/spec/mysql/bigint_pk/int_pk_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Ridgepole::Client (with integer pk)', condition: '>= 5.1.0' do
+describe 'Ridgepole::Client (with integer pk)' do
   context 'when with id:integer' do
     let(:dsl) do
       <<-RUBY

data/spec/mysql/collation/collation_spec.rb

@@ -4,22 +4,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (add collation)' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond({ ">= 5.1, < 6.1" => { id: :bigint, unsigned: true }, ">= 6.1" => { id: { type: :bigint, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond("< 6.1", { id: :bigint, unsigned: true }, { id: { type: :bigint, unsigned: true } }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false
+          t.text    "text", null: false
         end
       ERB
     end
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond({ ">= 5.1, < 6.1" => { id: :bigint, unsigned: true }, ">= 6.1" => { id: { type: :bigint, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond("< 6.1", { id: :bigint, unsigned: true }, { id: { type: :bigint, unsigned: true } }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
+          t.text    "text", null: false, collation: "utf8mb4_bin"
         end
       ERB
     end
@@ -39,22 +39,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (delete collation)' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond({ ">= 5.1, < 6.1" => { id: :bigint, unsigned: true }, ">= 6.1" => { id: { type: :bigint, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond("< 6.1", { id: :bigint, unsigned: true }, { id: { type: :bigint, unsigned: true } }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
+          t.text    "text", null: false, collation: "utf8mb4_bin"
         end
       ERB
     end
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond({ ">= 5.1, < 6.1" => { id: :bigint, unsigned: true }, ">= 6.1" => { id: { type: :bigint, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond("< 6.1", { id: :bigint, unsigned: true }, { id: { type: :bigint, unsigned: true } }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false
+          t.text    "text", null: false
         end
       ERB
     end
@@ -74,22 +74,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (change collation)' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond({ ">= 5.1, < 6.1" => { id: :bigint, unsigned: true }, ">= 6.1" => { id: { type: :bigint, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond("< 6.1", { id: :bigint, unsigned: true }, { id: { type: :bigint, unsigned: true } }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
+          t.text    "text", null: false, collation: "utf8mb4_bin"
         end
       ERB
     end
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond({ ">= 5.1, < 6.1" => { id: :bigint, unsigned: true }, ">= 6.1" => { id: { type: :bigint, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond("< 6.1", { id: :bigint, unsigned: true }, { id: { type: :bigint, unsigned: true } }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "utf8mb4_bin"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "ascii_bin"
+          t.text    "text", null: false, collation: "ascii_bin"
         end
       ERB
     end
@@ -109,11 +109,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (no change collation)' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond({ ">= 5.1, < 6.1" => { id: :bigint, unsigned: true }, ">= 6.1" => { id: { type: :bigint, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond("< 6.1", { id: :bigint, unsigned: true }, { id: { type: :bigint, unsigned: true } }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
+          t.text    "text", null: false, collation: "utf8mb4_bin"
         end
       ERB
     end

data/spec/mysql/comment/comment_spec.rb

@@ -8,7 +8,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
           t.string  "string", null: false
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false
+          t.text    "text", null: false
         end
       ERB
     end
@@ -19,7 +19,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false, comment: "any comment"
           t.integer "club_id", null: false, comment: "any comment2"
           t.string  "string", null: false, comment: "any comment3"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
+          t.text    "text", null: false, comment: "any comment4"
         end
       ERB
     end
@@ -43,7 +43,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false, comment: "any comment"
           t.integer "club_id", null: false, comment: "any comment2"
           t.string  "string", null: false, comment: "any comment3"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
+          t.text    "text", null: false, comment: "any comment4"
         end
       ERB
     end
@@ -54,7 +54,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
           t.string  "string", null: false
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false
+          t.text    "text", null: false
         end
       ERB
     end
@@ -78,7 +78,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false, comment: "any comment"
           t.integer "club_id", null: false, comment: "any comment2"
           t.string  "string", null: false, comment: "any comment3"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
+          t.text    "text", null: false, comment: "any comment4"
         end
       ERB
     end
@@ -89,7 +89,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false, comment: "other comment"
           t.integer "club_id", null: false, comment: "other comment2"
           t.string  "string", null: false, comment: "other comment3"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "other comment4"
+          t.text    "text", null: false, comment: "other comment4"
         end
       ERB
     end
@@ -113,7 +113,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false, comment: "any comment"
           t.integer "club_id", null: false, comment: "any comment2"
           t.string  "string", null: false, comment: "any comment3"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
+          t.text    "text", null: false, comment: "any comment4"
         end
       ERB
     end
@@ -137,7 +137,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false, comment: "other comment"
           t.integer "club_id", null: false, comment: "other comment2"
           t.string  "string", null: false, comment: "other comment3"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "other comment4"
+          t.text    "text", null: false, comment: "other comment4"
         end
       ERB
     end
@@ -160,7 +160,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false, comment: "other comment"
           t.integer "club_id", null: false, comment: "other comment2"
           t.string  "string", null: false, comment: "other comment3"
-          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "other comment4"
+          t.text    "text", null: false, comment: "other comment4"
         end
       ERB
     end

data/spec/mysql/diff/diff2_spec.rb

@@ -174,12 +174,12 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_ruby erbh(<<-ERB)
-        change_column("employee_clubs", "club_id", :integer, **<%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
+      expect(delta.script).to match_ruby(<<-RUBY)
+        change_column("employee_clubs", "club_id", :integer, **{:unsigned=>false, :null=>true, :default=>nil, :comment=>nil})
 
-        change_column("employees", "last_name", :string, **<%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
-        change_column("employees", "gender", :string, **<%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
-      ERB
+        change_column("employees", "last_name", :string, **{:limit=>20, :default=>"XXX", :unsigned=>false, :comment=>nil})
+        change_column("employees", "gender", :string, **{:limit=>2, :null=>false, :default=>nil, :unsigned=>false, :comment=>nil})
+      RUBY
     }
 
     after do

data/spec/mysql/diff/diff_spec.rb

@@ -149,10 +149,10 @@ describe 'Ridgepole::Client.diff' do
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_ruby erbh(<<-ERB)
-        change_column("employee_clubs", "club_id", :integer, **<%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
+        change_column("employee_clubs", "club_id", :integer, **{:unsigned=>false, :null=>true, :default=>nil, :comment=>nil})
 
-        change_column("employees", "last_name", :string, **<%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
-        change_column("employees", "gender", :string, **<%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
+        change_column("employees", "last_name", :string, **{:limit=>20, :default=>"XXX", :unsigned=>false, :comment=>nil})
+        change_column("employees", "gender", :string, **{:limit=>2, :null=>false, :default=>nil, :unsigned=>false, :comment=>nil})
       ERB
     }
   end

data/spec/mysql/dump/dump_class_method_spec.rb

@@ -7,14 +7,14 @@ describe 'Ridgepole::Client.dump' do
 
     it {
       expect(subject.dump(conn_spec, dump_without_table_options: true)).to match_fuzzy erbh(<<-ERB)
-        create_table "clubs", <%= i cond({ '>= 5.1, < 6.1' => { id: :integer, unsigned: true }, ">= 6.1" => { id: { type: :integer, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "clubs", <%= i cond('< 6.1', { id: :integer, unsigned: true }, { id: { type: :integer, unsigned: true } }) %>, force: :cascade do |t|
           t.string "name", default: "", null: false
-          t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
+          t.index ["name"], name: "idx_name", unique: true
         end
 
         create_table "departments", primary_key: "dept_no", <%= i cond(">= 6.1", { id: { type: :string, limit: 4 } }, { id: :string, limit: 4 }) %>, force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
-          t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_name"], name: "dept_name", unique: true
         end
 
         create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -22,8 +22,8 @@ describe 'Ridgepole::Client.dump' do
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "dept_no"
+          t.index ["emp_no"], name: "emp_no"
         end
 
         create_table "dept_manager", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -31,17 +31,17 @@ describe 'Ridgepole::Client.dump' do
           t.integer "emp_no", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "dept_no"
+          t.index ["emp_no"], name: "emp_no"
         end
 
-        create_table "employee_clubs", <%= i cond({ '>= 5.1, < 6.1' => { id: :integer, unsigned: true }, ">= 6.1" => { id: { type: :integer, unsigned: true }} }, { unsigned: true }) %>, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('< 6.1', { id: :integer, unsigned: true }, { id: { type: :integer, unsigned: true }}) %>, force: :cascade do |t|
           t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
-          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id"
         end
 
-        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1', default: nil) %>, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, default: nil, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
@@ -58,7 +58,7 @@ describe 'Ridgepole::Client.dump' do
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no"
         end
 
         create_table "titles", primary_key: ["emp_no", "title", "from_date"], force: :cascade do |t|
@@ -66,7 +66,7 @@ describe 'Ridgepole::Client.dump' do
           t.string  "title", limit: 50, null: false
           t.date    "from_date", null: false
           t.date    "to_date"
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no"
         end
       ERB
     }