ridgepole 0.8.13 → 0.9.2

data/spec/mysql/migrate/migrate_ignore_column_spec.rb

@@ -7,7 +7,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          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", force: :cascade do |t|
@@ -26,7 +26,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
           t.string  "any_col", null: false, ignore: 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", force: :cascade do |t|
@@ -56,7 +56,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          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", force: :cascade do |t|
@@ -74,7 +74,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", ignore: 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", force: :cascade do |t|

data/spec/mysql/migrate/migrate_ignore_index_spec.rb

@@ -6,13 +6,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
-          t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>, ignore: true
+          t.index ["name"], name: "idx_name", unique: true, ignore: true
         end
 
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>, ignore: true
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", ignore: true
         end
 
         create_table "titles", id: false, force: :cascade do |t|
@@ -20,7 +20,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>, ignore: true
+          t.index ["emp_no"], name: "emp_no", ignore: true
         end
       ERB
     end
@@ -64,7 +64,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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
       ERB
     end
@@ -76,7 +76,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["from_date"], name: "emp_no", <%= i cond(5.0, using: :btree) %>, ignore: true
+          t.index ["from_date"], name: "emp_no", ignore: true
         end
       ERB
     end

data/spec/mysql/migrate/migrate_log_file_spec.rb

@@ -6,12 +6,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", 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", 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", id: false, force: :cascade do |t|
@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_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 "dept_manager", id: false, force: :cascade do |t|
@@ -28,14 +28,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          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", force: :cascade do |t|
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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", id: false, force: :cascade do |t|
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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
     end
@@ -68,7 +68,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "departments", primary_key: "dept_no", 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", id: false, force: :cascade do |t|
@@ -76,8 +76,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_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 "dept_manager", id: false, force: :cascade do |t|
@@ -85,8 +85,8 @@ describe 'Ridgepole::Client#diff -> migrate' 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 "salaries", id: false, force: :cascade do |t|
@@ -94,7 +94,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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", id: false, force: :cascade do |t|
@@ -102,7 +102,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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
     end

data/spec/mysql/migrate/migrate_merge_mode_spec.rb

@@ -6,12 +6,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", 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", 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", id: false, force: :cascade do |t|
@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_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 "dept_manager", id: false, force: :cascade do |t|
@@ -28,14 +28,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          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", force: :cascade do |t|
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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", id: false, force: :cascade do |t|
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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
     end
@@ -68,7 +68,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", 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 "clubs2", force: :cascade do |t|
@@ -77,7 +77,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "departments", primary_key: "dept_no", 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", id: false, force: :cascade do |t|
@@ -85,8 +85,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_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 "dept_manager", id: false, force: :cascade do |t|
@@ -94,14 +94,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          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", force: :cascade do |t|
@@ -117,7 +117,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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", id: false, force: :cascade do |t|
@@ -125,7 +125,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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
     end

data/spec/mysql/migrate/migrate_noop_spec.rb

@@ -82,9 +82,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby actual_dsl
 
       expect(sql).to match_fuzzy erbh(<<-ERB)
-        CREATE TABLE `clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `clubs` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
-        CREATE TABLE `departments` (`dept_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `departments` (`dept_no` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE UNIQUE INDEX `dept_name` USING btree ON `departments` (`dept_name`)
         CREATE TABLE `dept_emp` (`emp_no` int NOT NULL, `dept_no` varchar(4) NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `dept_no` USING btree ON `dept_emp` (`dept_no`)
@@ -92,9 +92,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
         CREATE TABLE `dept_manager` (`dept_no` varchar(4) NOT NULL, `emp_no` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `dept_no` USING btree ON `dept_manager` (`dept_no`)
         CREATE  INDEX `emp_no` USING btree ON `dept_manager` (`emp_no`)
-        CREATE TABLE `employee_clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `emp_no` int unsigned NOT NULL, `club_id` int unsigned NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `employee_clubs` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `emp_no` int unsigned NOT NULL, `club_id` int unsigned NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `idx_emp_no_club_id` USING btree ON `employee_clubs` (`emp_no`, `club_id`)
-        CREATE TABLE `employees` (`emp_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `employees` (`emp_no` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE TABLE `salaries` (`emp_no` int NOT NULL, `salary` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`emp_no`)
         CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
@@ -111,17 +111,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       # XXX:
       expect(sql.delete('`')).to match_fuzzy erbh(<<-ERB).delete('`')
-        CREATE TABLE `clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `clubs` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `clubs` ADD UNIQUE INDEX `idx_name` USING btree (`name`)
-        CREATE TABLE `departments` (`dept_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `departments` (`dept_no` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `departments` ADD UNIQUE INDEX `dept_name` USING btree (`dept_name`)
         CREATE TABLE `dept_emp` (`emp_no` int NOT NULL, `dept_no` varchar(4) NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `dept_emp` ADD  INDEX `dept_no` USING btree (`dept_no`), ADD  INDEX `emp_no` USING btree (`emp_no`)
         CREATE TABLE `dept_manager` (`dept_no` varchar(4) NOT NULL, `emp_no` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `dept_manager` ADD  INDEX `dept_no` USING btree (`dept_no`), ADD  INDEX `emp_no` USING btree (`emp_no`)
-        CREATE TABLE `employee_clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `emp_no` int unsigned NOT NULL, `club_id` int unsigned NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `employee_clubs` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `emp_no` int unsigned NOT NULL, `club_id` int unsigned NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `employee_clubs` ADD  INDEX `idx_emp_no_club_id` USING btree (`emp_no`, `club_id`)
-        CREATE TABLE `employees` (`emp_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `employees` (`emp_no` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE TABLE `salaries` (`emp_no` int NOT NULL, `salary` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `salaries` ADD  INDEX `emp_no` USING btree (`emp_no`)
         CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
@@ -211,9 +211,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby actual_dsl
 
       expect(sql).to match_fuzzy erbh(<<-ERB)
-        CREATE TABLE `clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `clubs` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
-        CREATE TABLE `departments` (`dept_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `departments` (`dept_no` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE UNIQUE INDEX `dept_name` USING btree ON `departments` (`dept_name`)
         CREATE TABLE `dept_emp` (`emp_no` int NOT NULL, `dept_no` varchar(4) NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `dept_no` USING btree ON `dept_emp` (`dept_no`)
@@ -221,9 +221,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
         CREATE TABLE `dept_manager` (`dept_no` varchar(4) NOT NULL, `emp_no` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `dept_no` USING btree ON `dept_manager` (`dept_no`)
         CREATE  INDEX `emp_no` USING btree ON `dept_manager` (`emp_no`)
-        CREATE TABLE `employee_clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `emp_no` int unsigned NOT NULL, `club_id` int unsigned NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `employee_clubs` (`id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `emp_no` int unsigned NOT NULL, `club_id` int unsigned NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `idx_emp_no_club_id` USING btree ON `employee_clubs` (`emp_no`, `club_id`)
-        CREATE TABLE `employees` (`emp_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
+        CREATE TABLE `employees` (`emp_no` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE TABLE `salaries` (`emp_no` int NOT NULL, `salary` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`emp_no`)
         CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>

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,12 +58,12 @@ 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|
           t.bigint "employee_id", null: false, unsigned: true
-          t.index ["employee_id"], name: "fk_salaries_employees", <%= i cond(5.0, using: :btree) %>
+          t.index ["employee_id"], name: "fk_salaries_employees"
         end
         add_foreign_key "salaries", "employees", name: "fk_salaries_employees"
       ERB
@@ -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

data/spec/mysql/migrate/migrate_rename_column_spec.rb

@@ -6,12 +6,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", 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", 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", id: false, force: :cascade do |t|
@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_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 "dept_manager", id: false, force: :cascade do |t|
@@ -28,14 +28,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          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", force: :cascade do |t|
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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", id: false, force: :cascade do |t|
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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
     end
@@ -68,12 +68,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", 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", 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", id: false, force: :cascade do |t|
@@ -81,8 +81,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_no", null: false
           t.date    "from_date2", null: false, renamed_from: 'from_date'
           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", id: false, force: :cascade do |t|
@@ -90,14 +90,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false
           t.date    "from_date", null: false
           t.date    "to_date2", null: false, renamed_from: 'to_date'
-          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", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          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", force: :cascade do |t|
@@ -113,7 +113,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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", id: false, force: :cascade do |t|
@@ -121,7 +121,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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
     end