ridgepole 0.7.1 → 0.7.2.beta

data/spec/mysql57/virtual/drop_virtual_column_spec.rb

@@ -27,9 +27,9 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 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/postgresql/dump/dump_spec.rb

@@ -5,7 +5,7 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to match_fuzzy erbh(<<-EOS)
-        create_table "clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
+        create_table "clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
           t.string "name", limit: 255, default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
@@ -33,13 +33,13 @@ describe 'Ridgepole::Client#dump' do
           t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
           t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond(5.1, default: nil) %>, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1',default: nil) %>, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false

data/spec/postgresql/fk/migrate_change_fk_spec.rb

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

data/spec/postgresql/fk/migrate_create_fk_spec.rb

@@ -24,20 +24,20 @@ 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
         add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
@@ -135,20 +135,20 @@ 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
         add_foreign_key("child", "parent", {})
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 

data/spec/postgresql/fk/migrate_drop_fk_spec.rb

@@ -40,7 +40,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
 
     it {
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         remove_foreign_key("child", {:name=>"child_ibfk_1"})
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
@@ -137,7 +137,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
 
     it {
@@ -148,7 +148,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         remove_foreign_key("child", "parent")
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 

data/spec/postgresql/migrate/migrate_add_column_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("employee_clubs", {:bulk => true}) do |t|
           t.column("any_col", :string, {:limit=>255, :null=>false})
@@ -149,7 +149,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
 
@@ -183,10 +183,10 @@ 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
       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("ALTER TABLE \"dept_emp\" ADD \"emp_no2\" integer NOT NULL")
     }

data/spec/postgresql/migrate/migrate_bigint_spec.rb

@@ -17,7 +17,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
 
@@ -45,7 +45,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 expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/postgresql/migrate/migrate_change_column_default_spec.rb

@@ -28,9 +28,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/postgresql/migrate/migrate_change_column_spec.rb

@@ -126,15 +126,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("employee_clubs", {:bulk => true}) do |t|
           t.change("club_id", :integer, {:null=>true, :default=>nil})
@@ -145,7 +145,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
 

data/spec/postgresql/migrate/migrate_change_index_spec.rb

@@ -128,15 +128,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_index({:name=>"idx_dept_emp_emp_no"})

data/spec/postgresql/migrate/migrate_check_relation_column_type_spec.rb

@@ -51,9 +51,9 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
 
       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
 
@@ -104,9 +104,9 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
       expect(Ridgepole::Logger.instance).to_not receive(:warn)
       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/postgresql/migrate/migrate_create_table_spec.rb

@@ -110,9 +110,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/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb

@@ -22,9 +22,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       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
 
@@ -47,9 +47,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
     }
   end
 
@@ -89,9 +89,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         delta = subject.diff(expected_dsl)
         expect(delta.differ?).to be_falsey
-        expect(subject.dump).to match_fuzzy actual_dsl
+        expect(subject.dump).to match_ruby actual_dsl
         delta.migrate
-        expect(subject.dump).to match_fuzzy actual_dsl
+        expect(subject.dump).to match_ruby actual_dsl
       }
     end
 
@@ -101,9 +101,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/postgresql/migrate/migrate_drop_column_spec.rb

@@ -122,15 +122,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")
@@ -148,7 +148,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/postgresql/migrate/migrate_drop_column_with_index_spec.rb

@@ -117,23 +117,23 @@ 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 = 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
     }
 
     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 erbh(<<-EOS)
 change_table("dept_emp", {:bulk => true}) do |t|
   t.remove("emp_no")
@@ -158,7 +158,7 @@ change_table("employees", {:bulk => true}) do |t|
 end
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/postgresql/migrate/migrate_drop_index_spec.rb

@@ -127,15 +127,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"})
@@ -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/postgresql/migrate/migrate_drop_table_spec.rb

@@ -112,9 +112,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