ridgepole 0.8.9 → 0.9.0.rc1

data/spec/mysql/text_blob_types/text_blob_types_spec.rb

@@ -26,8 +26,8 @@ describe 'Ridgepole::Client (with new text/blob types)' do
       delta.migrate
 
       expect(subject.dump).to match_ruby erbh(<<-ERB)
-        create_table "foos", id: :integer, unsigned: true, force: :cascade do |t|
-          t.binary  "blob", <%= i cond(5.0, limit: 65535) %>
+        create_table "foos", <%= i cond(">= 6.1", { id: { type: :integer, unsigned: true } }, { id: :integer, unsigned: true }) %>, force: :cascade do |t|
+          t.binary  "blob"
           t.<%= cond('< 6.0.0.beta2', :blob, :binary) %> "tiny_blob", <%= i cond('< 6.0.0.beta2', {limit: 255}, {size: :tiny}) %>
           t.binary  "medium_blob", <%= i cond('< 6.0.0.beta2', {limit: 16777215}, {size: :medium}) %>
           t.binary  "long_blob", <%= i cond('< 6.0.0.beta2', {limit: 4294967295}, {size: :long}) %>

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

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

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

@@ -6,10 +6,10 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -47,12 +47,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:dsl) do
       erbh(<<-ERB)
         # Define parent before child
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -63,10 +63,10 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -88,12 +88,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:dsl) do
       erbh(<<-ERB)
         # Define parent before child
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -115,7 +115,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:dsl) do
       erbh(<<-ERB)
         # Define parent before child
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", 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

@@ -4,12 +4,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -26,10 +26,10 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -60,12 +60,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk when drop table' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -76,10 +76,10 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", 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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0' do
+describe 'Ridgepole::Client#diff -> migrate (with index)' do
   context 'when create table with auto increment column' do
     let(:actual_dsl) { '' }
 
@@ -11,8 +11,8 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0'
           t.integer "dept_no", null: false, auto_increment: true
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          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) %>
+          t.index ["dept_no"], name: "dept_no"
+          t.index ["emp_no"], name: "emp_no"
         end
       ERB
     end
@@ -30,8 +30,8 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0'
           t.column("dept_no", :"integer", **{:null=>false, :auto_increment=>true, :limit=>4})
           t.column("from_date", :"date", **{:null=>false})
           t.column("to_date", :"date", **{:null=>false})
-          t.index(["dept_no"], **<%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
-          t.index(["emp_no"], **<%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
+          t.index(["dept_no"], **{:name=>"dept_no"})
+          t.index(["emp_no"], **{:name=>"emp_no"})
         end
       ERB
 

data/spec/mysql57/json/add_json_column_spec.rb

@@ -6,7 +6,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end
@@ -16,7 +16,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end

data/spec/mysql57/json/change_json_column_spec.rb

@@ -7,7 +7,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end
@@ -17,7 +17,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end
@@ -40,7 +40,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end
@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end
@@ -73,7 +73,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end
@@ -83,7 +83,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end

data/spec/mysql57/json/drop_json_column_spec.rb

@@ -7,7 +7,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end
@@ -16,7 +16,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["title"], name: "index_books_on_title"
         end
       ERB
     end

data/spec/mysql57/virtual/add_virtual_column_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
+describe 'Ridgepole::Client#diff -> migrate' do
   context 'when add virtual column' do
     let(:actual_dsl) do
       <<-RUBY

data/spec/mysql57/virtual/change_virtual_column_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
+describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change virtual column' do
     let(:actual_dsl) do
       <<-RUBY

data/spec/mysql57/virtual/drop_virtual_column_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
+describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop virtual column' do
     let(:actual_dsl) do
       <<-RUBY

data/spec/postgresql/dump/dump_spec.rb

@@ -7,14 +7,14 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to match_fuzzy erbh(<<-ERB)
-        create_table "clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
+        create_table "clubs", 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) %>
+          t.index ["name"], name: "idx_name", unique: true
         end
 
-        create_table "departments", primary_key: "dept_no", id: :string, limit: 4, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= i cond(">= 6.1", { id: { type: :string, limit: 4 } }, { id: :string, limit: 4 }) %>, force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
-          t.index ["dept_name"], name: "idx_dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_name"], name: "idx_dept_name", unique: true
         end
 
         create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -22,8 +22,8 @@ describe 'Ridgepole::Client#dump' do
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "idx_dept_emp_dept_no"
+          t.index ["emp_no"], name: "idx_dept_emp_emp_no"
         end
 
         create_table "dept_manager", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -31,17 +31,17 @@ describe 'Ridgepole::Client#dump' do
           t.integer "emp_no", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "idx_dept_manager_dept_no"
+          t.index ["emp_no"], name: "idx_dept_manager_emp_no"
         end
 
-        create_table "employee_clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
+        create_table "employee_clubs", 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) %>
+          t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id"
         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, 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
@@ -53,7 +53,7 @@ describe 'Ridgepole::Client#dump' do
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_salaries_emp_no"
         end
 
         create_table "titles", primary_key: ["emp_no", "title", "from_date"], force: :cascade do |t|
@@ -61,7 +61,7 @@ describe 'Ridgepole::Client#dump' do
           t.string  "title", limit: 50, null: false
           t.date    "from_date", null: false
           t.date    "to_date"
-          t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_titles_emp_no"
         end
       ERB
     }

data/spec/postgresql/fk/migrate_change_fk_spec.rb

@@ -9,7 +9,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
@@ -20,7 +20,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -34,7 +34,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -65,7 +65,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", on_delete: :cascade
@@ -76,7 +76,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -90,7 +90,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|

data/spec/postgresql/fk/migrate_create_fk_spec.rb

@@ -6,7 +6,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -52,7 +52,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
@@ -63,7 +63,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -94,7 +94,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
@@ -117,7 +117,7 @@ describe 'Ridgepole::Client#diff -> migrate' 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) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|