ridgepole 0.6.4 → 0.6.5.beta

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -1,24 +1,35 @@
-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 create fk' do
     let(:actual_dsl) {
-      <<-RUBY
-create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
-  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
+      erbh(<<-EOS, template_variables)
+create_table "child", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+  t.integer "parent_id", <%= {limit: 4}.push(@unsigned).i %>
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
-create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
+create_table "parent", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
 end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      actual_dsl + (<<-RUBY)
+      erbh(actual_dsl + <<-EOS, template_variables)
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -27,34 +38,34 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     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
     }
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-EOS
         remove_foreign_key("child", {:name=>"child_ibfk_1"})
-      RUBY
+      EOS
     }
 
     it {
       delta = client(bulk_change: true).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(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(delta.script).to match_fuzzy <<-EOS
         add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
-      RUBY
+      EOS
       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 create fk when create table' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
@@ -65,11 +76,11 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
 
 create_table "parent", force: :cascade do |t|
 end
-      RUBY
+      EOS
     }
 
     let(:sorted_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", limit: 4
 end
@@ -80,7 +91,7 @@ create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -88,15 +99,15 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.strip).to eq ''
+      expect(subject.dump).to match_fuzzy ''
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq sorted_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy sorted_dsl
     }
   end
 
   context 'already defined' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
@@ -109,7 +120,7 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
 
 create_table "parent", force: :cascade do |t|
 end
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -123,7 +134,7 @@ end
 
   context 'no name' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
@@ -134,7 +145,7 @@ add_foreign_key "child", "parent"
 
 create_table "parent", force: :cascade do |t|
 end
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -148,12 +159,12 @@ end
 
   context 'orphan fk' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 
 create_table "parent", force: :cascade do |t|
 end
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -165,4 +176,3 @@ end
     }
   end
 end
-end

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -1,8 +1,7 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "parent", force: :cascade do |t|
 end
 
@@ -13,18 +12,18 @@ end
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     let(:sorted_actual_dsl) {
-      expected_dsl + (<<-RUBY)
+      expected_dsl + (<<-EOS)
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", limit: 4
 end
@@ -33,7 +32,7 @@ add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 create_table "parent", force: :cascade do |t|
 end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -42,34 +41,34 @@ end
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq sorted_actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-      expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.strip_heredoc.strip.each_line.select {|i| i !~ /\A\Z/ }.join
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-EOS
         add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
-      RUBY
+      EOS
     }
 
     it {
       delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq sorted_actual_dsl.strip_heredoc.strip
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy sorted_actual_dsl
+      expect(delta.script).to match_fuzzy <<-EOS
         remove_foreign_key("child", {:name=>"child_ibfk_1"})
-      RUBY
+      EOS
       delta.migrate
-      expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.strip_heredoc.strip.each_line.select {|i| i !~ /\A\Z/ }.join
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 
   context 'when drop fk when drop table' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "parent", force: :cascade do |t|
 end
 
@@ -81,11 +80,11 @@ end
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     let(:sorted_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", limit: 4
 end
@@ -96,7 +95,7 @@ create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     before { subject.diff(dsl).migrate }
@@ -105,10 +104,9 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     it {
       delta = subject.diff('')
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq sorted_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy sorted_dsl
       delta.migrate
-      expect(subject.dump.strip).to eq ''
+      expect(subject.dump).to match_fuzzy ''
     }
   end
 end
-end

data/spec/mysql/migrate/check_orphan_index_spec.rb

@@ -1,9 +1,8 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when there is an index of orphans' do
     let(:actual_dsl) { '' }
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -68,7 +67,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -80,4 +79,3 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_add_column2_spec.rb

@@ -1,19 +1,30 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
+  let(:template_variables) {
+    opts = {
+      sql_int_type: 'int(11)',
+    }
+
+    if condition(:mysql_awesome_enabled)
+      opts[:sql_int_type] = 'int'
+    end
+
+    opts
+  }
+
   context 'when add column (int/noop) (1)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         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.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "dept_emp", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "emp_no2",             null: false
@@ -21,7 +32,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -30,30 +41,29 @@ 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
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
 
-      sql = sql.each_line.map {|i| i.strip }.join("\n")
-      expect(sql).to eq("ALTER TABLE `dept_emp` ADD `emp_no2` int#{if_mysql_awesome_enabled('', '(11)')} NOT NULL AFTER `emp_no`")
+      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` <%= @sql_int_type %> NOT NULL AFTER `emp_no`", template_variables)
     }
   end
 
   context 'when add column (int/noop) (2)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         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.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "dept_emp", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "emp_no2",             null: false
@@ -61,7 +71,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -70,30 +80,29 @@ 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
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
 
-      sql = sql.each_line.map {|i| i.strip }.join("\n")
-      expect(sql).to eq("ALTER TABLE `dept_emp` ADD `emp_no2` int#{if_mysql_awesome_enabled('', '(11)')} NOT NULL AFTER `emp_no`")
+      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` <%= @sql_int_type %> NOT NULL AFTER `emp_no`", template_variables)
     }
   end
 
   context 'when add column (int/noop) (3)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         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.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "dept_emp", id: false, force: :cascade do |t|
           t.integer "emp_no",    limit: 4, null: false
           t.integer "emp_no2",   limit: 4, null: false
@@ -101,7 +110,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -110,14 +119,12 @@ 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
       migrated, sql = delta.migrate(:noop => true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
 
-      sql = sql.each_line.map {|i| i.strip }.join("\n")
-      expect(sql).to eq("ALTER TABLE `dept_emp` ADD `emp_no2` int#{if_mysql_awesome_enabled('', '(11)')} NOT NULL AFTER `emp_no`")
+      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` <%= @sql_int_type %> NOT NULL AFTER `emp_no`", template_variables)
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_add_column_spec.rb

@@ -1,15 +1,26 @@
-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 add 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 +46,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|
+        create_table "employee_clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.integer "emp_no",  limit: 4, null: false
           t.integer "club_id", limit: 4, null: false
         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 +78,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,7 +115,7 @@ 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|
+        create_table "employee_clubs", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.integer "emp_no",  limit: 4,   null: false
           t.integer "club_id", limit: 4,   null: false
           t.string  "any_col", limit: 255, null: false
@@ -112,7 +123,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         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
@@ -139,7 +150,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 }
@@ -148,27 +159,27 @@ 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
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-EOS
         remove_column("employee_clubs", "any_col")
 
         remove_column("employees", "age")
         remove_column("employees", "updated_at")
-      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 <<-EOS
         change_table("employee_clubs", {:bulk => true}) do |t|
           t.column("any_col", :string, {:limit=>255, :null=>false, :after=>"club_id"})
         end
@@ -177,10 +188,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.column("age", :integer, {:limit=>4, :null=>false, :after=>"hire_date"})
           t.column("updated_at", :date, {:after=>"age"})
         end
-      RUBY
+      EOS
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 end
-end