ridgepole 0.6.4 → 0.6.5.beta

data/spec/mysql/migrate/migrate_change_column_float_spec.rb

@@ -1,26 +1,25 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change float column' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4,  null: false
           t.float   "salary",    limit: 24, null: false
           t.date    "from_date",            null: false
           t.date    "to_date",              null: false
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",               null: false
           t.float   "salary",               null: false
           t.date    "from_date",            null: false
           t.date    "to_date",              null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -29,33 +28,33 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
     }
   end
 
   context 'when change float column (no change)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",               null: false
           t.float   "salary",    limit: 24, null: false
           t.date    "from_date",            null: false
           t.date    "to_date",              null: false
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",               null: false
           t.float   "salary",               null: false
           t.date    "from_date",            null: false
           t.date    "to_date",              null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -67,4 +66,3 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_change_column_spec.rb

@@ -1,15 +1,28 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
+  let(:template_variables) {
+    opts = {
+      unsigned: {},
+      unsigned_false: {},
+    }
+
+    if condition(:mysql_awesome_enabled)
+      opts[:unsigned] = {unsigned: true}
+      opts[:unsigned_false] = {unsigned: false}
+    end
+
+    opts
+  }
+
   context 'when change column' do
     let(:actual_dsl) {
-      <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "name", limit: 255, default: "", null: false
         end
 
         add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
 
-        create_table "departments", primary_key: "dept_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -35,14 +48,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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"#{unsigned_if_enabled}, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4, null: false#{unsigned_if_enabled}
-          t.integer "club_id", limit: 4, null: false#{unsigned_if_enabled}
+        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 %>
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -67,18 +80,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "name", limit: 255, default: "", null: false
         end
 
         add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
 
-        create_table "departments", primary_key: "dept_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -104,14 +117,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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"#{unsigned_if_enabled}, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4, null: false#{unsigned_if_enabled}
+        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
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.date   "birth_date",                            null: false
           t.string "first_name", limit: 14,                 null: false
           t.string "last_name",  limit: 20, default: "XXX", null: false
@@ -136,7 +149,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -145,39 +158,38 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/(\s*,\s*unsigned: false)?\s*,\s*null: true/, '')
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_column("employee_clubs", "club_id", :integer, {:null=>false#{unsigned_if_enabled2}, :default=>nil})
+      expect(delta.script).to match_fuzzy erbh(<<-EOS, template_variables)
+        change_column("employee_clubs", "club_id", :integer, <%= {:null=>false, :default=>nil}.insert(1, @unsigned) %>)
 
         change_column("employees", "last_name", :string, {:limit=>16, :default=>nil})
         change_column("employees", "gender", :string, {:limit=>1, :null=>false, :default=>nil})
-      RUBY
+      EOS
     }
 
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(delta.script).to match_fuzzy erbh(<<-EOS, template_variables)
         change_table("employee_clubs", {:bulk => true}) do |t|
-          t.change("club_id", :integer, {:null=>true, :default=>nil#{unsigned_false_if_enabled2}})
+          t.change("club_id", :integer, <%= {:null=>true, :default=>nil}.push(@unsigned_false) %>)
         end
 
         change_table("employees", {:bulk => true}) do |t|
-          t.change("last_name", :string, {:limit=>20, :default=>"XXX"#{unsigned_false_if_enabled2}})
-          t.change("gender", :string, {:limit=>2, :null=>false, :default=>nil#{unsigned_false_if_enabled2}})
+          t.change("last_name", :string, <%= {:limit=>20, :default=>"XXX"}.push(@unsigned_false) %>)
+          t.change("gender", :string, <%= {:limit=>2, :null=>false, :default=>nil}.push(@unsigned_false) %>)
         end
-      RUBY
+      EOS
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/(\s*,\s*unsigned: false)?\s*,\s*null: true/, '')
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_change_index2_spec.rb

@@ -1,8 +1,7 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index (no change)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -11,11 +10,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -24,7 +23,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", "emp_no", name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -38,7 +37,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when change index (change)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -47,11 +46,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -60,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", "salary", name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -73,7 +72,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -82,10 +81,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_change_index3_spec.rb

@@ -1,8 +1,7 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index without using (no change)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -11,11 +10,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -24,7 +23,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no"
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -38,7 +37,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when change index without using (change)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -47,11 +46,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -60,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], using: :hash
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -73,7 +72,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "index_salaries_on_salary", using: :hash
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -82,15 +81,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 
   context 'when change index without name (no change)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -99,11 +98,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -112,7 +111,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -126,7 +125,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when change index without name (change)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -135,11 +134,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    null: false
           t.integer "salary",    null: false
@@ -148,11 +147,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -161,7 +160,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "index_salaries_on_salary", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -170,10 +169,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_change_index4_spec.rb

@@ -1,9 +1,20 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
+  let(:template_variables) {
+    opts = {
+      unsigned: {}
+    }
+
+    if condition(:mysql_awesome_enabled)
+      opts[:unsigned] = {unsigned: true}
+    end
+
+    opts
+  }
+
   context 'when change index (same name)' do
     let(:actual_dsl) {
-      <<-RUBY
-        create_table "salaries"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "salaries", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
           t.date    "from_date",           null: false
@@ -11,12 +22,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no", "id"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
-        create_table "salaries"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "salaries", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
           t.date    "from_date",           null: false
@@ -24,7 +35,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary", "id"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -33,15 +44,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 
   context 'when change index (same name) (2)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -50,11 +61,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "salary",    limit: 4, null: false
@@ -63,7 +74,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -72,35 +83,35 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 
   context 'when change index (same name) (3)' do
     let(:actual_dsl) {
-      <<-RUBY
-        create_table "salaries", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "salaries", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.integer "salary",    limit: 4, null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
         add_index "salaries", ["salary", "emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
-        create_table "salaries", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "salaries", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.integer "salary",    limit: 4, null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
         add_index "salaries", ["from_date", "emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -109,10 +120,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 end
-end