ridgepole 0.8.13 → 0.9.0.beta

data/spec/mysql/migrate/migrate_same_spec.rb

@@ -4,12 +4,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when database and definition are same' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "clubs", <%= i cond('>= 5.1',{id: :integer}) + {unsigned: true, force: :cascade} %> do |t|
+        create_table "clubs", <%= i cond({ '>= 5.1, < 6.1' => { id: :integer, unsigned: true }, ">= 6.1" => { id: { type: :integer, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         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: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
@@ -32,7 +32,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond('>= 5.1',{id: :integer}) + {unsigned: true, force: :cascade} %> do |t|
+        create_table "employee_clubs", <%= i cond({ '>= 5.1, < 6.1' => { id: :integer, unsigned: true }, ">= 6.1" => { id: { type: :integer, unsigned: true } } }, { unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
           t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>

data/spec/mysql/text_blob_types/text_blob_types_spec.rb

@@ -26,7 +26,7 @@ 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|
+        create_table "foos", <%= i cond(">= 6.1", { id: { type: :integer, unsigned: true } }, { id: :integer, unsigned: true }) %>, force: :cascade do |t|
           t.binary  "blob", <%= i cond(5.0, limit: 65535) %>
           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}) %>

data/spec/postgresql/dump/dump_spec.rb

@@ -12,7 +12,7 @@ describe 'Ridgepole::Client#dump' do
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         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) %>
         end

data/spec/postgresql/migrate/migrate_same_spec.rb

@@ -9,7 +9,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         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) %>
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.9.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -274,10 +274,10 @@ files:
 - Rakefile
 - bin/ridgepole
 - docker-compose.yml
-- gemfiles/activerecord_5.0.gemfile
 - gemfiles/activerecord_5.1.gemfile
 - gemfiles/activerecord_5.2.gemfile
 - gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_6.1.gemfile
 - lib/ridgepole.rb
 - lib/ridgepole/cli/config.rb
 - lib/ridgepole/client.rb
@@ -292,7 +292,6 @@ files:
 - lib/ridgepole/execute_expander.rb
 - lib/ridgepole/ext/abstract_adapter/disable_table_options.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/dump_auto_increment.rb
-- lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb
 - lib/ridgepole/ext/pp_sort_hash.rb
 - lib/ridgepole/ext/schema_dumper.rb
 - lib/ridgepole/external_sql_executer.rb
@@ -402,8 +401,6 @@ files:
 - spec/mysql/migrate/migrate_with_pre_post_query_spec.rb
 - spec/mysql/migrate/migrate_with_tables_spec.rb
 - spec/mysql/migrate/migrate_with_verbose_log_spec.rb
-- spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb
-- spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb
 - spec/mysql/ridgepole_test_database.sql
 - spec/mysql/ridgepole_test_tables.sql
 - spec/mysql/ridgepole_test_tables_unknown_column_type.sql
@@ -468,11 +465,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
@@ -566,8 +563,6 @@ test_files:
 - spec/mysql/migrate/migrate_with_pre_post_query_spec.rb
 - spec/mysql/migrate/migrate_with_tables_spec.rb
 - spec/mysql/migrate/migrate_with_verbose_log_spec.rb
-- spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb
-- spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb
 - spec/mysql/ridgepole_test_database.sql
 - spec/mysql/ridgepole_test_tables.sql
 - spec/mysql/ridgepole_test_tables_unknown_column_type.sql

data/lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_record/connection_adapters/abstract_mysql_adapter'
-
-module Ridgepole
-  module Ext
-    module AbstractMysqlAdapter
-      module UseAlterIndex
-        def add_index(table_name, column_name, options = {})
-          index_name, index_type, index_columns, index_options, _index_algorithm, index_using = add_index_options(table_name, column_name, **options)
-
-          # cannot specify index_algorithm
-          execute "ALTER TABLE #{quote_table_name(table_name)} ADD #{index_type} INDEX #{quote_column_name(index_name)} #{index_using} (#{index_columns})#{index_options}"
-        end
-
-        def remove_index(table_name, options)
-          index_name = index_name_for_remove(table_name, options)
-          execute "ALTER TABLE #{quote_table_name(table_name)} DROP INDEX #{quote_column_name(index_name)}"
-        end
-      end
-    end
-  end
-end
-
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractMysqlAdapter
-      prepend Ridgepole::Ext::AbstractMysqlAdapter::UseAlterIndex
-    end
-  end
-end

data/spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when create index' do
-    let(:dsl) 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) %>
-        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) %>
-        end
-
-        create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no", null: false
-          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) %>
-        end
-
-        create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no", null: false
-          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) %>
-        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) %>
-        end
-
-        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
-          t.string "gender", limit: 1, null: false
-          t.date   "hire_date", null: false
-        end
-
-        create_table "salaries", id: false, 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
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
-        end
-
-        create_table "titles", id: false, 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"
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
-        end
-      ERB
-    end
-
-    let(:actual_dsl) do
-      erbh(<<-ERB)
-        create_table "clubs", force: :cascade do |t|
-          t.string "name", default: "", null: false
-        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) %>
-        end
-
-        create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no", null: false
-          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) %>
-        end
-
-        create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no", null: false
-          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) %>
-        end
-
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no", null: false
-          t.integer "club_id", null: false
-        end
-
-        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
-          t.string "gender", limit: 1, null: false
-          t.date   "hire_date", null: false
-        end
-
-        create_table "salaries", id: false, 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
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
-        end
-
-        create_table "titles", id: false, 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"
-        end
-      ERB
-    end
-
-    let(:expected_dsl) { dsl }
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(mysql_use_alter: true) }
-
-    it {
-      delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_ruby actual_dsl
-      _migrated, sql = delta.migrate(noop: true)
-      expect(sql).to match(/ALTER/)
-      delta.migrate
-      expect(subject.dump).to match_ruby expected_dsl
-    }
-  end
-end

data/spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when drop index' do
-    let(:dsl) 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) %>
-        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) %>
-        end
-
-        create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no", null: false
-          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) %>
-        end
-
-        create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no", null: false
-          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) %>
-        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) %>
-        end
-
-        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
-          t.string "gender", limit: 1, null: false
-          t.date   "hire_date", null: false
-        end
-
-        create_table "salaries", id: false, 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
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
-        end
-
-        create_table "titles", id: false, 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"
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
-        end
-      ERB
-    end
-
-    let(:actual_dsl) { dsl }
-
-    let(:expected_dsl) do
-      erbh(<<-ERB)
-        create_table "clubs", force: :cascade do |t|
-          t.string "name", default: "", null: false
-        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) %>
-        end
-
-        create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no", null: false
-          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) %>
-        end
-
-        create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no", null: false
-          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) %>
-        end
-
-        create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no", null: false
-          t.integer "club_id", null: false
-        end
-
-        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
-          t.string "gender", limit: 1, null: false
-          t.date   "hire_date", null: false
-        end
-
-        create_table "salaries", id: false, 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
-          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
-        end
-
-        create_table "titles", id: false, 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"
-        end
-      ERB
-    end
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client(mysql_use_alter: true) }
-
-    it {
-      delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_ruby actual_dsl
-      _migrated, sql = delta.migrate(noop: true)
-      expect(sql).to match(/ALTER/)
-      delta.migrate
-      expect(subject.dump).to match_ruby expected_dsl
-    }
-  end
-end