ridgepole 0.7.1 → 0.7.2.beta

data/spec/mysql/migrate/migrate_drop_column_spec.rb

@@ -123,15 +123,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
 
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
         change_table("dept_emp", {:bulk => true}) do |t|
           t.remove("from_date")
@@ -150,7 +150,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_drop_index_spec.rb

@@ -129,15 +129,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
 
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
         change_table("clubs", {:bulk => true}) do |t|
           t.remove_index({:name=>"idx_name"})
@@ -152,7 +152,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_drop_table_spec.rb

@@ -113,9 +113,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_empty_spec.rb

@@ -68,9 +68,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_execute_spec.rb

@@ -2,11 +2,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when execute' do
     let(:dsl) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -16,11 +16,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:dsl_with_execute) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -38,7 +38,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl_with_execute)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
 
       expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
@@ -72,11 +72,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when not execute' do
     let(:dsl) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -87,11 +87,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:dsl_with_execute) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -111,7 +111,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl_with_execute)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
 
       expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
@@ -126,7 +126,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       migrated, out = delta.migrate
       expect(migrated).to be_falsey
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
 
       expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
@@ -144,11 +144,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when execute (noop)' do
     let(:dsl) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -158,11 +158,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:dsl_with_execute) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -180,7 +180,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl_with_execute)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
 
       expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
@@ -194,7 +194,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
 
       expect(sql).to match_fuzzy "ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)"
 
@@ -213,11 +213,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when not execute (noop)' do
     let(:dsl) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -228,11 +228,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:dsl_with_execute) {
       erbh(<<-EOS)
-        create_table "authors", <%= i cond(5.1, id: :integer) + {force: :cascade} %> do |t|
+        create_table "authors", <%= i cond('>= 5.1',id: :integer) + {force: :cascade} %> do |t|
           t.string "name", null: false
         end
 
-        create_table "books", <%= i cond(5.1, id: :integer) + {force: :cascad} %>e 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", null: false
           t.index ["author_id"], name: "idx_author_id", <%= i cond(5.0, using: :btree) %>
@@ -252,7 +252,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl_with_execute)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
 
       expect(show_create_table(:books)).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `books` (
@@ -267,7 +267,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_falsey
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
 
       expect(sql).to match_fuzzy ""
 

data/spec/mysql/migrate/migrate_log_file_spec.rb

@@ -113,9 +113,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       tempfile("#{File.basename __FILE__}.#{$$}") do |path|
         delta = client(log_file: path).diff(expected_dsl)
         expect(delta.differ?).to be_truthy
-        expect(client.dump).to match_fuzzy actual_dsl
+        expect(client.dump).to match_ruby actual_dsl
         delta.migrate
-        expect(client.dump).to match_fuzzy expected_dsl
+        expect(client.dump).to match_ruby expected_dsl
         expect(File.size(path)).to be > 0
       end
     }

data/spec/mysql/migrate/migrate_merge_mode_spec.rb

@@ -134,10 +134,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl.gsub(/create_table "clubs".+\n\s*t\..+\n\s*end/, ""))
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
       # `clubs` table is not deleted
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_noop_spec.rb

@@ -77,25 +77,25 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
 
       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 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 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) ENGINE=InnoDB
+        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 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) 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) <%= cond('< 5.2.0.beta2', '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` int 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) <%= 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) 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) <%= 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) 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 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 `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) ENGINE=InnoDB
+        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') %>
         CREATE  INDEX `emp_no` USING btree ON `titles` (`emp_no`)
       EOS
     }
@@ -105,24 +105,24 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
 
       # XXX:
       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
+        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') %>
         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
+        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') %>
         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
+        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) 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) <%= 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) 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) <%= 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) 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 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 `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) ENGINE=InnoDB
+        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') %>
         ALTER TABLE `titles` ADD  INDEX `emp_no` USING btree (`emp_no`)
       EOS
     }
@@ -206,25 +206,25 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
 
       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 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 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) ENGINE=InnoDB
+        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 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) 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) <%= cond('< 5.2.0.beta2', '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` int 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) <%= 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) 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) <%= 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) 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 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 `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) ENGINE=InnoDB
+        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') %>
         CREATE  INDEX `emp_no` USING btree ON `titles` (`emp_no`)
       EOS
     }

data/spec/mysql/migrate/migrate_primary_key_spec.rb

@@ -28,7 +28,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
       delta.migrate
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
     }
   end
 
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_rename_column_spec.rb

@@ -130,15 +130,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
 
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
         change_table("dept_emp", {:bulk => true}) do |t|
           t.rename("from_date", "from_date2")
@@ -153,7 +153,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
   end
 

data/spec/mysql/migrate/migrate_rename_table_spec.rb

@@ -130,9 +130,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: ('employees'|:titles)/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/, renamed_from: ('employees'|:titles)/, '')
     }
   end
 
@@ -187,9 +187,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate(noop: true)
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
     }
   end