ridgepole 0.7.1 → 0.7.2.beta

data/spec/mysql/migrate/migrate_add_column_spec.rb

@@ -133,15 +133,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 erbh(<<-EOS)
         change_table("employee_clubs", {:bulk=>true}) do |t|
           t.column("any_col", :string, {:null=>false, :after=>"club_id", :limit=>255})
@@ -153,7 +153,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/mysql/migrate/migrate_add_column_with_alter_extra_spec.rb

@@ -133,9 +133,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(alter_extra: 'FORCE')
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_add_column_with_script_spec.rb

@@ -133,7 +133,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
 
       script = <<-EOS
         echo "$1" | #{MYSQL_CLI} #{TEST_SCHEMA}
@@ -144,7 +144,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         delta.migrate(external_script: path)
       end
 
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/migrate/migrate_change_column2_spec.rb

@@ -81,9 +81,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_change_column3_spec.rb

@@ -82,9 +82,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
 
@@ -97,8 +97,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond(5.1, 'bigint', 'integer') %> "products_id"
-          t.<%= cond(5.1, 'bigint', 'integer') %> "user_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.index "products_id"
           t.index "user_id"
         end
@@ -136,9 +136,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond(5.1, 'bigint', 'integer') %> "products_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.string "products_type"
-          t.<%= cond(5.1, 'bigint', 'integer') %> "user_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.string "user_type"
           t.index ["products_type", "products_id"]
           t.index ["user_type", "user_id"]
@@ -202,8 +202,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond(5.1, 'bigint', 'integer') %> "products_id"
-          t.<%= cond(5.1, 'bigint', 'integer') %> "user_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.index ["products_id"], name: "index_employees_on_products_id", <%= i cond(5.0, using: :btree) %>
           t.index ["user_id"], name: "index_employees_on_user_id", <%= i cond(5.0, using: :btree) %>
         end
@@ -216,9 +216,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
 
@@ -256,9 +256,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond(5.1, 'bigint', 'integer') %> "products_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.string "products_type"
-          t.<%= cond(5.1, 'bigint', 'integer') %> "user_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.string "user_type"
           t.index ["products_type", "products_id"], name: "index_employees_on_products_type_and_products_id", <%= i cond(5.0, using: :btree) %>
           t.index ["user_type", "user_id"], name: "index_employees_on_user_type_and_user_id", <%= i cond(5.0, using: :btree) %>
@@ -272,9 +272,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_change_column5_spec.rb

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

data/spec/mysql/migrate/migrate_change_column6_spec.rb

@@ -37,13 +37,13 @@ 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
 
       expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `employees` (
-          `id` <%= cond(5.1, 'bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
+          `id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
           `birth_date` date NOT NULL,
           `first_name` varchar(14) NOT NULL,
@@ -97,13 +97,13 @@ 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
 
       expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `employees` (
-          `emp_id` <%= cond(5.1, 'bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
+          `emp_id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
           `birth_date` date NOT NULL,
           `first_name` varchar(14) NOT NULL,
@@ -157,9 +157,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
 
       expect(show_create_table_mysql('employees')).to match_fuzzy <<-EOS
         CREATE TABLE `employees` (
@@ -215,13 +215,13 @@ 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.sub(/, *primary_key: *"emp_id"/, '')
+      expect(subject.dump).to match_ruby expected_dsl.sub(/, *primary_key: *"emp_id"/, '')
 
       expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `employees` (
-          `id` <%= cond(5.1, 'bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
+          `id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
           `birth_date` date NOT NULL,
           `first_name` varchar(14) NOT NULL,

data/spec/mysql/migrate/migrate_change_column7_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 8, null: false
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -15,7 +15,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      expect(subject.dump).to match_fuzzy dsl.sub(/t.integer "emp_no", limit: 8/, 't.bigint "emp_no"')
+      expect(subject.dump).to match_ruby dsl.sub(/t.integer "emp_no", limit: 8/, 't.bigint "emp_no"')
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_falsey
     }

data/spec/mysql/migrate/migrate_change_column_default_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -12,10 +12,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 4, null: true
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -26,7 +26,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no"
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -39,7 +39,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
       delta.migrate
       expect(subject.dump).to match_fuzzy result_dsl
     }
@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -61,7 +61,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -74,9 +74,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
 
@@ -85,7 +85,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -106,7 +106,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -114,10 +114,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 4, default: 0, null: true
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -128,7 +128,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -141,7 +141,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
       delta.migrate
       expect(subject.dump).to match_fuzzy result_dsl
     }
@@ -152,7 +152,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -163,7 +163,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -174,7 +174,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", <%= i cond(5.0, default: 0) + {null: false} %>
-          t.float   "salary", limit: 24, null: false
+          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -193,7 +193,7 @@ 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 result_dsl
 
@@ -202,7 +202,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         expect(delta.differ?).to be_truthy
         expect(subject.dump).to match_fuzzy result_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_change_column_float_spec.rb

@@ -27,10 +27,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
-      delta.migrate
-      expect(subject.dump).to match_fuzzy actual_dsl
+
+      if condition('< 5.2.0.beta2')
+        expect(delta.differ?).to be_truthy
+        expect(subject.dump).to match_ruby actual_dsl
+        delta.migrate
+        expect(subject.dump).to match_ruby actual_dsl
+      else
+        expect(delta.differ?).to be_falsy
+      end
     }
   end
 

data/spec/mysql/migrate/migrate_change_column_spec.rb

@@ -130,27 +130,27 @@ 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 erbh(<<-EOS)
         change_table("employee_clubs", {:bulk => true}) do |t|
-          t.change("club_id", :integer, <%= {:null=>true, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
+          t.change("club_id", :integer, <%= {:null=>true, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
         end
 
         change_table("employees", {:bulk => true}) do |t|
-          t.change("last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond(5.1, comment: nil) %>)
-          t.change("gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
+          t.change("last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
+          t.change("gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
         end
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end