ridgepole 0.6.4 → 0.6.5.beta

data/spec/postgresql/diff/diff_spec.rb

@@ -1,8 +1,7 @@
-if postgresql?
 describe 'Ridgepole::Client.diff' do
   context 'when change column' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
@@ -66,11 +65,11 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
@@ -134,20 +133,19 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     subject { Ridgepole::Client }
 
     it {
-      delta = subject.diff(actual_dsl, expected_dsl, enable_mysql_unsigned: true)
+      delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-EOS
         change_column("employee_clubs", "club_id", :integer, {:null=>true, :default=>nil})
 
         change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
-      RUBY
+      EOS
     }
   end
 end
-end

data/spec/postgresql/dump/dump_spec.rb

@@ -1,11 +1,10 @@
-if postgresql?
 describe 'Ridgepole::Client#dump' do
   context 'when there is a tables' do
     before { restore_tables }
     subject { client }
 
     it {
-      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy <<-EOS
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
@@ -69,8 +68,7 @@ describe 'Ridgepole::Client#dump' do
         end
 
         add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree
-      RUBY
+      EOS
     }
   end
 end
-end

data/spec/postgresql/fk/migrate_change_fk_spec.rb

@@ -1,8 +1,7 @@
-if postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "parent", force: :cascade do |t|
 end
 
@@ -13,11 +12,11 @@ end
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
-      RUBY
+      EOS
     }
 
     let(:sorted_actual_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
@@ -28,11 +27,11 @@ create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
@@ -43,7 +42,7 @@ create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -53,10 +52,9 @@ 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 sorted_actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy sorted_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/postgresql/fk/migrate_create_fk_spec.rb

@@ -1,8 +1,7 @@
-if postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
 create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
@@ -11,14 +10,14 @@ add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 create_table "parent", force: :cascade do |t|
 end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      actual_dsl + (<<-RUBY)
+      actual_dsl + (<<-EOS)
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -27,34 +26,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
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end
@@ -66,11 +65,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"
 end
@@ -81,7 +80,7 @@ create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     before { client.diff('').migrate }
@@ -90,15 +89,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
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end
@@ -112,7 +111,7 @@ add_index "child", ["parent_id"], name: "par_id", using: :btree
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -126,7 +125,7 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
 
   context 'no name' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end
@@ -138,7 +137,7 @@ end
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 add_foreign_key "child", "parent"
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -152,13 +151,13 @@ add_foreign_key "child", "parent"
 
   context 'orphan fk' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -170,4 +169,3 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     }
   end
 end
-end

data/spec/postgresql/fk/migrate_drop_fk_spec.rb

@@ -1,8 +1,7 @@
-if 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"
 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)
+      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
         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"
 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/postgresql/migrate/migrate_add_column_spec.rb

@@ -1,8 +1,7 @@
-if postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when add column' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
@@ -64,11 +63,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
@@ -133,7 +132,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -142,27 +141,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
@@ -171,26 +170,26 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.column("age", :integer, {: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
 
   context 'when add column (int/noop)' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "dept_emp", id: false, force: :cascade do |t|
           t.integer "emp_no",              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",              null: false
           t.integer "emp_no2",             null: false
@@ -198,7 +197,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 }
@@ -207,14 +206,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\" integer NOT NULL")
+      expect(sql).to match_fuzzy("ALTER TABLE \"dept_emp\" ADD \"emp_no2\" integer NOT NULL")
     }
   end
 end
-end

data/spec/postgresql/migrate/migrate_change_column_default_spec.rb

@@ -1,26 +1,25 @@
-if postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column' do
     let(:actual_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no",    default: 0, null: false
           t.integer "salary",                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.integer "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,10 +28,9 @@ 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
     }
   end
 end
-end