ridgepole 0.8.13 → 0.9.2

data/spec/postgresql/migrate/migrate_same_spec.rb

@@ -4,14 +4,14 @@ 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: :serial) + {force: :cascade} %> do |t|
+        create_table "clubs", id: :serial, force: :cascade do |t|
           t.string "name", limit: 255, 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", 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) %>
+          t.index ["dept_name"], name: "idx_dept_name", unique: true
         end
 
         create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "idx_dept_emp_dept_no"
+          t.index ["emp_no"], name: "idx_dept_emp_emp_no"
         end
 
         create_table "dept_manager", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -28,17 +28,17 @@ 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: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "idx_dept_manager_dept_no"
+          t.index ["emp_no"], name: "idx_dept_manager_emp_no"
         end
 
-        create_table "employee_clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
+        create_table "employee_clubs", id: :serial, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id"
         end
 
-        create_table "employees", primary_key: "emp_no", <%= i({id: :integer} + cond('>= 5.1',default: nil) + {force: :cascade}) %> do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, 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
@@ -50,7 +50,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: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_salaries_emp_no"
         end
 
         create_table "titles", primary_key: ["emp_no", "title", "from_date"], force: :cascade do |t|
@@ -58,7 +58,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: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_titles_emp_no"
         end
       ERB
     end

data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb

@@ -9,7 +9,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
@@ -20,7 +20,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -34,7 +34,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|

data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb

@@ -6,7 +6,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -52,7 +52,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -63,7 +63,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -94,7 +94,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"

data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -9,7 +9,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -26,7 +26,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -65,7 +65,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -76,7 +76,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|

data/spec/processing_for_ci.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+if ENV['CI']
+  require 'simplecov'
+  require 'simplecov-lcov'
+
+  SimpleCov::Formatter::LcovFormatter.config do |c|
+    c.report_with_single_file = true
+    c.single_report_path = 'coverage/lcov.info'
+  end
+  SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([SimpleCov::Formatter::LcovFormatter])
+  SimpleCov.start
+end

data/spec/spec_const.rb

@@ -5,7 +5,7 @@ TEST_MYSQL_PORT = ENV['MYSQL57'] == '1' ? 13_317 : 13_316
 TEST_MYSQL_USER = 'root'
 TEST_MYSQL_PASS = 'password'
 
-MYSQL_CLI = "mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER} -p#{TEST_MYSQL_PASS} 2>/dev/null"
+MYSQL_CLI = "mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER} -p#{TEST_MYSQL_PASS} --ssl-mode=DISABLED 2>/dev/null"
 
 TEST_PG_HOST = ENV['DOCKER_HOST'] ? ENV['DOCKER_HOST'].gsub(%r{\Atcp://|:\d+\z}, '') : '127.0.0.1'
 TEST_PG_PORT = 15_442

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require 'spec_condition'
 require 'cli_helper'
 require 'hide_pending_formatter'
 
-require 'processing_for_travis'
+require 'processing_for_ci'
 
 require 'ridgepole'
 require 'ridgepole/cli/config'
@@ -132,6 +132,7 @@ module SpecHelper
         port: TEST_MYSQL_PORT,
         username: TEST_MYSQL_USER,
         password: TEST_MYSQL_PASS,
+        ssl_mode: 'DISABLED',
       }.merge(config)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.9.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-03-13 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
@@ -72,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: erbh
   requirement: !ruby/object:Gem::Requirement
@@ -216,16 +202,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +240,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email:
@@ -267,6 +281,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -274,10 +289,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 +307,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
@@ -301,17 +315,6 @@ files:
 - lib/ridgepole/schema_dumper_ext.rb
 - lib/ridgepole/schema_statements_ext.rb
 - lib/ridgepole/version.rb
-- omnibus-ridgepole/.gitignore
-- omnibus-ridgepole/Dockerfile.centos
-- omnibus-ridgepole/Dockerfile.ubuntu
-- omnibus-ridgepole/Gemfile
-- omnibus-ridgepole/README.md
-- omnibus-ridgepole/Rakefile
-- omnibus-ridgepole/config/projects/ridgepole.rb
-- omnibus-ridgepole/config/software/ridgepole.rb
-- omnibus-ridgepole/omnibus.rb
-- omnibus-ridgepole/package-scripts/ridgepole/postinst
-- omnibus-ridgepole/package-scripts/ridgepole/postrm
 - ridgepole.gemspec
 - spec/cli_helper.rb
 - spec/dsl_parser/context_spec.rb
@@ -319,7 +322,6 @@ files:
 - spec/fixtures/for_require_relative_spec.rb
 - spec/hide_pending_formatter.rb
 - spec/mysql/_migrate/migrate_change_table_option_spec.rb
-- spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
@@ -402,8 +404,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
@@ -449,7 +449,7 @@ files:
 - spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb
-- spec/processing_for_travis.rb
+- spec/processing_for_ci.rb
 - spec/spec_condition.rb
 - spec/spec_const.rb
 - spec/spec_helper.rb
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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.
@@ -483,7 +483,6 @@ test_files:
 - spec/fixtures/for_require_relative_spec.rb
 - spec/hide_pending_formatter.rb
 - spec/mysql/_migrate/migrate_change_table_option_spec.rb
-- spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
@@ -566,8 +565,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
@@ -613,7 +610,7 @@ test_files:
 - spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb
-- spec/processing_for_travis.rb
+- spec/processing_for_ci.rb
 - spec/spec_condition.rb
 - spec/spec_const.rb
 - spec/spec_helper.rb

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