ridgepole 0.8.13 → 0.9.0.beta

data/spec/mysql/collation/collation_spec.rb

@@ -4,7 +4,7 @@ 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', id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -15,7 +15,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -39,7 +39,7 @@ 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', id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -74,7 +74,7 @@ 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', id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -85,7 +85,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "utf8mb4_bin"
@@ -109,7 +109,7 @@ 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', id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"

data/spec/mysql/dump/dump_class_method_spec.rb

@@ -7,12 +7,12 @@ 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', id: :integer) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "departments", primary_key: "dept_no", id: :string, limit: 4, force: :cascade do |t|
+        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) %>
         end
@@ -35,7 +35,7 @@ describe 'Ridgepole::Client.dump' do
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond('>= 5.1', id: :integer) %>, unsigned: true, force: :cascade do |t|
+        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|
           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) %>

data/spec/mysql/dump/dump_spec.rb

@@ -7,12 +7,12 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to match_fuzzy erbh(<<-ERB)
-        create_table "clubs", <%= i cond('>= 5.1',id: :integer) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "departments", primary_key: "dept_no", id: :string, limit: 4, force: :cascade do |t|
+        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) %>
         end
@@ -35,7 +35,7 @@ describe 'Ridgepole::Client#dump' do
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond('>= 5.1',id: :integer) %>, unsigned: true, force: :cascade do |t|
+        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|
           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) %>

data/spec/mysql/dump/dump_unknown_column_type_spec.rb

@@ -7,7 +7,7 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to match_fuzzy erbh(<<-ERB)
-        create_table "clubs", <%= i cond('>= 5.1',id: :integer) %>, unsigned: true, force: :cascade do |t|
+        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|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end

data/spec/mysql/dump/dump_without_table_options_spec.rb

@@ -3,7 +3,7 @@
 describe 'Ridgepole::Client#dump' do
   let(:actual_dsl) do
     erbh(<<-'ERB')
-      create_table "books", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='\"london\" bridge \"is\" falling \"down\"'" do |t|
+      create_table "books", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='\"london\" bridge \"is\" falling \"down\"'" do |t|
         t.string   "title", null: false
         t.integer  "author_id", null: false
         t.datetime "created_at"
@@ -15,7 +15,7 @@ describe 'Ridgepole::Client#dump' do
   context 'when without table options' do
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "books", <%= i cond('>= 5.1',id: :bigint) %>, unsigned: true, force: :cascade, comment: "\\"london\\" bridge \\"is\\" falling \\"down\\"" do |t|
+        create_table "books", <%= i cond({ '>= 6.1' => { id: { type: :bigint, unsigned: true } }, '> 5.1, < 6.1' => { id: :bigint, unsigned: true } }, { unsigned: true }) %>, force: :cascade, comment: "\\"london\\" bridge \\"is\\" falling \\"down\\"" do |t|
           t.string   "title", null: false
           t.integer  "author_id", null: false
           t.datetime "created_at"

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -195,10 +195,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk with first key of multiple column indexes for its column' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
         end
 
-        create_table "child", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        create_table "child", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
           t.integer "parent_id"
           t.string "name"
           t.index ["parent_id", "name"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -220,10 +220,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk on the primary key' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        create_table "users", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
         end
 
-        create_table "icons", primary_key: "user_id", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        create_table "icons", primary_key: "user_id", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
         end
         add_foreign_key "icons", "users", name: "fk_icons_users"
       ERB
@@ -243,13 +243,13 @@ end
 context 'when create fk on the first primary key' do
   let(:dsl) do
     erbh(<<-ERB)
-      create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
       end
 
-      create_table "employee", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      create_table "employee", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
       end
 
-      create_table "icons", primary_key: ["user_id", "employee_id"], force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      create_table "icons", primary_key: ["user_id", "employee_id"], force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
         t.integer "user_id", null: false
         t.integer "employee_id", null: false
       end

data/spec/mysql/migrate/migrate_add_column_with_alter_extra_spec.rb

@@ -140,4 +140,92 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
+
+  context 'when add index' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", 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
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", 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
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+          t.index  ["first_name"], name: "idx_first_name", <%= i cond(5.0, using: :btree) %>
+        end
+      ERB
+    end
+
+    let(:alter_extra) { 'LOCK=DEFAULT, ALGORITHM=DEFAULT' }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      migrated, sql = delta.migrate(alter_extra: alter_extra, noop: true)
+      expect(migrated).to be_truthy
+      expect(sql).to match_fuzzy erbh(<<-SQL)
+        CREATE  INDEX `idx_first_name` <%= cond('5.0', 'USING btree') %> ON `employees` (`first_name`)  LOCK=DEFAULT  ALGORITHM=DEFAULT
+      SQL
+      delta.migrate(alter_extra: alter_extra)
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+
+  context 'when drop index' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", 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
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+          t.index  ["first_name"], name: "idx_first_name", <%= i cond(5.0, using: :btree) %>
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", 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
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+        end
+      ERB
+    end
+
+    let(:alter_extra) { 'LOCK=DEFAULT, ALGORITHM=DEFAULT' }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      migrated, sql = delta.migrate(alter_extra: alter_extra, noop: true)
+      expect(migrated).to be_truthy
+      expect(sql).to eq 'DROP INDEX `idx_first_name` ON `employees` LOCK=DEFAULT  ALGORITHM=DEFAULT'
+      delta.migrate(alter_extra: alter_extra)
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
 end

data/spec/mysql/migrate/migrate_change_column8_spec.rb

@@ -2,14 +2,16 @@
 
 describe 'Ridgepole::Client#diff -> migrate' do
   before { subject.diff(actual_dsl).migrate }
-  subject { client(table_options: table_options, dump_without_table_options: dump_without_table_options) }
+  subject { client(table_options: table_options, table_hash_options: table_hash_options, dump_without_table_options: dump_without_table_options) }
 
   let(:warning_regexp) { /Table option changes are ignored/ }
   let(:dump_without_table_options) { false }
+  let(:table_options) { nil }
+  let(:table_hash_options) { {} }
 
   let(:actual_dsl) do
     erbh(<<-ERB)
-      create_table "employees", primary_key: "emp_no", force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+      create_table "employees", primary_key: "emp_no", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' }) %> do |t|
       end
     ERB
   end
@@ -21,7 +23,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     ERB
   end
 
-  context 'when change options (no change)' do
+  context 'when change options (no change)', condition: '< 6.1' do
     let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8' }
 
     it {
@@ -31,7 +33,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
-  context 'when change options (change)' do
+  context 'when change options (change)', condition: '< 6.1' do
     let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4' }
 
     it {
@@ -41,7 +43,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
-  context 'when dump_without_table_options => true' do
+  context 'when dump_without_table_options => true', condition: '< 6.1' do
     let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4' }
     let(:dump_without_table_options) { true }
 
@@ -51,4 +53,35 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_falsey
     }
   end
+
+  context 'when change options (no change)', condition: '>= 6.1' do
+    let(:table_hash_options) { { charset: 'utf8' } }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn).with(warning_regexp)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change options (change)', condition: '>= 6.1' do
+    let(:table_hash_options) { { charset: 'utf8mb4' } }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(warning_regexp)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when dump_without_table_options => true', condition: '>= 6.1' do
+    let(:table_hash_options) { { charset: 'utf8mb4' } }
+    let(:dump_without_table_options) { true }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
 end

data/spec/mysql/migrate/migrate_change_index_spec.rb

@@ -219,11 +219,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index(["from_date"], **{:name=>"emp_no", :using=>:btree, :unique=>false})
         end
       RUBY
+    }
+
+    # duplicated index checker is deleted in 6.1
+    # https://github.com/rails/rails/commit/edb23791d2ee9df89c5a4f24d72940ff8eaec8fc#diff-5a1c923abf3a794dbc133959167f794b2479ea8bcd0b1deda7766c22f05e8dfeL1198
+    it 'detects duplicated index', condition: '< 6.1' do
+      delta = client(bulk_change: true).diff(expected_dsl)
 
       # XXX: Can not add an index of the same name
       expect do
         delta.migrate
       end.to raise_error(/Index name 'emp_no' on table 'dept_emp' already exists/)
-    }
+    end
   end
 end

data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb

@@ -68,7 +68,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false
@@ -88,7 +88,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false
@@ -179,7 +179,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false
@@ -199,7 +199,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false

data/spec/mysql/migrate/migrate_primary_key_spec.rb

@@ -3,7 +3,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   let(:actual_dsl) do
     erbh(<<-ERB)
-      create_table "employees", id: :integer, unsigned: true, force: :cascade do |t|
+      create_table "employees", <%= i cond(">= 6.1", { id: { type: :integer, unsigned: true } }, { id: :integer, unsigned: true }) %>, force: :cascade do |t|
       end
     ERB
   end
@@ -23,11 +23,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       end
 
       it {
-        expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
+        expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(<<-ERB))
 [WARNING] Primary key definition of `employees` differ but `allow_pk_change` option is false
-  from: {:id=>:integer, :unsigned=>true}
+  from: <%= i cond(">= 6.1", "{:id=>{:type=>:integer, :unsigned=>true}}", "{:id=>:integer, :unsigned=>true}") %>
     to: {:id=>:bigint, :unsigned=>true}
-        MSG
+        ERB
 
         delta = subject.diff(expected_dsl)
         expect(delta.differ?).to be_falsey
@@ -58,7 +58,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:allow_pk_change) { true }
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
         end
 
         create_table "salaries", force: :cascade do |t|
@@ -76,4 +76,29 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
+
+  context 'when deafult: nil' do
+    let(:allow_pk_change) { true }
+
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "foo", id: :integer, unsigned: true, default: nil, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "foo", id: :integer, default: nil, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
 end