ridgepole 0.7.1 → 0.7.2.beta

data/spec/mysql/migrate/migrate_same_default_null_spec.rb

@@ -30,9 +30,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       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 expected_dsl.gsub(/\s*,\s*null: true/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*null: true/, '')
     }
   end
 
@@ -67,9 +67,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to match_fuzzy actual_dsl.gsub(/\s*,\s*null: true/, '')
+      expect(subject.dump).to match_ruby actual_dsl.gsub(/\s*,\s*null: true/, '')
       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_same_spec.rb

@@ -2,7 +2,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when database and definition are same' do
     let(:dsl) {
       erbh(<<-EOS)
-        create_table "clubs", <%= i cond(5.1, {id: :integer}) + {unsigned: true, force: :cascade} %> do |t|
+        create_table "clubs", <%= i cond('>= 5.1',{id: :integer}) + {unsigned: true, force: :cascade} %> do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
@@ -30,13 +30,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond(5.1, {id: :integer}) + {unsigned: true, force: :cascade} %> do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1',{id: :integer}) + {unsigned: true, force: :cascade} %> do |t|
           t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
           t.index ["emp_no", "club_id"], name: "idx_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
@@ -68,9 +68,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       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
 end

data/spec/mysql/migrate/migrate_script_error_spec.rb

@@ -75,7 +75,7 @@ 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
 
       errmsg = Regexp.new(Regexp.escape <<-EOS.strip)
         33: add_index("employee_clubs", ["emp_no", "Xclub_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})

data/spec/mysql/migrate/migrate_skip_drop_table_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_skip_rename_column_spec.rb

@@ -130,9 +130,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       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 expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
   end
 end

data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb

@@ -131,9 +131,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] The table `employees` has already been renamed to the table `employees2`.")
       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 expected_dsl.gsub(/, renamed_from: 'employees'/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/, renamed_from: 'employees'/, '')
     }
   end
 end

data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb

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

data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb

@@ -143,9 +143,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(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_with_tables_spec.rb

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

data/spec/mysql/migrate/migrate_with_verbose_log_spec.rb

@@ -34,9 +34,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       Ridgepole::Logger.verbose = true
       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
       Ridgepole::Logger.verbose = false
 
       expected_verbose_infos = [

data/spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb

@@ -129,9 +129,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_drop_index_with_alter_spec.rb

@@ -129,9 +129,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/text_blob_types/text_blob_types_spec.rb

@@ -32,7 +32,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.text    "medium_text", limit: 16777215
           t.text    "long_text", limit: 4294967295
           t.decimal "unsigned_decimal", precision: 10, unsigned: true
-          t.float   "unsigned_float", limit: 24, unsigned: true
+          t.float   "unsigned_float", <%= i cond('< 5.2.0.beta2', limit: 24) %>, unsigned: true
           t.bigint  "unsigned_bigint", unsigned: true
           t.integer "unsigned_integer", unsigned: true
         end

data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb

@@ -2,7 +2,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
@@ -21,7 +21,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
@@ -35,7 +35,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -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
 end

data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb

@@ -7,7 +7,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
       EOS
     }
@@ -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, dump_with_default_fk_name: 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=>"fk_rails_e74ce85cbc"})
       EOS
       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
     let(:dsl) {
       erbh(<<-EOS)
         # Define parent before child
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
@@ -64,7 +64,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -86,7 +86,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:dsl) {
       erbh(<<-EOS)
         # Define parent before child
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
@@ -113,7 +113,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:dsl) {
       erbh(<<-EOS)
         # Define parent before child
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"

data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -2,7 +2,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
@@ -27,7 +27,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
       EOS
     }
@@ -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,14 +51,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
         remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when drop fk when drop table' do
     let(:dsl) {
       erbh(<<-EOS)
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
@@ -77,7 +77,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"

data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb

@@ -33,9 +33,9 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: 5.1 do
         end
       EOS
 
-      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/mysql57/json/add_json_column_spec.rb

@@ -25,9 +25,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/mysql57/json/change_json_column_spec.rb

@@ -26,9 +26,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
 
@@ -59,9 +59,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
 
@@ -92,9 +92,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/mysql57/json/drop_json_column_spec.rb

@@ -25,9 +25,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/mysql57/virtual/add_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/mysql57/virtual/change_virtual_column_spec.rb

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