ridgepole 0.6.6 → 0.7.0.alpha

data/spec/mysql/default_lambda/default_lambda_spec.rb

@@ -1,4 +1,4 @@
-describe 'Ridgepole::Client (use default:lambda)', condition: [:activerecord_5] do
+describe 'Ridgepole::Client (use default:lambda)' do
   context 'when create table with default:lambda' do
     subject { client }
 
@@ -62,9 +62,9 @@ describe 'Ridgepole::Client (use default:lambda)', condition: [:activerecord_5]
       expect(delta.differ?).to be_truthy
       delta.migrate
 
-      expect(subject.dump).to match_fuzzy <<-EOS
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
         create_table "foos", force: :cascade do |t|
-          t.datetime "bar", default: '1970-01-01 00:00:00', null: false
+          t.datetime "bar", default: <%= cond('5.1', '"1970-01-01 00:00:00"', "'1970-01-01 00:00:00'") %>, null: false
         end
       EOS
     end

data/spec/mysql/diff/diff2_spec.rb

@@ -166,14 +166,17 @@ describe 'Ridgepole::Client.diff' do
 
     subject { Ridgepole::Client }
 
+    # XXX: for AR 5.1
+    before { client }
+
     it {
-      delta = subject.diff(actual_dsl, expected_dsl, enable_mysql_unsigned: true)
+      delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
+      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond(5.1, comment: nil) %>)
 
-        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
-        change_column("employees", "gender", :string, {:limit=>2, :null=>false, :default=>nil})
+        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX"} + cond(5.1, comment: nil) %>)
+        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil} + cond(5.1, comment: nil) %>)
       EOS
     }
 

data/spec/mysql/diff/diff_spec.rb

@@ -140,14 +140,17 @@ describe 'Ridgepole::Client.diff' do
 
     subject { Ridgepole::Client }
 
+    # XXX: for AR 5.1
+    before { client }
+
     it {
-      delta = subject.diff(actual_dsl, expected_dsl, enable_mysql_unsigned: true)
+      delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
+      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond(5.1, comment: nil) %>)
 
-        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
-        change_column("employees", "gender", :string, {:limit=>2, :null=>false, :default=>nil})
+        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX"} + cond(5.1, comment: nil) %>)
+        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil} + cond(5.1, comment: nil) %>)
       EOS
     }
   end

data/spec/mysql/dump/dump_class_method_spec.rb

@@ -3,72 +3,22 @@ describe 'Ridgepole::Client.dump' do
     before { restore_tables }
     subject { Ridgepole::Client }
 
-    let(:options) {
-      opts = {}
-
-      if condition(:mysql_awesome_enabled)
-        opts.merge!(
-          enable_mysql_awesome: true,
-          dump_without_table_options: true
-        )
-      elsif condition(:activerecord_5)
-        opts.merge!(
-          dump_without_table_options: true
-        )
-      end
-
-      opts
-    }
-
-    let(:template_variables) {
-      opts = {
-        departments_ext: {},
-        employees_ext: {},
-        unsigned: {},
-        dept_manager_pk: {primary_key: ["emp_no", "dept_no"]},
-        dept_emp_pk: {primary_key: ["emp_no", "dept_no"]},
-        salaries_pk: {primary_key: ["emp_no", "from_date"]},
-        titles_pk: {primary_key: ["emp_no", "title", "from_date"]},
-      }
-
-      if condition(:mysql_awesome_enabled, :activerecord_5)
-        {limit: 4} >> opts[:employees_ext] if condition(:mysql_awesome_enabled)
-        {id: :integer} >> opts[:employees_ext]
-
-        opts.merge!(
-          departments_ext: {id: :string, limit: 4},
-          unsigned: {unsigned: true}
-        )
-      end
-
-      if condition(:activerecord_4)
-        opts.merge!(
-          dept_manager_pk: {id: false},
-          dept_emp_pk: {id: false},
-          salaries_pk: {id: false},
-          titles_pk: {id: false}
-        )
-      end
-
-      opts
-    }
-
     it {
-      expect(subject.dump(conn_spec, options)).to match_fuzzy erbh(<<-EOS, template_variables)
-        create_table "clubs", <%= i @unsigned + {force: :cascade} %> do |t|
-          t.string "name", <%= i limit(255) + {default: "", null: false} %>
+      expect(subject.dump(conn_spec, dump_without_table_options: true)).to match_fuzzy erbh(<<-EOS)
+        create_table "clubs", <%= i cond('5.1.', id: :integer) %>, unsigned: true, force: :cascade do |t|
+          t.string "name", default: "", null: false
         end
 
         <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
 
-        create_table "departments", primary_key: "dept_no", <%= i @departments_ext + {force: :cascade} %> do |t|
+        create_table "departments", primary_key: "dept_no", id: :string, limit: 4, force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
-        <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
+        <%= add_index "departments", ["dept_name"], {name: "dept_name", unique: true} + cond('5.0', using: :btree) %>
 
-        create_table "dept_emp", <%= i @dept_emp_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
+        create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.string  "dept_no",   limit: 4, null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
@@ -77,9 +27,9 @@ describe 'Ridgepole::Client.dump' do
         <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
         <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "dept_manager", <%= i @dept_manager_pk %>, force: :cascade do |t|
+        create_table "dept_manager", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
           t.string  "dept_no",   limit: 4, null: false
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
+          t.integer "emp_no", null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
@@ -87,14 +37,14 @@ describe 'Ridgepole::Client.dump' do
         <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
         <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "employee_clubs", <%= i @unsigned + {force: :cascade} %> do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} + @unsigned %>
-          t.integer "club_id", <%= i limit(4) + {null: false} + @unsigned %>
+        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
         end
 
         <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
 
-        create_table "employees", primary_key: "emp_no", <%= i @employees_ext + {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
@@ -102,17 +52,17 @@ describe 'Ridgepole::Client.dump' do
           t.date   "hire_date",             null: false
         end
 
-        create_table "salaries", <%= i @salaries_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
-          t.integer "salary", <%= i limit(4) + {null: false} %>
+        create_table "salaries", primary_key: ["emp_no", "from_date"], force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "salary", null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
         <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "titles", <%= i @titles_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
+        create_table "titles", primary_key: ["emp_no", "title", "from_date"], force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.string  "title",     limit: 50, null: false
           t.date    "from_date",            null: false
           t.date    "to_date"

data/spec/mysql/dump/dump_some_tables_spec.rb

@@ -1,31 +1,11 @@
 describe 'Ridgepole::Client#dump' do
-  let(:template_variables) {
-    opts = {
-      employees_ext: {},
-      salaries_pk: {primary_key: ["emp_no", "from_date"]},
-    }
-
-    if condition(:mysql_awesome_enabled, :activerecord_5)
-      {limit: 4} >> opts[:employees_ext] if condition(:mysql_awesome_enabled)
-      {id: :integer} >> opts[:employees_ext]
-    end
-
-    if condition(:activerecord_4)
-      opts.merge!(
-        salaries_pk: {id: false}
-      )
-    end
-
-    opts
-  }
-
   context 'when there is a tables (dump some tables)' do
     before { restore_tables }
     subject { client(tables: ['employees', 'salaries']) }
 
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
-        create_table "employees", primary_key: "emp_no", <%= i @employees_ext + {force: :cascade} %> do |t|
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+        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
@@ -33,9 +13,9 @@ describe 'Ridgepole::Client#dump' do
           t.date   "hire_date",             null: false
         end
 
-        create_table "salaries", <%= i @salaries_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
-          t.integer "salary", <%= i limit(4) + {null: false} %>
+        create_table "salaries", primary_key: ["emp_no", "from_date"], force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "salary", null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
@@ -59,8 +39,8 @@ describe 'Ridgepole::Client#dump' do
     }
 
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
-        create_table "employees", primary_key: "emp_no", <%= i @employees_ext + {force: :cascade} %> do |t|
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+        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 +48,9 @@ describe 'Ridgepole::Client#dump' do
           t.date   "hire_date",             null: false
         end
 
-        create_table "salaries", <%= i @salaries_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
-          t.integer "salary", <%= i limit(4) + {null: false} %>
+        create_table "salaries", primary_key: ["emp_no", "from_date"], force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "salary", null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end

data/spec/mysql/dump/dump_spec.rb

@@ -3,81 +3,48 @@ describe 'Ridgepole::Client#dump' do
     before { restore_tables }
     subject { client }
 
-    let(:template_variables) {
-      opts = {
-        departments_ext: {},
-        employees_ext: {},
-        unsigned: {},
-        dept_manager_pk: {primary_key: ["emp_no", "dept_no"]},
-        dept_emp_pk: {primary_key: ["emp_no", "dept_no"]},
-        salaries_pk: {primary_key: ["emp_no", "from_date"]},
-        titles_pk: {primary_key: ["emp_no", "title", "from_date"]},
-      }
-
-      if condition(:mysql_awesome_enabled, :activerecord_5)
-        opts[:employees_ext].unshift(limit: 4) if condition(:mysql_awesome_enabled)
-        opts[:employees_ext].unshift(id: :integer)
-
-        opts.merge!(
-          departments_ext: {id: :string, limit: 4},
-          unsigned: {unsigned: true}
-        )
-      end
-
-      if condition(:activerecord_4)
-        opts.merge!(
-          dept_manager_pk: {id: false},
-          dept_emp_pk: {id: false},
-          salaries_pk: {id: false},
-          titles_pk: {id: false}
-        )
-      end
-
-      opts
-    }
-
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
-        create_table "clubs", <%= i @unsigned + {force: :cascade} %> do |t|
-          t.string "name", <%= i limit(255) + {default: "", null: false} %>
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+        create_table "clubs", <%= i cond('5.1', id: :integer) %>, unsigned: true, force: :cascade do |t|
+          t.string "name", default: "", null: false
         end
 
-        <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
+        <%= add_index "clubs", ["name"], {name: "idx_name", unique: true} + cond('5.0', using: :btree) %>
 
-        create_table "departments", primary_key: "dept_no", <%= i @departments_ext + {force: :cascade} %> do |t|
+        create_table "departments", primary_key: "dept_no", id: :string, limit: 4, force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
-        <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
+        <%= add_index "departments", ["dept_name"], {name: "dept_name", unique: true} + cond('5.0', using: :btree) %>
 
-        create_table "dept_emp", <%= i @dept_emp_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
+        create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.string  "dept_no",   limit: 4, null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_emp", ["dept_no"], {name: "dept_no"} + cond('5.0', using: :btree) %>
         <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "dept_manager", <%= i @dept_manager_pk %>, force: :cascade do |t|
+        create_table "dept_manager", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
           t.string  "dept_no",   limit: 4, null: false
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
+          t.integer "emp_no", null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
-        <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
+        <%= add_index "dept_manager", ["dept_no"], {name: "dept_no"} + cond('5.0', using: :btree) %>
         <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "employee_clubs", <%= i @unsigned + {force: :cascade} %> do |t|
-          t.integer "emp_no",  <%= i limit(4) + {null: false} + @unsigned %>
-          t.integer "club_id", <%= i limit(4) + {null: false} + @unsigned %>
+        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
         end
 
         <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
 
-        create_table "employees", primary_key: "emp_no", <%= i @employees_ext + {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
@@ -85,17 +52,17 @@ describe 'Ridgepole::Client#dump' do
           t.date   "hire_date",             null: false
         end
 
-        create_table "salaries", <%= i @salaries_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
-          t.integer "salary", <%= i limit(4) + {null: false} %>
+        create_table "salaries", primary_key: ["emp_no", "from_date"], force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "salary", null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
         end
 
         <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "titles", <%= i @titles_pk %>, force: :cascade do |t|
-          t.integer "emp_no", <%= i limit(4) + {null: false} %>
+        create_table "titles", primary_key: ["emp_no", "title", "from_date"], force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.string  "title",     limit: 50, null: false
           t.date    "from_date",            null: false
           t.date    "to_date"

data/spec/mysql/dump/dump_without_table_options_spec.rb

@@ -1,23 +1,9 @@
-describe 'Ridgepole::Client#dump', condition: [:mysql_awesome_enabled, :activerecord_5] do
-  let(:template_variables) {
-    opts = {
-      table_comment: {comment: '"london" bridge "is" falling "down"'},
-    }
-
-    if condition(:activerecord_4)
-      opts.merge!(
-        table_comment: {}
-      )
-    end
-
-    opts
-  }
-
+describe 'Ridgepole::Client#dump' do
   let(:actual_dsl) {
-    erbh(<<-'EOS', template_variables)
+    erbh(<<-'EOS')
       create_table "books", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='\"london\" bridge \"is\" falling \"down\"'" do |t|
-        t.string   "title",      <%= i limit(255) + {null: false} %>
-        t.integer  "author_id",  <%= i limit(4) + {null: false} %>
+        t.string   "title",      null: false
+        t.integer  "author_id",  null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
@@ -26,10 +12,10 @@ describe 'Ridgepole::Client#dump', condition: [:mysql_awesome_enabled, :activere
 
   context 'when without table options' do
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "books", <%= i({unsigned: true, force: :cascade} + @table_comment) %> do |t|
-          t.string   "title",      <%= i limit(255) + {null: false} %>
-          t.integer  "author_id",  <%= i limit(4) + {null: false} %>
+      erbh(<<-EOS)
+        create_table "books", <%= i cond('5.1', id: :bigint) %>, unsigned: true, force: :cascade, comment: "\\"london\\" bridge \\"is\\" falling \\"down\\"" do |t|
+          t.string   "title",      null: false
+          t.integer  "author_id",  null: false
           t.datetime "created_at"
           t.datetime "updated_at"
         end
@@ -43,17 +29,4 @@ describe 'Ridgepole::Client#dump', condition: [:mysql_awesome_enabled, :activere
       expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
-
-  context 'when with table options' do
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(dump_without_table_options: false) }
-
-    it {
-      if condition(:activerecord_5)
-        skip
-      else
-        expect(subject.dump).to match_fuzzy actual_dsl
-      end
-    }
-  end
 end

data/spec/mysql/fk/migrate_change_fk_spec.rb

@@ -2,14 +2,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-create_table "parent", 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|
   t.integer "parent_id"
 end
 
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+<%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
 
 add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
       EOS
@@ -18,12 +18,12 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
     let(:sorted_actual_dsl) {
       erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id" <%= condition(:activerecord_4) ? ', limit: 4' : '' %>
+  t.integer "parent_id"
 end
 
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+<%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
 
-create_table "parent", force: :cascade do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
@@ -33,12 +33,12 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
     let(:expected_dsl) {
       erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id" <%= condition(:activerecord_4) ? ', limit: 4' : '' %>
+  t.integer "parent_id"
 end
 
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+<%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
 
-create_table "parent", force: :cascade do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"