spec/mysql/migrate/migrate_empty_spec.rb in ridgepole-0.6.5.beta vs spec/mysql/migrate/migrate_empty_spec.rb in ridgepole-0.6.5.beta2

@@ -1,85 +1,73 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      unsigned: {}
-    }
-
-    if condition(:mysql_awesome_enabled)
-      opts[:unsigned] = {unsigned: true}
-    end
-
-    opts
-  }
-
   context 'when database is empty' do
     let(:actual_dsl) { '' }
     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 "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
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         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
     }
 
     subject { client }