ridgepole 0.7.3.beta → 0.7.3.beta2

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

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
@@ -11,17 +11,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_actual_dsl) {
-      expected_dsl + (<<-EOS)
+    let(:sorted_actual_dsl) do
+      expected_dsl + <<-RUBY
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -29,8 +29,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(dump_with_default_fk_name: true) }
@@ -47,17 +47,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       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 sorted_actual_dsl
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy <<-RUBY
         remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
-      EOS
+      RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when drop fk when drop table' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
@@ -67,11 +67,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_dsl) {
-      erbh(<<-EOS)
+    let(:sorted_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -81,8 +81,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(dsl).migrate }
     subject { client(dump_with_default_fk_name: true) }

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

@@ -1,9 +1,9 @@
-describe 'Ridgepole::Client#diff -> migrate (with index)', condition: 5.1 do
+describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0' do
   context 'when create table with auto increment column' do
     let(:actual_dsl) { '' }
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "dept_no", null: false, auto_increment: true
@@ -12,8 +12,8 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: 5.1 do
           t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(create_table_with_index: true, mysql_dump_auto_increment: true) }
@@ -22,7 +22,7 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: 5.1 do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
 
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+      expect(delta.script).to match_fuzzy erbh(<<-ERB)
         create_table("dept_emp", {:primary_key=>["emp_no", "dept_no"]}) do |t|
           t.column("emp_no", :"integer", {:null=>false, :limit=>4})
           t.column("dept_no", :"integer", {:null=>false, :auto_increment=>true, :limit=>4})
@@ -31,7 +31,7 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: 5.1 do
           t.index(["dept_no"], <%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
           t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
         end
-      EOS
+      ERB
 
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate

data/spec/mysql57/json/add_json_column_spec.rb

@@ -1,23 +1,23 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when add virtual column' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.json    "attrs", null: false
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql57/json/change_json_column_spec.rb

@@ -1,24 +1,24 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change virtual column / not null -> null' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.json    "attrs", null: false
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.json    "attrs"
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -33,25 +33,25 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change virtual column / json -> string' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.json    "attrs", null: false
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.string  "attrs"
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -66,25 +66,25 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change virtual column / string -> json' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.string  "attrs"
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.json    "attrs", null: false
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql57/json/drop_json_column_spec.rb

@@ -1,23 +1,23 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when add virtual column' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.json    "attrs", null: false
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
           t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql57/virtual/add_virtual_column_spec.rb

@@ -1,16 +1,16 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
   context 'when add virtual column' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "books", force: :cascade do |t|
           t.string  "title"
           t.index ["title"], name: "index_books_on_title"
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "books", force: :cascade do |t|
           t.string   "title"
           t.virtual  "upper_title", type: :string, as: "upper(`title`)"
@@ -18,8 +18,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.index ["title"], name: "index_books_on_title"
           t.index ["title_length"], name: "index_books_on_title_length"
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql57/virtual/change_virtual_column_spec.rb

@@ -1,7 +1,7 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
   context 'when change virtual column' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "books", force: :cascade do |t|
           t.string   "title"
           t.virtual "upper_title", type: :string, null: false, as: "upper(`title`)"
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.index ["title"], name: "index_books_on_title"
           t.index ["title_length"], name: "index_books_on_title_length"
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "books", force: :cascade do |t|
           t.string   "title"
           t.virtual "upper_title", type: :string, null: false, as: "length(`title`)"
@@ -21,8 +21,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.index ["title"], name: "index_books_on_title"
           t.index ["title_length"], name: "index_books_on_title_length"
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql57/virtual/drop_virtual_column_spec.rb

@@ -1,7 +1,7 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
   context 'when drop virtual column' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "books", force: :cascade do |t|
           t.string   "title"
           t.virtual  "upper_title", type: :string, as: "upper(`title`)"
@@ -9,17 +9,17 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.index ["title"], name: "index_books_on_title"
           t.index ["title_length"], name: "index_books_on_title_length"
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "books", force: :cascade do |t|
           t.string  "title"
           t.index ["title"], name: "index_books_on_title"
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/postgresql/diff/diff_spec.rb

@@ -4,8 +4,8 @@ describe 'Ridgepole::Client.diff' do
   end
 
   context 'when change column' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
@@ -69,11 +69,11 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
@@ -137,19 +137,19 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
     subject { Ridgepole::Client }
 
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy <<-RUBY
         change_column("employee_clubs", "club_id", :integer, {:null=>true, :default=>nil})
 
         change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
-      EOS
+      RUBY
     }
   end
 
@@ -157,19 +157,19 @@ describe 'Ridgepole::Client.diff' do
     subject { Ridgepole::Client }
 
     context 'when adding a column to the last' do
-      let(:actual_dsl) { <<-EOS }
+      let(:actual_dsl) { <<-RUBY }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
       end
-      EOS
+      RUBY
 
-      let(:expected_dsl) { <<-EOS }
+      let(:expected_dsl) { <<-RUBY }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
         t.datetime "created_at", null: false
         t.datetime "updated_at", null: false
       end
-      EOS
+      RUBY
 
       # XXX:
       before { client }
@@ -183,20 +183,20 @@ describe 'Ridgepole::Client.diff' do
     end
 
     context 'when adding a column to the middle' do
-      let(:actual_dsl) { <<-EOS }
+      let(:actual_dsl) { <<-RUBY }
       create_table "users", force: :cascade do |t|
         t.datetime "created_at", null: false
       end
-      EOS
+      RUBY
 
-      let(:expected_dsl) { <<-EOS }
+      let(:expected_dsl) { <<-RUBY }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
         t.integer "age", null: false
         t.datetime "created_at", null: false
         t.datetime "updated_at", null: false
       end
-      EOS
+      RUBY
 
       # XXX:
       before { client }