ridgepole 0.6.5.beta → 0.6.5.beta2

data/spec/mysql/migrate/migrate_noop_spec.rb

@@ -1,17 +1,26 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   let(:template_variables) {
     opts = {
-      unsigned: {},
       sql_int_pk_type: 'int(11) auto_increment PRIMARY KEY',
       sql_int_type: 'int(11)',
       sql_uint_type: 'int(11)',
     }
 
     if condition(:mysql_awesome_enabled)
-      opts[:unsigned] = {unsigned: true}
-      opts[:sql_int_pk_type] = 'int PRIMARY KEY AUTO_INCREMENT'
-      opts[:sql_int_type] = 'int'
-      opts[:sql_uint_type] = 'int unsigned'
+      opts.merge!(
+        sql_int_pk_type: 'int PRIMARY KEY AUTO_INCREMENT',
+        sql_int_type: 'int',
+        sql_uint_type: 'int unsigned'
+      )
+    end
+
+    if condition(:activerecord_5)
+      opts.merge!(
+        sql_int_pk_type: 'int AUTO_INCREMENT PRIMARY KEY',
+        sql_int_type: 'int',
+        sql_uint_type: 'int unsigned',
+        using_btree: 'USING btree'
+      )
     end
 
     opts
@@ -125,22 +134,23 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(migrated).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
 
-      expect(sql).to match_fuzzy erbh(<<-EOS, template_variables)
+      # XXX:
+      expect(sql.gsub('`', '')).to match_fuzzy erbh(<<-EOS, template_variables).gsub('`', '')
         CREATE TABLE `clubs` (`id` <%= @sql_int_pk_type %>, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
-        ALTER TABLE `clubs` ADD UNIQUE INDEX idx_name (`name`)
+        ALTER TABLE `clubs` ADD UNIQUE INDEX `idx_name` <%= @using_btree %> (`name`)
         CREATE TABLE `departments` (`dept_no` <%= @sql_int_pk_type %>, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
-        ALTER TABLE `departments` ADD UNIQUE INDEX dept_name (`dept_name`)
+        ALTER TABLE `departments` ADD UNIQUE INDEX `dept_name` <%= @using_btree %> (`dept_name`)
         CREATE TABLE `dept_emp` (`emp_no` <%= @sql_int_type %> NOT NULL, `dept_no` varchar(4) NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
-        ALTER TABLE `dept_emp` ADD  INDEX dept_no (`dept_no`), ADD  INDEX emp_no (`emp_no`)
+        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` <%= @sql_int_type %> NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
-        ALTER TABLE `dept_manager` ADD  INDEX dept_no (`dept_no`), ADD  INDEX emp_no (`emp_no`)
+        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` <%= @sql_int_pk_type %>, `emp_no` <%= @sql_uint_type %> NOT NULL, `club_id` <%= @sql_uint_type %> NOT NULL) ENGINE=InnoDB
-        ALTER TABLE `employee_clubs` ADD  INDEX idx_emp_no_club_id (`emp_no`, `club_id`)
+        ALTER TABLE `employee_clubs` ADD  INDEX `idx_emp_no_club_id` <%= @using_btree %> (`emp_no`, `club_id`)
         CREATE TABLE `employees` (`emp_no` <%= @sql_int_pk_type %>, `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) ENGINE=InnoDB
         CREATE TABLE `salaries` (`emp_no` <%= @sql_int_type %> NOT NULL, `salary` <%= @sql_int_type %> NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
-        ALTER TABLE `salaries` ADD  INDEX emp_no (`emp_no`)
+        ALTER TABLE `salaries` ADD  INDEX `emp_no` <%= @using_btree %> (`emp_no`)
         CREATE TABLE `titles` (`emp_no` <%= @sql_int_type %> NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) ENGINE=InnoDB
-        ALTER TABLE `titles` ADD  INDEX emp_no (`emp_no`)
+        ALTER TABLE `titles` ADD  INDEX `emp_no` <%= @using_btree %> (`emp_no`)
       EOS
     }
   end

data/spec/mysql/migrate/migrate_rename_column_spec.rb

@@ -1,59 +1,47 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      unsigned: {}
-    }
-
-    if condition(:mysql_awesome_enabled)
-      opts[:unsigned] = {unsigned: true}
-    end
-
-    opts
-  }
-
   context 'when rename column' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.string "name", limit: 255, default: "", null: false
+      erbh(<<-EOS)
+        create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.string "name", <%= i limit(255) + {default: "", null: false} %>
         end
 
-        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+        <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
 
-        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+        create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
-        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+        <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
 
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.string  "dept_no",   <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no",   limit: 4, null: false
-          t.integer "emp_no",    limit: 4, null: false
+          t.string  "dept_no",   <%= i limit(4) + {null: false} %>
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "employee_clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.integer "emp_no",  <%= {limit: 4, null: false}.push(@unsigned).i %>
-          t.integer "club_id", <%= {limit: 4, null: false}.push(@unsigned).i %>
+        create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.integer "emp_no",  <%= i limit(4) + {null: false} + unsigned(true) %>
+          t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
         end
 
-        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+        <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
 
-        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {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
@@ -62,67 +50,67 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         create_table "salaries", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.integer "salary",    limit: 4, null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.integer "salary",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "titles", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4,  null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.string  "title",     limit: 50, null: false
           t.date    "from_date",            null: false
           t.date    "to_date"
         end
 
-        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "titles", ["emp_no"], name: "emp_no", using: :btree %>
       EOS
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.string "name", limit: 255, default: "", null: false
+      erbh(<<-EOS)
+        create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.string "name", <%= i limit(255) + {default: "", null: false} %>
         end
 
-        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+        <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
 
-        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+        create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
-        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+        <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
 
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",     limit: 4, null: false
-          t.string  "dept_no",    limit: 4, null: false
+          t.integer "emp_no",     <%= i limit(4) + {null: false} %>
+          t.string  "dept_no",    <%= i limit(4) + {null: false} %>
           t.date    "from_date2",           null: false, renamed_from: 'from_date'
           t.date    "to_date",              null: false
         end
 
-        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no",   limit: 4, null: false
-          t.integer "emp_no",    limit: 4, null: false
+          t.string  "dept_no",   <%= i limit(4) + {null: false} %>
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date2",            null: false, renamed_from: 'to_date'
         end
 
-        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "employee_clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.integer "emp_no",  <%= {limit: 4, null: false}.push(@unsigned).i %>
-          t.integer "club_id", <%= {limit: 4, null: false}.push(@unsigned).i %>
+        create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.integer "emp_no",  <%= i limit(4) + {null: false} + unsigned(true) %>
+          t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
         end
 
-        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+        <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
 
-        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {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
@@ -131,22 +119,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         create_table "salaries", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.integer "salary",    limit: 4, null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.integer "salary",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "titles", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4,  null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.string  "title",     limit: 50, null: false
           t.date    "from_date",            null: false
           t.date    "to_date"
         end
 
-        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "titles", ["emp_no"], name: "emp_no", using: :btree %>
       EOS
     }
 

data/spec/mysql/migrate/migrate_rename_table_spec.rb

@@ -1,59 +1,47 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      unsigned: {}
-    }
-
-    if condition(:mysql_awesome_enabled)
-      opts[:unsigned] = {unsigned: true}
-    end
-
-    opts
-  }
-
   context 'when rename table' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.string "name", limit: 255, default: "", null: false
+      erbh(<<-EOS)
+        create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.string "name", <%= i limit(255) + {default: "", null: false} %>
         end
 
-        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+        <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
 
-        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+        create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
-        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+        <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
 
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.string  "dept_no",   <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no",   limit: 4, null: false
-          t.integer "emp_no",    limit: 4, null: false
+          t.string  "dept_no",   <%= i limit(4) + {null: false} %>
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "employee_clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.integer "emp_no",  <%= {limit: 4, null: false}.push(@unsigned).i %>
-          t.integer "club_id", <%= {limit: 4, null: false}.push(@unsigned).i %>
+        create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.integer "emp_no",  <%= i limit(4) + {null: false} + unsigned(true) %>
+          t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
         end
 
-        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+        <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
 
-        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {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
@@ -62,67 +50,67 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         create_table "salaries", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.integer "salary",    limit: 4, null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.integer "salary",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "titles", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4,  null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.string  "title",     limit: 50, null: false
           t.date    "from_date",            null: false
           t.date    "to_date"
         end
 
-        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "titles", ["emp_no"], name: "emp_no", using: :btree %>
       EOS
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.string "name", limit: 255, default: "", null: false
+      erbh(<<-EOS)
+        create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.string "name", <%= i limit(255) + {default: "", null: false} %>
         end
 
-        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+        <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
 
-        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+        create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
-        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+        <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
 
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.string  "dept_no",   <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no",   limit: 4, null: false
-          t.integer "emp_no",    limit: 4, null: false
+          t.string  "dept_no",   <%= i limit(4) + {null: false} %>
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
-        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "employee_clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-          t.integer "emp_no",  <%= {limit: 4, null: false}.push(@unsigned).i %>
-          t.integer "club_id", <%= {limit: 4, null: false}.push(@unsigned).i %>
+        create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
+          t.integer "emp_no",  <%= i limit(4) + {null: false} + unsigned(true) %>
+          t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
         end
 
-        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+        <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
 
-        create_table "employees2", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %>, renamed_from: 'employees' do |t|
+        create_table "employees2", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %>, renamed_from: 'employees' do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -131,22 +119,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         create_table "salaries", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.integer "salary",    limit: 4, null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.integer "salary",    <%= i limit(4) + {null: false} %>
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
 
         create_table "titles", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4,  null: false
+          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
           t.string  "title",     limit: 50, null: false
           t.date    "from_date",            null: false
           t.date    "to_date"
         end
 
-        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+        <%= add_index "titles", ["emp_no"], name: "emp_no", using: :btree %>
       EOS
     }
 
@@ -172,8 +160,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when rename table (dry-run)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {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
@@ -181,13 +169,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date",             null: false
         end
 
-        add_index "employees", ["first_name"], name: "first_name", using: :btree
+        <%= add_index "employees", ["first_name"], name: "first_name", using: :btree %>
       EOS
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "employees2", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %>, renamed_from: 'employees' do |t|
+      erbh(<<-EOS)
+        create_table "employees2", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %>, renamed_from: 'employees' do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -195,7 +183,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date",             null: false
         end
 
-        add_index "employees2", ["first_name"], name: "first_name", using: :btree
+        <%= add_index "employees2", ["first_name"], name: "first_name", using: :btree %>
       EOS
     }
 
@@ -216,8 +204,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "employees2", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %>, renamed_from: 'not_employees' do |t|
+      erbh(<<-EOS)
+        create_table "employees2", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %>, renamed_from: 'not_employees' do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false