ridgepole 0.8.12 → 0.9.1

data/spec/mysql/migrate/migrate_change_column2_spec.rb

@@ -10,7 +10,7 @@ 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.index ["gender"], name: "gender", <%= i cond(5.0, using: :btree) %>
+          t.index ["gender"], name: "gender"
         end
       ERB
     end
@@ -23,7 +23,7 @@ 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.index :gender, name: :gender, <%= i cond(5.0, using: :btree) %>
+          t.index :gender, name: :gender
         end
       ERB
     end
@@ -46,7 +46,7 @@ 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.index ["gender"], name: "gender", <%= i cond(5.0, using: :btree) %>
+          t.index ["gender"], name: "gender"
         end
       ERB
     end
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   :hire_date2, null: false
-          t.index :last_name, name: :last_name, <%= i cond(5.0, using: :btree) %>
+          t.index :last_name, name: :last_name
         end
       ERB
     end
@@ -72,7 +72,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date2", null: false
-          t.index ["last_name"], name: "last_name", <%= i cond(5.0, using: :btree) %>
+          t.index ["last_name"], name: "last_name"
         end
       ERB
     end

data/spec/mysql/migrate/migrate_change_column3_spec.rb

@@ -99,7 +99,7 @@ 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') %> "user_id"
+          t.bigint "user_id"
           t.index "user_id"
         end
       ERB
@@ -136,7 +136,7 @@ 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') %> "user_id"
+          t.bigint "user_id"
           t.string "user_type"
           t.index ["user_type", "user_id"]
         end
@@ -169,7 +169,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) do
       erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id", unsigned: true
+          t.bigint "user_id", unsigned: true
           t.string "user_type"
           t.index ["user_type", "user_id"]
         end
@@ -227,8 +227,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') %> "user_id"
-          t.index ["user_id"], name: "index_employees_on_user_id", <%= i cond(5.0, using: :btree) %>
+          t.bigint "user_id"
+          t.index ["user_id"], name: "index_employees_on_user_id"
         end
       ERB
     end
@@ -279,9 +279,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') %> "user_id"
+          t.bigint "user_id"
           t.string "user_type"
-          t.index ["user_type", "user_id"], name: "index_employees_on_user_type_and_user_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["user_type", "user_id"], name: "index_employees_on_user_type_and_user_id"
         end
       ERB
     end
@@ -310,7 +310,7 @@ 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') %> "user_id"
+          t.bigint "user_id"
           t.index "user_id"
         end
 
@@ -381,8 +381,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') %> "user_id"
-          t.index ["user_id"], name: "index_employees_on_user_id", <%= i cond(5.0, using: :btree) %>
+          t.bigint "user_id"
+          t.index ["user_id"], name: "index_employees_on_user_id"
         end
         create_table "users", force: :cascade do |t|
         end

data/spec/mysql/migrate/migrate_change_column5_spec.rb

@@ -12,7 +12,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", <%= i cond(5.0, limit: 65535) %>
+          t.binary   "registered_name"
         end
       ERB
     end
@@ -70,7 +70,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", <%= i cond(5.0, limit: 65535) %>
+          t.binary   "registered_name"
         end
       ERB
     end
@@ -98,7 +98,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", <%= i cond(5.0, limit: 65535) %>
+          t.binary   "registered_name"
         end
       ERB
     end

data/spec/mysql/migrate/migrate_change_column6_spec.rb

@@ -12,7 +12,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", <%= i cond(5.0, limit: 65535) %>
+          t.binary   "registered_name"
         end
       ERB
     end
@@ -45,7 +45,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `employees` (
-          `id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
+          `id` bigint(20) NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
           `birth_date` date NOT NULL,
           `first_name` varchar(14) NOT NULL,
@@ -72,7 +72,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", <%= i cond(5.0, limit: 65535) %>
+          t.binary   "registered_name"
         end
       ERB
     end
@@ -105,7 +105,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `employees` (
-          `emp_id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
+          `emp_id` bigint(20) NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
           `birth_date` date NOT NULL,
           `first_name` varchar(14) NOT NULL,
@@ -132,7 +132,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", <%= i cond(5.0, limit: 65535) %>
+          t.binary   "registered_name"
         end
       ERB
     end
@@ -190,7 +190,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", <%= i cond(5.0, limit: 65535) %>
+          t.binary   "registered_name"
         end
       ERB
     end
@@ -223,7 +223,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `employees` (
-          `id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
+          `id` bigint(20) 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_column8_spec.rb

@@ -2,14 +2,16 @@
 
 describe 'Ridgepole::Client#diff -> migrate' do
   before { subject.diff(actual_dsl).migrate }
-  subject { client(table_options: table_options, dump_without_table_options: dump_without_table_options) }
+  subject { client(table_options: table_options, table_hash_options: table_hash_options, dump_without_table_options: dump_without_table_options) }
 
   let(:warning_regexp) { /Table option changes are ignored/ }
   let(:dump_without_table_options) { false }
+  let(:table_options) { nil }
+  let(:table_hash_options) { {} }
 
   let(:actual_dsl) do
     erbh(<<-ERB)
-      create_table "employees", primary_key: "emp_no", force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+      create_table "employees", primary_key: "emp_no", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' }) %> do |t|
       end
     ERB
   end
@@ -21,7 +23,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     ERB
   end
 
-  context 'when change options (no change)' do
+  context 'when change options (no change)', condition: '< 6.1' do
     let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8' }
 
     it {
@@ -31,7 +33,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
-  context 'when change options (change)' do
+  context 'when change options (change)', condition: '< 6.1' do
     let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4' }
 
     it {
@@ -41,7 +43,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
-  context 'when dump_without_table_options => true' do
+  context 'when dump_without_table_options => true', condition: '< 6.1' do
     let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4' }
     let(:dump_without_table_options) { true }
 
@@ -51,4 +53,35 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_falsey
     }
   end
+
+  context 'when change options (no change)', condition: '>= 6.1' do
+    let(:table_hash_options) { { charset: 'utf8' } }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn).with(warning_regexp)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change options (change)', condition: '>= 6.1' do
+    let(:table_hash_options) { { charset: 'utf8mb4' } }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(warning_regexp)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when dump_without_table_options => true', condition: '>= 6.1' do
+    let(:table_hash_options) { { charset: 'utf8mb4' } }
+    let(:dump_without_table_options) { true }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
 end

data/spec/mysql/migrate/migrate_change_column_default_spec.rb

@@ -175,7 +175,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:result_dsl) do
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
-          t.integer "emp_no", <%= i cond(5.0, default: 0) + {null: false} %>
+          t.integer "emp_no", 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
@@ -187,25 +187,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      if condition(5.0)
-        expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] Table `salaries`: `default: nil` is ignored when `null: false`. Please apply twice')
-      else
-        expect(Ridgepole::Logger.instance).to_not receive(:warn)
-      end
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
 
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
       expect(subject.dump).to match_fuzzy result_dsl
-
-      if condition(5.0)
-        delta = subject.diff(expected_dsl)
-        expect(delta.differ?).to be_truthy
-        expect(subject.dump).to match_fuzzy result_dsl
-        delta.migrate
-        expect(subject.dump).to match_ruby expected_dsl
-      end
     }
   end
 end

data/spec/mysql/migrate/migrate_change_column_spec.rb

@@ -6,12 +6,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", 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", force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
-          t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_name"], name: "dept_name", unique: true
         end
 
         create_table "dept_emp", id: false, force: :cascade do |t|
@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_no", null: false
           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
 
         create_table "dept_manager", id: false, force: :cascade do |t|
@@ -28,14 +28,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false
           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
 
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id"
         end
 
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no"
         end
 
         create_table "titles", id: false, force: :cascade do |t|
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "title", limit: 50, null: false
           t.date    "from_date", null: false
           t.date    "to_date"
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no"
         end
       ERB
     end
@@ -68,12 +68,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", 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", force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
-          t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_name"], name: "dept_name", unique: true
         end
 
         create_table "dept_emp", id: false, force: :cascade do |t|
@@ -81,8 +81,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_no", null: false
           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
 
         create_table "dept_manager", id: false, force: :cascade do |t|
@@ -90,14 +90,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false
           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
 
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id"
-          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id"
         end
 
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
@@ -113,7 +113,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no"
         end
 
         create_table "titles", id: false, force: :cascade do |t|
@@ -121,7 +121,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "title", limit: 50, null: false
           t.date    "from_date", null: false
           t.date    "to_date"
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no"
         end
       ERB
     end
@@ -143,12 +143,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
         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, :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, :comment=>nil})
+          t.change("gender", :string, **{:limit=>2, :null=>false, :default=>nil, :unsigned=>false, :comment=>nil})
         end
       ERB
       delta.migrate