ridgepole 0.6.6 → 0.7.0.alpha

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -1,34 +1,20 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      parent_id_opts: {},
-    }
-
-    if condition(:mysql_awesome_enabled)
-      opts.merge!(
-        parent_id_opts: {unsigned: true}
-      )
-    end
-
-    opts
-  }
-
   context 'when create fk' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", <%= i limit(4) + @parent_id_opts %>
+  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", <%= i unsigned(true) + {force: :cascade} %> do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
       EOS
     }
 
     let(:expected_dsl) {
-      erbh(actual_dsl + <<-EOS, template_variables)
+      erbh(actual_dsl + <<-EOS)
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
@@ -67,29 +53,29 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
 
   context 'when create fk when create table' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", <%= i limit(4) + @parent_id_opts %>
+  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"
 
-create_table "parent", <%= i unsigned(true) + {force: :cascade} %> do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
       EOS
     }
 
     let(:sorted_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", <%= i limit(4) + @parent_id_opts %>
+  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", <%= i unsigned(true) + {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"
@@ -109,18 +95,18 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
 
   context 'already defined' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 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"
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 
-create_table "parent", force: :cascade do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
       EOS
     }
@@ -136,16 +122,16 @@ end
 
   context 'no name' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 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"
 
-create_table "parent", force: :cascade do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
       EOS
     }
@@ -161,10 +147,10 @@ end
 
   context 'orphan fk' do
     let(:dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 
-create_table "parent", force: :cascade do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
       EOS
     }

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -1,29 +1,15 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      parent_id_opts: {},
-    }
-
-    if condition(:mysql_awesome_enabled)
-      opts.merge!(
-        parent_id_opts: {unsigned: true}
-      )
-    end
-
-    opts
-  }
-
   context 'when drop fk' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
-create_table "parent", <%= i unsigned(true) + {force: :cascade} %> do |t|
+      erbh(<<-EOS)
+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", <%= i limit(4) + @parent_id_opts %>
+  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"
       EOS
@@ -37,14 +23,14 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", <%= i limit(4) + @parent_id_opts %>
+  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", <%= i unsigned(true) + {force: :cascade} %> do |t|
+create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
 end
       EOS
     }
@@ -82,30 +68,30 @@ end
 
   context 'when drop fk when drop table' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
-create_table "parent", <%= i unsigned(true) + {force: :cascade} %> do |t|
+      erbh(<<-EOS)
+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", <%= i limit(4) + @parent_id_opts %>
+  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"
       EOS
     }
 
     let(:sorted_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", <%= i limit(4) + @parent_id_opts %>
+  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", <%= i unsigned(true) + {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"

data/spec/mysql/migrate/migrate_add_column2_spec.rb

@@ -4,11 +4,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       sql_int_type: 'int(11)',
     }
 
-    if condition(:mysql_awesome_enabled, :activerecord_5)
-      opts.merge!(
-        sql_int_type: 'int'
-      )
-    end
+    opts.merge!(
+      sql_int_type: 'int'
+    )
 
     opts
   }

data/spec/mysql/migrate/migrate_add_column_order_spec.rb

@@ -1,23 +1,9 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      sql_int_type: 'int(11)',
-    }
-
-    if condition(:mysql_awesome_enabled, :activerecord_5)
-      opts.merge!(
-        sql_int_type: 'int'
-      )
-    end
-
-    opts
-  }
-
   context 'when add column to first' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", force: :cascade do |t|
-          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          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
@@ -26,10 +12,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", force: :cascade do |t|
-          t.integer "emp_no0",   <%= i limit(4) + {null: false} %>
-          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.integer "emp_no0",   null: false
+          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
@@ -47,9 +33,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl
 
-      expect(show_create_table_mysql('dept_emp')).to match_fuzzy <<-EOS
+      expect(show_create_table_mysql('dept_emp')).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `dept_emp` (
-          `id` int(11) NOT NULL AUTO_INCREMENT,
+          `id` <%= cond(5.1, 'bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `emp_no0` int(11) NOT NULL,
           `emp_no` int(11) NOT NULL,
           `dept_no` varchar(4) NOT NULL,
@@ -63,9 +49,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when add column to first (no id)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          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
@@ -74,10 +60,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no0",   <%= i limit(4) + {null: false} %>
-          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
+          t.integer "emp_no0",   null: false
+          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
@@ -109,7 +95,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when add column to first (with pk)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", primary_key: "emp_no", force: :cascade do |t|
           t.string  "dept_no",   limit: 4, null: false
           t.date    "from_date",           null: false
@@ -119,9 +105,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", primary_key: "emp_no", force: :cascade do |t|
-          t.integer "emp_no0",   <%= i limit(4) + {null: false} %>
+          t.integer "emp_no0",   null: false
           t.string  "dept_no",   limit: 4, null: false
           t.date    "from_date",           null: false
           t.date    "to_date",             null: false
@@ -139,9 +125,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_fuzzy expected_dsl
 
-      expect(show_create_table_mysql('dept_emp')).to match_fuzzy <<-EOS
+      expect(show_create_table_mysql('dept_emp')).to match_fuzzy erbh(<<-EOS)
         CREATE TABLE `dept_emp` (
-          `emp_no` int(11) NOT NULL AUTO_INCREMENT,
+          `emp_no` <%= cond(5.1, 'bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `emp_no0` int(11) NOT NULL,
           `dept_no` varchar(4) NOT NULL,
           `from_date` date NOT NULL,
@@ -154,7 +140,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when add column to first (with multiple pk)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
           t.integer "emp_no1",             null: false
           t.integer "emp_no2",             null: false
@@ -166,7 +152,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
           t.integer "emp_no1",             null: false
           t.integer "emp_no2",             null: false
@@ -182,8 +168,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      skip if condition(:activerecord_4)
-
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
@@ -206,7 +190,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when add column to first (with multiple pk2)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
           t.integer "emp_no1",             null: false
           t.integer "emp_no2",             null: false
@@ -218,7 +202,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
           t.integer "emp_no0",             null: false
           t.integer "emp_no1",             null: false
@@ -234,8 +218,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      skip if condition(:activerecord_4)
-
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl

data/spec/mysql/migrate/migrate_change_column5_spec.rb

@@ -2,7 +2,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (binary: blob -> varbinary)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
+        create_table "employees", primary_key: "emp_no", 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
@@ -10,14 +10,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date     "hire_date",                     null: false
           t.datetime "created_at",                    null: false
           t.datetime "updated_at",                    null: false
-          t.binary   "registered_name", limit: 65535
+          t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
       EOS
     }
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
+        create_table "employees", primary_key: "emp_no", 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
@@ -45,7 +45,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (binary: varbinary -> blob)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
+        create_table "employees", primary_key: "emp_no", 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
@@ -60,7 +60,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
+        create_table "employees", primary_key: "emp_no", 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,7 +68,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date     "hire_date",                     null: false
           t.datetime "created_at",                    null: false
           t.datetime "updated_at",                    null: false
-          t.binary   "registered_name", limit: 65535
+          t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
       EOS
     }
@@ -87,7 +87,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when change column (binary without limit)' do
     let(:actual_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date",                  null: false
           t.string   "first_name",      limit: 14,  null: false
@@ -96,7 +96,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date     "hire_date",                   null: false
           t.datetime "created_at",                  null: false
           t.datetime "updated_at",                  null: false
-          t.binary   "registered_name", limit: 65535
+          t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
       EOS
     }