ridgepole 0.8.8 → 0.9.0.beta

data/spec/mysql/migrate/migrate_change_index_spec.rb

@@ -219,11 +219,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index(["from_date"], **{:name=>"emp_no", :using=>:btree, :unique=>false})
         end
       RUBY
+    }
+
+    # duplicated index checker is deleted in 6.1
+    # https://github.com/rails/rails/commit/edb23791d2ee9df89c5a4f24d72940ff8eaec8fc#diff-5a1c923abf3a794dbc133959167f794b2479ea8bcd0b1deda7766c22f05e8dfeL1198
+    it 'detects duplicated index', condition: '< 6.1' do
+      delta = client(bulk_change: true).diff(expected_dsl)
 
       # XXX: Can not add an index of the same name
       expect do
         delta.migrate
       end.to raise_error(/Index name 'emp_no' on table 'dept_emp' already exists/)
-    }
+    end
   end
 end

data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb

@@ -68,7 +68,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false
@@ -88,7 +88,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false
@@ -179,7 +179,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false
@@ -199,7 +199,7 @@ describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
           t.date    "to_date", null: false
         end
 
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.date    "birth_date", null: false
           t.string  "first_name", limit: 14, null: false

data/spec/mysql/migrate/migrate_primary_key_spec.rb

@@ -3,7 +3,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   let(:actual_dsl) do
     erbh(<<-ERB)
-      create_table "employees", id: :integer, unsigned: true, force: :cascade do |t|
+      create_table "employees", <%= i cond(">= 6.1", { id: { type: :integer, unsigned: true } }, { id: :integer, unsigned: true }) %>, force: :cascade do |t|
       end
     ERB
   end
@@ -23,11 +23,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       end
 
       it {
-        expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
+        expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(<<-ERB))
 [WARNING] Primary key definition of `employees` differ but `allow_pk_change` option is false
-  from: {:id=>:integer, :unsigned=>true}
+  from: <%= i cond(">= 6.1", "{:id=>{:type=>:integer, :unsigned=>true}}", "{:id=>:integer, :unsigned=>true}") %>
     to: {:id=>:bigint, :unsigned=>true}
-        MSG
+        ERB
 
         delta = subject.diff(expected_dsl)
         expect(delta.differ?).to be_falsey
@@ -58,7 +58,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:allow_pk_change) { true }
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+        create_table "employees", <%= i cond(">= 6.1", { id: { type: :bigint, unsigned: true } }, { id: :bigint, unsigned: true }) %>, force: :cascade do |t|
         end
 
         create_table "salaries", force: :cascade do |t|
@@ -76,4 +76,29 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
+
+  context 'when deafult: nil' do
+    let(:allow_pk_change) { true }
+
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "foo", id: :integer, unsigned: true, default: nil, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "foo", id: :integer, default: nil, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
 end

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

@@ -5,7 +5,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
     subject { client }
 
     it do
-      delta = subject.diff(<<-RUBY)
+      table_def = <<-RUBY
         create_table :foos, id: :unsigned_integer do |t|
           t.blob             :blob
           t.tinyblob         :tiny_blob
@@ -20,12 +20,13 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.unsigned_integer :unsigned_integer
         end
       RUBY
+      delta = subject.diff(table_def)
 
       expect(delta.differ?).to be_truthy
       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}) %>
@@ -39,6 +40,8 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.integer "unsigned_integer", unsigned: true
         end
       ERB
+
+      expect(subject.diff(table_def).differ?).to be_falsey
     end
   end
 

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_add_column_spec.rb

@@ -116,10 +116,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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.integer   "emp_no", null: false
+          t.string    "title", limit: 50, null: false
+          t.date      "from_date", null: false
+          t.date      "to_date"
+          t.serial    "title_no", null: false
+          t.bigserial "title_bigno", null: false
           t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -149,6 +151,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.column("age", :integer, **{:null=>false})
           t.column("updated_at", :date, **{})
         end
+
+        change_table("titles", bulk: true) do |t|
+          t.column("title_no", :serial, **{:null=>false})
+          t.column("title_bigno", :bigserial, **{:null=>false})
+        end
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/migrate/migrate_change_column_spec.rb

@@ -157,6 +157,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.text "desc"
+          t.serial "club_no"
+          t.bigserial "club_bigno"
         end
       ERB
     end
@@ -166,6 +168,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.text "desc"
+          t.serial "club_no"
+          t.bigserial "club_bigno"
         end
       ERB
     end

data/spec/postgresql/migrate/migrate_drop_column_spec.rb

@@ -54,10 +54,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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.integer   "emp_no", null: false
+          t.string    "title", limit: 50, null: false
+          t.date      "from_date", null: false
+          t.date      "to_date"
+          t.serial    "title_no", null: false
+          t.bigserial "title_bigno", null: false
           t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -148,6 +150,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.remove("last_name")
           t.remove("hire_date")
         end
+
+        change_table("titles", bulk: true) do |t|
+          t.remove("title_no")
+          t.remove("title_bigno")
+        end
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

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

data/spec/spec_condition.rb

@@ -19,6 +19,10 @@ module SpecCondition
     def debug?
       ENV['DEBUG'] == '1'
     end
+
+    def verbose?
+      ENV['VERBOSE'] == '1'
+    end
   end
 
   def check_version_or_cond(version_or_cond)

data/spec/spec_helper.rb

@@ -25,10 +25,11 @@ require 'erb_helper'
 
 RSpec.configure do |config|
   config.before(:all) do
-    if condition(:debug)
+    if condition(:debug) || condition(:verbose)
       ActiveRecord::Migration.verbose = true
       logger = Ridgepole::Logger.instance
       logger.level = ::Logger::DEBUG
+      logger.verbose = condition(:verbose)
       ActiveRecord::Base.logger = logger
     else
       ActiveRecord::Migration.verbose = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-12 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
@@ -218,14 +218,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.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:
@@ -235,10 +263,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -246,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
@@ -264,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
@@ -374,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
@@ -429,7 +454,7 @@ homepage: https://github.com/winebarrel/ridgepole
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -440,12 +465,12 @@ 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.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files:
@@ -538,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