ridgepole 0.6.6 → 0.7.0.alpha

data/spec/mysql/migrate/migrate_execute_spec.rb

@@ -1,27 +1,14 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      sql_int_type: 'int(11)',
-      test_schema: TEST_SCHEMA,
-    }
-
-    if condition(:mysql_awesome_enabled)
-      opts[:sql_int_type] = 'int(10) unsigned'
-    end
-
-    opts
-  }
-
   context 'when execute' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", <%= i unsigned(true) + {force: :cascade} %> do |t|
-          t.string "name", <%= i limit(255) + {null: false} %>
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+          t.string "name", null: false
         end
 
-        create_table "books", <%= i unsigned(true) + {force: :cascade} %> do |t|
-          t.string  "title",     <%= i limit(255) + {null: false} %>
-          t.integer "author_id", <%= i limit(4) + {null: false} + unsigned(true) %>
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
+          t.string  "title",     null: false
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
@@ -29,20 +16,20 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:dsl_with_execute) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", force: :cascade do |t|
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", force: :cascade do |t|
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
           t.string  "title",                     null: false
-          t.integer "author_id", <%= i limit(4) + {null: false} + unsigned(true) %>
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
 
         execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
-          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= @test_schema %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= TEST_SCHEMA %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
         end
       EOS
     }
@@ -55,13 +42,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy dsl
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
-          `id` <%= @sql_int_type %> NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` <%= @sql_int_type %> NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS
 
@@ -71,13 +58,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
         add_foreign_key "books", "authors", name: "fk_author"
       EOS
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
-          `id` <%= @sql_int_type %> NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` <%= @sql_int_type %> NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE,
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS
@@ -86,14 +73,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when not execute' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", force: :cascade do |t|
-          t.string "name", <%= i limit(255) + {null: false} %>
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+          t.string "name", null: false
         end
 
-        create_table "books", force: :cascade do |t|
-          t.string  "title",     <%= i limit(255) + {null: false} %>
-          t.integer "author_id", <%= i limit(4) + {null: false} %>
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
+          t.string  "title",     null: false
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
@@ -102,20 +89,20 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:dsl_with_execute) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", force: :cascade do |t|
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", force: :cascade do |t|
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
           t.string  "title",                     null: false
-          t.integer "author_id", <%= i limit(4) + {null: false} %>
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
 
         execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
-          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= @test_schema %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= TEST_SCHEMA %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
         end
 
         add_foreign_key "books", "authors", name: "fk_author"
@@ -130,13 +117,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy dsl
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
           `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
           `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE,
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS
@@ -145,13 +132,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(migrated).to be_falsey
       expect(subject.dump).to match_fuzzy dsl
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
           `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
           `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE,
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS
@@ -160,14 +147,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when execute (noop)' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", <%= i unsigned(true) + {force: :cascade} %> do |t|
-          t.string "name", <%= i limit(255) + {null: false} %>
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+          t.string "name", null: false
         end
 
-        create_table "books", <%= i unsigned(true) + {force: :cascade} %> do |t|
-          t.string  "title",     <%= i limit(255) + {null: false} %>
-          t.integer "author_id", <%= i limit(4) + {null: false} + unsigned(true) %>
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
+          t.string  "title",     null: false
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
@@ -175,20 +162,20 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:dsl_with_execute) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", force: :cascade do |t|
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", force: :cascade do |t|
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
           t.string  "title",                     null: false
-          t.integer "author_id", <%= i limit(4) + {null: false} + unsigned(true) %>
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
 
         execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
-          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= @test_schema %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= TEST_SCHEMA %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
         end
       EOS
     }
@@ -201,13 +188,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy dsl
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
-          `id` <%= @sql_int_type %> NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` <%= @sql_int_type %> NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS
 
@@ -217,13 +204,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(sql).to match_fuzzy "ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)"
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
-          `id` <%= @sql_int_type %> NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` <%= @sql_int_type %> NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS
     }
@@ -231,14 +218,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when not execute (noop)' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", force: :cascade do |t|
-          t.string "name", <%= i limit(255) + {null: false} %>
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+          t.string "name", null: false
         end
 
-        create_table "books", force: :cascade do |t|
-          t.string  "title",     <%= i limit(255) + {null: false} %>
-          t.integer "author_id", <%= i limit(4) + {null: false} %>
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
+          t.string  "title",     null: false
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
@@ -247,20 +234,20 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:dsl_with_execute) {
-      erbh(<<-EOS, template_variables)
-        create_table "authors", force: :cascade do |t|
+      erbh(<<-EOS)
+        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", force: :cascade do |t|
+        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e do |t|
           t.string  "title",                     null: false
-          t.integer "author_id", <%= i limit(4) + {null: false} %>
+          t.integer "author_id", null: false
         end
 
         <%= add_index "books", ["author_id"], name: "idx_author_id", using: :btree %>
 
         execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
-          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= @test_schema %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+          c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = '<%= TEST_SCHEMA %>' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
         end
 
         add_foreign_key "books", "authors", name: "fk_author"
@@ -275,13 +262,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy dsl
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
           `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
           `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE,
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS
@@ -292,13 +279,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(sql).to match_fuzzy ""
 
-      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS, template_variables)
+      expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
           `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
           `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
-          KEY `idx_author_id` (`author_id`) USING BTREE,
+          KEY `idx_author_id` (`author_id`) <%= cond(5.0, 'USING BTREE') %>,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
       EOS

data/spec/mysql/migrate/migrate_merge_mode_spec.rb

@@ -4,9 +4,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       unsigned: {}
     }
 
-    if condition(:mysql_awesome_enabled)
-      opts[:unsigned] = {unsigned: true}
-    end
+    opts[:unsigned] = {unsigned: true}
 
     opts
   }

data/spec/mysql/migrate/migrate_noop_spec.rb

@@ -1,31 +1,4 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      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.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
-  }
-
   context 'when no operation' do
     let(:actual_dsl) { '' }
     let(:expected_dsl) {
@@ -106,23 +79,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)
-        CREATE TABLE `clubs` (`id` <%= @sql_int_pk_type %>, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
+      expect(sql).to match_fuzzy erbh(<<-EOS)
+        CREATE TABLE `clubs` (`id` <%= cond(5.1, 'bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
-        CREATE TABLE `departments` (`dept_no` <%= @sql_int_pk_type %>, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `departments` (`dept_no` <%= cond(5.1, 'bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `dept_name` USING btree ON `departments` (`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
+        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) ENGINE=InnoDB
         CREATE  INDEX `dept_no` USING btree ON `dept_emp` (`dept_no`)
         CREATE  INDEX `emp_no` USING btree ON `dept_emp` (`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
+        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) 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` <%= @sql_int_pk_type %>, `emp_no` <%= @sql_uint_type %> NOT NULL, `club_id` <%= @sql_uint_type %> NOT NULL) ENGINE=InnoDB
+        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) ENGINE=InnoDB
         CREATE  INDEX `idx_emp_no_club_id` USING btree ON `employee_clubs` (`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
+        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) ENGINE=InnoDB
+        CREATE TABLE `salaries` (`emp_no` int NOT NULL, `salary` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`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
+        CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) ENGINE=InnoDB
         CREATE  INDEX `emp_no` USING btree ON `titles` (`emp_no`)
       EOS
     }
@@ -135,22 +108,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy actual_dsl
 
       # 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` <%= @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` <%= @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` <%= @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` <%= @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` <%= @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` <%= @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` <%= @using_btree %> (`emp_no`)
+      expect(sql.gsub('`', '')).to match_fuzzy erbh(<<-EOS).gsub('`', '')
+        CREATE TABLE `clubs` (`id` <%= cond(5.1, 'bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) 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) 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) 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) 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) 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) ENGINE=InnoDB
+        CREATE TABLE `salaries` (`emp_no` int NOT NULL, `salary` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) 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) ENGINE=InnoDB
+        ALTER TABLE `titles` ADD  INDEX `emp_no` USING btree (`emp_no`)
       EOS
     }
   end
@@ -235,23 +208,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)
-        CREATE TABLE `clubs` (`id` <%= @sql_int_pk_type %>, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
+      expect(sql).to match_fuzzy erbh(<<-EOS)
+        CREATE TABLE `clubs` (`id` <%= cond(5.1, 'bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
-        CREATE TABLE `departments` (`dept_no` <%= @sql_int_pk_type %>, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `departments` (`dept_no` <%= cond(5.1, 'bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `dept_name` USING btree ON `departments` (`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
+        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) ENGINE=InnoDB
         CREATE  INDEX `dept_no` USING btree ON `dept_emp` (`dept_no`)
         CREATE  INDEX `emp_no` USING btree ON `dept_emp` (`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
+        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) 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` <%= @sql_int_pk_type %>, `emp_no` <%= @sql_uint_type %> NOT NULL, `club_id` <%= @sql_uint_type %> NOT NULL) ENGINE=InnoDB
+        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) ENGINE=InnoDB
         CREATE  INDEX `idx_emp_no_club_id` USING btree ON `employee_clubs` (`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
+        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) ENGINE=InnoDB
+        CREATE TABLE `salaries` (`emp_no` int NOT NULL, `salary` int NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`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
+        CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) ENGINE=InnoDB
         CREATE  INDEX `emp_no` USING btree ON `titles` (`emp_no`)
       EOS
     }