ridgepole 0.8.8 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c506e7bf27fec2d935daf79fae7e9b653dd3b65114633e401b8683755e9ca7a
-  data.tar.gz: a4615e7fe4fa35628471d512fc70fd969774ef1c8270e0ad161eb58772207dac
+  metadata.gz: 4c68b630030e34fb6e399e053d7d5c43245487c81d0869f9783b05e1135b5e2e
+  data.tar.gz: b7061e1c9c0bdf8e7509ab3601e397031edd2d9397975b178bac12ddb669c413
 SHA512:
-  metadata.gz: 67459d1042f159bbe4345335d12029470cfb272cf75bba8ebfa7b2de05234e3fd0adba87c303817f927567654676db93efc0e8563ec9e47745b6f3c906c4d241
-  data.tar.gz: 4713c918e439078a179a185c148606d14e4c526261b4094d1417277cd471b30cdf2b3b4f0c7bca66c7e73637f1125ce3296b9cac4d55f38873d9b16d3527fd65
+  metadata.gz: 8bbfcabaad944ad5ed18c5b809e06243582c9f3977890e499c2b400af7f268206876174d0cd3b6184e67b33ef67d5bd6226b63c88c13d820c9ed4fab5f5bdbdc
+  data.tar.gz: 7ed62d44a593d40b8c3d8b91b6d0ea7c10ae99337789db4ffbdffc9bf43cfb6b2e2fc81959cca1e823a9adf40968717d264f965aa4edb4e591bed55cff3c7c9d

data/.github/workflows/test.yml

@@ -0,0 +1,63 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+        env:
+          - MYSQL56=1
+          - MYSQL57=1
+          - POSTGRESQL=1
+        gemfile:
+          - gemfiles/activerecord_5.0.gemfile
+          - gemfiles/activerecord_5.1.gemfile
+          - gemfiles/activerecord_5.2.gemfile
+          - gemfiles/activerecord_6.0.gemfile
+        exclude:
+          - ruby: 2.4
+            gemfile: gemfiles/activerecord_6.0.gemfile
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          path: gemfiles/vendor/bundle
+          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles('ridgepole.gemspec', '**/Gemfile', '${{ matrix.gemfile }}') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-
+
+      - name: Setup dependencies
+        run: |
+          for i in {1..60}; do docker-compose up -d && break; sleep 1; done
+
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+
+          # Wait until database servers start
+          function mysql_ping { mysqladmin -u root -h 127.0.0.1 -P 13316 -ppassword ping; }
+          function mysql57_ping { mysqladmin -u root -h 127.0.0.1 -P 13317 -ppassword ping; }
+          function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 -p 15442; }
+          for i in {1..60}; do mysql_ping && break; sleep 1; done
+          for i in {1..60}; do mysql57_ping && break; sleep 1; done
+          for i in {1..60}; do pg_ping && break; sleep 1; done
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+      - run: ${{ matrix.env }} bundle exec rake
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.rubocop.yml

@@ -3,6 +3,7 @@ AllCops:
     - 'gemfiles/**/*'
     - 'omnibus-ridgepole/**/*'
   TargetRubyVersion: 2.4
+  NewCops: enable
 Bundler/OrderedGems:
   Include:
     - 'Appraisals'
@@ -30,8 +31,6 @@ Style/Documentation:
   Enabled: false
 Style/GuardClause:
   Enabled: false
-Style/MethodMissingSuper:
-  Enabled: false
 Style/MixinUsage:
   Exclude:
     - 'spec/**/*'
@@ -41,37 +40,13 @@ Layout/ClosingHeredocIndentation:
   Enabled: false
 Style/NumericPredicate:
   Enabled: false
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/AccessorGrouping:
-  Enabled: true
-Style/BisectedAttrAccessor:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true
+Lint/MissingSuper:
+  Enabled: false
+Style/StringConcatenation:
+  Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false

data/README.md

@@ -6,7 +6,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
-[![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.8)](https://travis-ci.org/winebarrel/ridgepole)
+[![Build Status](https://github.com/winebarrel/ridgepole/workflows/test/badge.svg?branch=0.8)](https://github.com/winebarrel/ridgepole/actions)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.8)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.8)
 
 <details><summary>ChangeLog</summary>
@@ -117,6 +117,18 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support `require_relative` ([pull#298](https://github.com/winebarrel/ridgepole/pull/298))
 * `>= 0.8.8`
   * Fix keyword arguments warnings in Ruby 2.7 ([pull#303](https://github.com/winebarrel/ridgepole/pull/303))
+* `>= 0.8.9`
+  * Fix unexpected differences on text types and blob types on Rails 6 ([pull#306](https://github.com/winebarrel/ridgepole/pull/306))
+  * Fix unexpected warning when a foreign key is added on the primary key ([pull#307](https://github.com/winebarrel/ridgepole/pull/307))
+* `>= 0.8.10`
+  * Raise an error if an InnoDB column has a foreign key but no index ([pull#310](https://github.com/winebarrel/ridgepole/pull/310))
+* `>= 0.8.11`
+  * Fix FK index check support multiple PK ([pull#315](https://github.com/winebarrel/ridgepole/pull/315))
+  * Support t.reference() foreign_key option ([pull#316](https://github.com/winebarrel/ridgepole/pull/316))
+* `>= 0.8.12`
+  * Pluralize column specified by `references` ([pull#317](https://github.com/winebarrel/ridgepole/pull/317))
+* `>= 0.8.13`
+  * Support `serial` and `bigserial` column types  ([pull#321](https://github.com/winebarrel/ridgepole/pull/321))
 </details>
 
 ## Installation

data/lib/ridgepole/default_limit.rb

@@ -23,7 +23,7 @@ module Ridgepole
       end
 
       def adapter
-        ActiveRecord::Base.connection_config.fetch(:adapter).to_sym
+        ActiveRecord::Base.connection.adapter_name.downcase.to_sym
       rescue ActiveRecord::ConnectionNotEstablished
         nil
       end

data/lib/ridgepole/diff.rb

@@ -386,6 +386,18 @@ module Ridgepole
           attrs[:type] = :bigint
           opts.delete(:limit)
         end
+
+        if opts[:size] && (attrs[:type] == :text || attrs[:type] == :blob || attrs[:type] == :binary)
+          case opts.delete(:size)
+          when :tiny
+            attrs[:type] = :blob if attrs[:type] == :binary
+            opts[:limit] = 255
+          when :medium
+            opts[:limit] = 16_777_215
+          when :long
+            opts[:limit] = 4_294_967_295
+          end
+        end
       end
     end
 

data/lib/ridgepole/dsl_parser.rb

@@ -37,11 +37,10 @@ module Ridgepole
       attrs[:foreign_keys].each do |_, foreign_key_attrs|
         fk_index = foreign_key_attrs[:options][:column] || "#{foreign_key_attrs[:to_table].singularize}_id"
         next if attrs[:indices]&.any? { |_k, v| v[:column_name].first == fk_index }
+        # NOTE: For composite primary keys, the first column of the primary key is used as the foreign key index
+        next if Array(attrs[:options][:primary_key]).first == fk_index
 
-        Ridgepole::Logger.instance.warn(<<-MSG)
-[WARNING] Table `#{table_name}` has a foreign key on `#{fk_index}` column, but doesn't have any indexes on the column.
-          Although an index will be added automatically by InnoDB, please add an index explicitly for your future operations.
-        MSG
+        raise "The column `#{fk_index}` of the table `#{table_name}` has a foreign key but no index. Although InnoDB creates an index automatically, please add one explicitly in order for ridgepole to manage it."
       end
     end
   end

data/lib/ridgepole/dsl_parser/context.rb

@@ -27,7 +27,7 @@ module Ridgepole
         table_name = table_name.to_s
         table_definition = TableDefinition.new(table_name, self)
 
-        options[:primary_key] = options[:primary_key].to_s if options[:primary_key]&.is_a?(Symbol)
+        options[:primary_key] = options[:primary_key].to_s if options[:primary_key].is_a?(Symbol)
         if options[:id] && TableDefinition::ALIAS_TYPES.key?(options[:id])
           type, type_default_opts = TableDefinition::ALIAS_TYPES[options[:id]]
           options[:id] = type

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -22,57 +22,60 @@ module Ridgepole
 
       DEFAULT_PRIMARY_KEY_TYPE = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.1') ? :bigint : :integer
 
-      TYPES = [
+      TYPES = {
         # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274
-        :string,
-        :text,
-        :integer,
-        :bigint,
-        :float,
-        :decimal,
-        :datetime,
-        :timestamp,
-        :time,
-        :date,
-        :binary,
-        :boolean,
+        string: {},
+        text: {},
+        integer: {},
+        bigint: {},
+        float: {},
+        decimal: {},
+        datetime: {},
+        timestamp: {},
+        time: {},
+        date: {},
+        binary: {},
+        boolean: {},
 
         # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79
-        :daterange,
-        :numrange,
-        :tsrange,
-        :tstzrange,
-        :int4range,
-        :int8range,
-        :binary,
-        :boolean,
-        :bigint,
-        :xml,
-        :tsvector,
-        :hstore,
-        :inet,
-        :cidr,
-        :macaddr,
-        :uuid,
-        :json,
-        :jsonb,
-        :ltree,
-        :citext,
-        :point,
-        :bit,
-        :bit_varying,
-        :money,
+        serial: { null: false },
+        bigserial: { null: false },
+        daterange: {},
+        numrange: {},
+        tsrange: {},
+        tstzrange: {},
+        int4range: {},
+        int8range: {},
+        # binary: {}, # dup key
+        # boolean: {}, # dup key
+        # bigint: {}, # dup key
+        xml: {},
+        tsvector: {},
+        hstore: {},
+        inet: {},
+        cidr: {},
+        macaddr: {},
+        uuid: {},
+        json: {},
+        jsonb: {},
+        ltree: {},
+        citext: {},
+        point: {},
+        bit: {},
+        bit_varying: {},
+        money: {},
 
         # https://github.com/rails/rails/blob/v5.1.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L184
-        :virtual,
+        virtual: {},
 
         # https://github.com/rails/rails/blob/v5.0.4/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L53
-        :json
-      ].uniq
+        # json: {}, # dup key
+      }.freeze
 
-      TYPES.each do |column_type|
+      TYPES.each do |column_type, default_options|
         define_method column_type do |*args|
           options = args.extract_options!
+          options = default_options.merge(options)
           column_names = args
           column_names.each { |name| column(name, column_type, options) }
         end
@@ -131,6 +134,7 @@ module Ridgepole
         polymorphic_options.merge!(options.slice(:null, :first, :after))
         index_options = options.key?(:index) ? options.delete(:index) : true
         type = options.delete(:type) || DEFAULT_PRIMARY_KEY_TYPE
+        foreign_key_options = options.delete(:foreign_key)
 
         args.each do |col|
           column("#{col}_id", type, options)
@@ -139,6 +143,12 @@ module Ridgepole
             columns = polymorphic ? ["#{col}_type", "#{col}_id"] : ["#{col}_id"]
             index(columns, index_options.is_a?(Hash) ? index_options : {})
           end
+          if foreign_key_options # rubocop:disable Style/Next
+            fk_opts = foreign_key_options.is_a?(Hash) ? foreign_key_options.dup : {}
+            fk_opts.update(column: "#{col}_id") if col.to_s.singularize != col.to_s
+            to_table = fk_opts.delete(:to_table) || col.to_s.pluralize
+            @base.add_foreign_key(@table_name, to_table, fk_opts)
+          end
         end
       end
       alias belongs_to references

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

@@ -7,7 +7,7 @@ module Ridgepole
     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)
+          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}"

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.8.8'
+  VERSION = '0.8.13'
 end

data/ridgepole.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7') # rubocop:disable Gemspec/RequiredRubyVersion
 
   spec.add_dependency 'activerecord', '>= 5.0.1', '< 6.1'
   spec.add_dependency 'diffy'
@@ -36,5 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop', '>= 0.57.1'
+  spec.add_development_dependency 'rubocop', '>= 1.7.0'
+  spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
+  spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
 end

data/spec/erb_helper.rb

@@ -18,9 +18,9 @@ ERBh.define_method(:cond) do |conds, m, e = nil|
     m
   else
     e || (begin
-            m.class.new
-          rescue StandardError
-            nil
-          end)
+      m.class.new
+    rescue StandardError
+      nil
+    end)
   end
 end

data/spec/mysql/collation/collation_spec.rb

@@ -141,7 +141,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           # v6.0.3 is the oldest version that doesn't produce any kwargs warnings with Ruby 2.7
           if condition('< 6.0.3')
             # https://github.com/jeremyevans/ruby-warning/blob/1.1.0/lib/warning.rb#L18
-            out = out.lines.grep_v(/: warning: (?:Using the last argument (?:for `.+' )?as keyword parameters is deprecated; maybe \*\* should be added to the call|Passing the keyword argument (?:for `.+' )?as the last hash parameter is deprecated|Splitting the last argument (?:for `.+' )?into positional and keyword parameters is deprecated|The called method (?:`.+' )?is defined here)\n\z/).join('')
+            out = out.lines.grep_v(/: warning: (?:Using the last argument (?:for `.+' )?as keyword parameters is deprecated; maybe \*\* should be added to the call|Passing the keyword argument (?:for `.+' )?as the last hash parameter is deprecated|Splitting the last argument (?:for `.+' )?into positional and keyword parameters is deprecated|The called method (?:`.+' )?is defined here)\n\z/).join
           end
 
           expect(out).to be_empty

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -186,15 +186,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client(dump_without_table_options: false) }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG).twice
-[WARNING] Table `child` has a foreign key on `parent_id` column, but doesn't have any indexes on the column.
-          Although an index will be added automatically by InnoDB, please add an index explicitly for your future operations.
-      MSG
-      subject.diff(dsl).migrate
-
       expect do
         subject.diff(dsl).migrate
-      end.to raise_error(/Mysql2::Error: Cannot drop index/)
+      end.to raise_error('The column `parent_id` of the table `child` has a foreign key but no index. Although InnoDB creates an index automatically, please add one explicitly in order for ridgepole to manage it.')
     }
   end
 
@@ -219,7 +213,82 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(Ridgepole::Logger.instance).to_not receive(:warn)
       subject.diff(dsl).migrate
 
-      expect { subject.diff(dsl).migrate }.to_not raise_error
+      expect(subject.diff(dsl).differ?).to be_falsey
     }
   end
+
+  context 'when create fk on the primary key' do
+    let(:dsl) do
+      erbh(<<-ERB)
+        create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        end
+
+        create_table "icons", primary_key: "user_id", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        end
+        add_foreign_key "icons", "users", name: "fk_icons_users"
+      ERB
+    end
+
+    subject { client(dump_without_table_options: false) }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+      subject.diff(dsl).migrate
+
+      expect(subject.diff(dsl).differ?).to be_falsey
+    }
+  end
+end
+
+context 'when create fk on the first primary key' do
+  let(:dsl) do
+    erbh(<<-ERB)
+      create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      end
+
+      create_table "employee", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      end
+
+      create_table "icons", primary_key: ["user_id", "employee_id"], force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        t.integer "user_id", null: false
+        t.integer "employee_id", null: false
+      end
+      add_foreign_key "icons", "users", name: "fk_icons_users"
+    ERB
+  end
+
+  subject { client(dump_without_table_options: false) }
+
+  it {
+    expect(Ridgepole::Logger.instance).to_not receive(:warn)
+    subject.diff(dsl).migrate
+
+    expect(subject.diff(dsl).differ?).to be_falsey
+  }
+end
+
+context 'when create fk on the second primary key' do
+  let(:dsl) do
+    erbh(<<-ERB)
+      create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      end
+
+      create_table "employee", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      end
+
+      create_table "icons", primary_key: ["user_id", "employee_id"], force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        t.integer "user_id", null: false
+        t.integer "employee_id", null: false
+      end
+      add_foreign_key "icons", "employees", name: "fk_icons_employees"
+    ERB
+  end
+
+  subject { client(dump_without_table_options: false) }
+
+  it {
+    expect do
+      subject.diff(dsl).migrate
+    end.to raise_error('The column `employee_id` of the table `icons` has a foreign key but no index. Although InnoDB creates an index automatically, please add one explicitly in order for ridgepole to manage it.')
+  }
 end

data/spec/mysql/migrate/migrate_change_column3_spec.rb

@@ -99,9 +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') %> "products_id"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
-          t.index "products_id"
           t.index "user_id"
         end
       ERB
@@ -115,7 +113,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.references :products, :user
+          t.references :user
         end
       RUBY
     end
@@ -138,11 +136,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') %> "products_id"
-          t.string "products_type"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.string "user_type"
-          t.index ["products_type", "products_id"]
           t.index ["user_type", "user_id"]
         end
       ERB
@@ -156,7 +151,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.references :products, :user, polymorphic: true
+          t.references :user, polymorphic: true
         end
       RUBY
     end
@@ -174,11 +169,8 @@ 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') %> "products_id", unsigned: true
-          t.string "products_type"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id", unsigned: true
           t.string "user_type"
-          t.index ["products_type", "products_id"]
           t.index ["user_type", "user_id"]
         end
       ERB
@@ -187,7 +179,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) do
       <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.references :products, :user, unsigned: true, polymorphic: true
+          t.references :user, unsigned: true, polymorphic: true
         end
       RUBY
     end
@@ -222,7 +214,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.references :products, :user
+          t.references :user
         end
       RUBY
     end
@@ -235,9 +227,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') %> "products_id"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
-          t.index ["products_id"], name: "index_employees_on_products_id", <%= i cond(5.0, using: :btree) %>
           t.index ["user_id"], name: "index_employees_on_user_id", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -276,7 +266,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.references :products, :user, polymorphic: true
+          t.references :user, polymorphic: true
         end
       RUBY
     end
@@ -289,11 +279,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') %> "products_id"
-          t.string "products_type"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.string "user_type"
-          t.index ["products_type", "products_id"], name: "index_employees_on_products_type_and_products_id", <%= i cond(5.0, using: :btree) %>
           t.index ["user_type", "user_id"], name: "index_employees_on_user_type_and_user_id", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -310,4 +297,108 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
+
+  context 'when use references with fk (no change)' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "users", force: :cascade do |t|
+        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
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
+          t.index "user_id"
+        end
+
+        add_foreign_key("employees", "users")
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "users", force: :cascade do |t|
+        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
+          t.references :user, foreign_key: true
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when use references with fk (change)' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        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 "users", force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:dsl) do
+      erbh(<<-ERB)
+        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
+          t.references :user, foreign_key: true
+        end
+        create_table "users", force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        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
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
+          t.index ["user_id"], name: "index_employees_on_user_id", <%= i cond(5.0, using: :btree) %>
+        end
+        create_table "users", force: :cascade do |t|
+        end
+        add_foreign_key("employees", "users")
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
 end

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,6 +20,7 @@ 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
@@ -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/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/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.8.13
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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
@@ -429,7 +457,7 @@ homepage: https://github.com/winebarrel/ridgepole
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -444,8 +472,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files:

data/.travis.yml

@@ -1,45 +0,0 @@
-dist: trusty
-sudo: required
-group: edge
-language: ruby
-cache:
-  - bundler
-rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.1
-before_script:
-  - sudo service mysql stop
-  - sudo service postgresql stop
-  - for i in {1..60}; do docker-compose up -d && break; sleep 1; done
-  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -P 13316 -ppassword ping; }
-  - function mysql57_ping { mysqladmin -u root -h 127.0.0.1 -P 13317  -ppassword ping; }
-  - function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 -p 15442; }
-  - for i in {1..60}; do mysql_ping && break; sleep 1; done
-  - for i in {1..60}; do mysql57_ping && break; sleep 1; done
-  - for i in {1..60}; do pg_ping && break; sleep 1; done
-script:
-  - bundle exec rake
-gemfile:
-  - gemfiles/activerecord_5.0.gemfile
-  - gemfiles/activerecord_5.1.gemfile
-  - gemfiles/activerecord_5.2.gemfile
-  - gemfiles/activerecord_6.0.gemfile
-env:
-  matrix:
-    - MYSQL56=1
-    - MYSQL57=1
-    - POSTGRESQL=1
-services:
-  - docker
-addons:
-  apt:
-    packages:
-      - mysql-client-core-5.6
-      - mysql-client-5.6
-      - postgresql-client-9.4
-matrix:
-  exclude:
-    - rvm: 2.4.9
-      gemfile: gemfiles/activerecord_6.0.gemfile