ridgepole 0.6.6 → 0.7.0.alpha

data/spec/postgresql/diff/diff_spec.rb

@@ -171,6 +171,9 @@ describe 'Ridgepole::Client.diff' do
       end
       EOS
 
+      # XXX:
+      before { client }
+
       it "doesn't warn anything" do
         expect(Ridgepole::Logger.instance).to_not receive(:warn)
         delta = subject.diff(actual_dsl, expected_dsl)
@@ -195,6 +198,9 @@ describe 'Ridgepole::Client.diff' do
       end
       EOS
 
+      # XXX:
+      before { client }
+
       it 'warns position' do
         expect(Ridgepole::Logger.instance).to receive(:warn).with(/PostgreSQL doesn't support adding a new column .* users\.name/)
         expect(Ridgepole::Logger.instance).to receive(:warn).with(/PostgreSQL doesn't support adding a new column .* users\.age/)

data/spec/postgresql/dump/dump_spec.rb

@@ -1,47 +1,23 @@
 describe 'Ridgepole::Client#dump' do
-  let(:template_variables) {
-    opts = {
-      departments_ext: {id: :string, limit: 4},
-      employees_ext: {id: :integer},
-      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(:activerecord_4)
-      opts.merge!(
-        departments_ext: {},
-        employees_ext: {},
-        dept_manager_pk: {id: false},
-        dept_emp_pk: {id: false},
-        salaries_pk: {id: false},
-        titles_pk: {id: false}
-      )
-    end
-
-    opts
-  }
-
   context 'when there is a tables' do
     before { restore_tables }
     subject { client }
 
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
-        create_table "clubs", force: :cascade do |t|
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+        create_table "clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
           t.string "name", limit: 255, 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: "idx_dept_name", unique: true, using: :btree %>
 
-        create_table "dept_emp", <%= i @dept_emp_pk %>, force: :cascade do |t|
+        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
@@ -51,7 +27,7 @@ describe 'Ridgepole::Client#dump' do
         <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
         <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_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",              null: false
           t.date    "from_date",           null: false
@@ -61,21 +37,21 @@ describe 'Ridgepole::Client#dump' do
         <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
         <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
 
-        create_table "employee_clubs", force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
           t.integer "emp_no",  null: false
           t.integer "club_id", null: false
         end
 
         <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_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
           t.date   "hire_date",             null: false
         end
 
-        create_table "salaries", <%= i @salaries_pk %>, force: :cascade do |t|
+        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
@@ -84,7 +60,7 @@ describe 'Ridgepole::Client#dump' do
 
         <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
 
-        create_table "titles", <%= i @titles_pk %>, force: :cascade do |t|
+        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

data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb

@@ -1,14 +1,14 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
+describe 'Ridgepole::Client#diff -> migrate' do
   subject { client }
 
   context 'when add_index contains expression' do
     let(:actual_dsl) { '' }
-    let(:expected_dsl) { <<-EOS }
+    let(:expected_dsl) { erbh(<<-EOS) }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
         t.datetime "created_at", null: false
         t.datetime "updated_at", null: false
-        t.index "lower((name)::text)", name: "index_users_on_lower_name", using: :btree
+        t.index "lower((name)::text)", <%= i({name: "index_users_on_lower_name"} + cond(5.0, using: :btree)) %>
       end
     EOS
 

data/spec/postgresql/migrate/migrate_bigint_spec.rb

@@ -3,19 +3,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) { '' }
 
     let(:expected_dsl) {
-      if condition(:activerecord_5)
-        erbh(<<-EOS)
-          create_table "bigint_test", id: false, force: :cascade do |t|
-            t.bigint "b"
-          end
-        EOS
-      else
-        erbh(<<-EOS)
-          create_table "bigint_test", id: false, force: :cascade do |t|
-            t.integer "b", limit: 8
-          end
-        EOS
-      end
+      erbh(<<-EOS)
+        create_table "bigint_test", id: false, force: :cascade do |t|
+          t.bigint "b"
+        end
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -39,19 +31,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     let(:expected_dsl) {
-      if condition(:activerecord_5)
-        erbh(<<-EOS)
-          create_table "bigint_test", id: false, force: :cascade do |t|
-            t.bigint "b"
-          end
-        EOS
-      else
-        erbh(<<-EOS)
-          create_table "bigint_test", id: false, force: :cascade do |t|
-            t.integer "b", limit: 8
-          end
-        EOS
-      end
+      erbh(<<-EOS)
+        create_table "bigint_test", id: false, force: :cascade do |t|
+          t.bigint "b"
+        end
+      EOS
     }
 
     before { subject.diff(dsl).migrate }

data/spec/postgresql/migrate/migrate_create_table_spec.rb

@@ -7,15 +7,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       titles_pk: {primary_key: ["emp_no", "title", "from_date"]},
     }
 
-    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
   }
 

data/spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb

@@ -1,4 +1,4 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
+describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create table with default proc' do
     let(:dsl) { '' }
 

data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb

@@ -148,7 +148,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy erbh(<<-EOS)
 change_table("dept_emp", {:bulk => true}) do |t|
   t.remove("emp_no")
   t.remove("from_date")
@@ -163,7 +163,7 @@ end
 
 change_table("employee_clubs", {:bulk => true}) do |t|
   t.remove("club_id")
-  t.index(["emp_no"], {:name=>"idx_employee_clubs_emp_no", :using=>:btree})
+  t.index(["emp_no"], <%= {:name=>"idx_employee_clubs_emp_no"} + cond(5.0, using: :btree) %>)
 end
 
 change_table("employees", {:bulk => true}) do |t|

data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb

@@ -1,4 +1,4 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
+describe 'Ridgepole::Client#diff -> migrate' do
   subject { client }
 
   before do
@@ -6,18 +6,18 @@ describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
   end
 
   context 'when drop column from table containing an expression index' do
-    let(:actual_dsl) { <<-EOS }
+    let(:actual_dsl) { erbh(<<-EOS) }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
         t.datetime "created_at", null: false
-        t.index "lower((name)::text)", name: "index_users_on_lower_name", using: :btree
+        t.index "lower((name)::text)", <%= i({name: "index_users_on_lower_name"} + cond(5.0, using: :btree)) %>
       end
     EOS
 
-    let(:expected_dsl) { <<-EOS }
+    let(:expected_dsl) { erbh(<<-EOS) }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
-        t.index "lower((name)::text)", name: "index_users_on_lower_name", using: :btree
+        t.index "lower((name)::text)", <%= i({name: "index_users_on_lower_name"} + cond(5.0, using: :btree)) %>
       end
     EOS
 
@@ -32,10 +32,10 @@ describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
   end
 
   context 'when drop expression index' do
-    let(:actual_dsl) { <<-EOS }
+    let(:actual_dsl) { erbh(<<-EOS) }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
-        t.index "lower((name)::text)", name: "index_users_on_lower_name", using: :btree
+        t.index "lower((name)::text)", <%= i({name: "index_users_on_lower_name"} + cond(5.0, using: :btree)) %>
       end
     EOS
 

data/spec/postgresql/migrate/migrate_drop_index_spec.rb

@@ -146,12 +146,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
-        add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
+      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+        add_index("clubs", ["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
 
-        add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_employee_clubs_emp_no_club_id", :using=>:btree})
+        add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_employee_clubs_emp_no_club_id"} + cond(5.0, using: :btree) %>)
 
-        add_index("titles", ["emp_no"], {:name=>"idx_titles_emp_no", :using=>:btree})
+        add_index("titles", ["emp_no"], <%= {:name=>"idx_titles_emp_no"} + cond(5.0, using: :btree) %>)
       EOS
     }
 

data/spec/postgresql/migrate/migrate_drop_table_spec.rb

@@ -132,17 +132,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy erbh(<<-EOS)
         create_table("clubs", {}) do |t|
           t.column("name", :"string", {:limit=>255, :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("employee_clubs", {}) do |t|
           t.column("emp_no", :"integer", {:null=>false})
           t.column("club_id", :"integer", {:null=>false})
         end
-        add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_employee_clubs_emp_no_club_id", :using=>:btree})
+        add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_employee_clubs_emp_no_club_id"} + cond(5.0, using: :btree) %>)
 
         create_table("employees", {:primary_key=>"emp_no"}) do |t|
           t.column("birth_date", :"date", {:null=>false})

data/spec/postgresql/migrate/migrate_ext_cols_spec.rb

@@ -56,9 +56,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      if condition(:activerecord_4)
-        expected_dsl.sub!('t.bigint      "bigint"', 't.integer     "bigint",      limit: 8')
-      end
       expect(subject.dump).to match_fuzzy expected_dsl
     }
   end

data/spec/postgresql/migrate/migrate_same_spec.rb

@@ -1,44 +1,20 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      departments_ext: {id: :string, limit: 4},
-      employees_ext: {id: :integer},
-      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(:activerecord_4)
-      opts.merge!(
-        departments_ext: {},
-        employees_ext: {},
-        dept_manager_pk: {id: false},
-        dept_emp_pk: {id: false},
-        salaries_pk: {id: false},
-        titles_pk: {id: false}
-      )
-    end
-
-    opts
-  }
-
   context 'when database and definition are same' do
     let(:dsl) {
-      erbh(<<-EOS, template_variables)
-        create_table "clubs", force: :cascade do |t|
+      erbh(<<-EOS)
+        create_table "clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
           t.string "name", limit: 255, 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: "idx_dept_name", unique: true, using: :btree %>
 
-        create_table "dept_emp", <%= i @dept_emp_pk %>, force: :cascade do |t|
+        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
@@ -48,7 +24,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
         <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_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",              null: false
           t.date    "from_date",           null: false
@@ -58,21 +34,21 @@ describe 'Ridgepole::Client#diff -> migrate' do
         <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
         <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
 
-        create_table "employee_clubs", force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
           t.integer "emp_no",  null: false
           t.integer "club_id", null: false
         end
 
         <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_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", <%= i({id: :integer} + 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
           t.date   "hire_date",             null: false
         end
 
-        create_table "salaries", <%= i @salaries_pk %>, force: :cascade do |t|
+        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
@@ -81,7 +57,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
 
-        create_table "titles", <%= i @titles_pk %>, force: :cascade do |t|
+        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

data/spec/spec_condition.rb

@@ -10,10 +10,6 @@ module SpecCondition
       ENV['ENABLE_MYSQL_AWESOME'] == '1'
     end
 
-    def activerecord_4?
-      ActiveRecord::VERSION::MAJOR >= 4 and ActiveRecord::VERSION::MAJOR < 5
-    end
-
     def activerecord_5?
       ActiveRecord::VERSION::MAJOR >= 5 and ActiveRecord::VERSION::MAJOR < 6
     end
@@ -23,12 +19,25 @@ module SpecCondition
     end
   end
 
+  def check_version_or_cond(version_or_cond)
+    case version_or_cond
+    when Regexp
+      ActiveRecord::VERSION::STRING =~ version_or_cond
+    when Float
+      ActiveRecord::VERSION::STRING.start_with?(version_or_cond.to_s)
+    when String
+      ActiveRecord::VERSION::STRING.start_with?(version_or_cond)
+    else
+      SpecCondition.send("#{version_or_cond}?")
+    end
+  end
+
   def condition(*conds)
     conds.any? do |c|
       if c.is_a? Array
-        c.all? {|i| SpecCondition.send("#{i}?") }
+        c.all? {|i| check_version_or_cond(i) }
       else
-        SpecCondition.send("#{c}?")
+        check_version_or_cond(c)
       end
     end
   end

data/spec/spec_helper.rb

@@ -6,11 +6,6 @@ require 'cli_helper'
 
 require 'processing_for_travis'
 
-if condition [:mysql_awesome_enabled, :activerecord_5]
-  warn 'warning: Cannot use activerecord-mysql-awesome on ActiveRecord 5.0'
-  exit 0
-end
-
 require 'ridgepole'
 require 'ridgepole/cli/config'
 require 'active_support/core_ext'
@@ -40,7 +35,7 @@ RSpec.configure do |config|
 
   config.before(:each) do |example|
     if conds = example.metadata[:condition]
-      skip unless conds.any? {|c| condition(*c) }
+      skip unless Array(conds).any? {|c| condition(*c) }
     end
 
     case example.metadata[:file_path]
@@ -101,15 +96,7 @@ module SpecHelper
   def client(options = {}, config = {})
     config = conn_spec(config)
     default_options = {debug: condition(:debug)}
-
-    if condition(:mysql_awesome_enabled)
-      default_options[:enable_mysql_awesome] = true
-      default_options[:dump_without_table_options] = true
-    end
-
-    if condition(:activerecord_5)
-      default_options[:dump_without_table_options] = true
-    end
+    default_options[:dump_without_table_options] = true
 
     options = default_options.merge(options)