ridgepole 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa2d123eaa04d61f3b9c602714abb2c2b8f8a8c26fe98a4179972a999544781
-  data.tar.gz: 1bed7b6f6caab7b80c86eb885cbe462db3a8970f558cc8a9fbd6bad6d5a728f5
+  metadata.gz: 4f3d6aadf39f73ef720c5f19404e303f98e75919164e51240570472d21c6c14e
+  data.tar.gz: 2e494165ba2dbd2c1a700ae3ebda831b43ca4439017a96513756f47d9f64f901
 SHA512:
-  metadata.gz: 2455d86f97127f948c38ff7a86ff436008729defcc560dc81eb05e41647c65f4def830ee2f0f522ba0e235d879ac88876254d0edbab27be0c5b58189e978522f
-  data.tar.gz: 8cfdf0654b03655332dfe06b70cadda456dc9300360342ba4a47c3703d1dca25ca1bf93908c08febc556d8b75820b35198aabed497410e6ab1fa2ad67391fb09
+  metadata.gz: 5b173d5e01ea89b0065dc617989cb89dd000050bf4aa973af74c714b55f7cbe414f932c6a44c1a9cc4dc10cf2e8db4ca590bd68ddc34176901700ab5c1d569e2
+  data.tar.gz: 20b1fa9092d28d119d9604ea3ffb7b11abe8080bb2edf6a6f0af88e095cb88724bb40836a59939f1eadee693386c0fbb64cf3876d56c4f3cdd4fd0f123a2b571

data/.github/workflows/test.yml

@@ -29,49 +29,36 @@ jobs:
             gemfile: gemfiles/activerecord_6.0.gemfile
           - ruby: 2.4
             gemfile: gemfiles/activerecord_6.1.gemfile
-
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/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 }}-
-
+          bundler-cache: true
       - 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 mysql_ping { mysqladmin -u root -h 127.0.0.1 -P 13316 ping --ssl-mode=DISABLED; }
+          function mysql57_ping { mysqladmin -u root -h 127.0.0.1 -P 13317 ping --ssl-mode=DISABLED; }
           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 }}
-
+          MYSQL_PWD: password
       - name: Run tests
         run: ${{ matrix.env }} bundle exec rake
         env:
           BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
       - name: Coveralls Parallel
         uses: coverallsapp/github-action@v1.1.2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           flag-name: run-${{ matrix.ruby }}-${{ matrix.env }}-${{ matrix.gemfile }}
           parallel: true
-
   finish:
     needs: build
     runs-on: ubuntu-latest

data/.rubocop.yml

@@ -1,12 +1,13 @@
 AllCops:
   Exclude:
-    - 'gemfiles/**/*'
-    - 'omnibus-ridgepole/**/*'
+    - "gemfiles/**/*"
+    - "omnibus-ridgepole/**/*"
+    - "vendor/bundle/**/*"
   TargetRubyVersion: 2.4
   NewCops: enable
 Bundler/OrderedGems:
   Include:
-    - 'Appraisals'
+    - "Appraisals"
 Layout/HeredocIndentation:
   Enabled: false
 Metrics/AbcSize:
@@ -33,7 +34,7 @@ Style/GuardClause:
   Enabled: false
 Style/MixinUsage:
   Exclude:
-    - 'spec/**/*'
+    - "spec/**/*"
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Layout/ClosingHeredocIndentation:

data/README.md

@@ -130,11 +130,13 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 * `>= 0.8.13`
   * Support `serial` and `bigserial` column types  ([pull#321](https://github.com/winebarrel/ridgepole/pull/321))
 * `>= 0.9.0`
-  * Remove `--mysql-alter-index` option ([pull#330](https://github.com/winebarrel/ridgepole/pull/330))
+  * Remove `--mysql-use-alter` option ([pull#330](https://github.com/winebarrel/ridgepole/pull/330))
   * Add `--table-hash-options` option ([pull#331](https://github.com/winebarrel/ridgepole/pull/331))
   * Support Rails 6.1 ([pull#323](https://github.com/winebarrel/ridgepole/pull/323))
   * Disable Rails 5.0 support ([pull#335](https://github.com/winebarrel/ridgepole/pull/335))
   * Fix PK AUTO_INCREMENT change bug ([pull#334](https://github.com/winebarrel/ridgepole/pull/334))
+* `>= 0.9.1`
+  * Support `t.foreign_key` ([pull#348](https://github.com/winebarrel/ridgepole/pull/348))
 </details>
 
 **Notice**

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -120,6 +120,10 @@ module Ridgepole
         @base.add_index(@table_name, name, options)
       end
 
+      def foreign_key(name, options = {})
+        @base.add_foreign_key(@table_name, name, options)
+      end
+
       def timestamps(*args)
         options = { null: false }.merge(args.extract_options!)
         column(:created_at, :datetime, options)

data/lib/ridgepole/version.rb

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

data/ridgepole.gemspec

@@ -35,7 +35,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', '1.8.1'
+  spec.add_development_dependency 'rubocop', '1.9.1'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
   spec.add_development_dependency 'simplecov'

data/spec/mysql/fk/migrate_change_fk_spec.rb

@@ -57,6 +57,74 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
+  context 'when change fk using `t.foreign_key`' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+          t.foreign_key "parent", name: "child_ibfk_1", on_delete: :cascade
+        end
+      ERB
+    end
+
+    let(:sorted_actual_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      ERB
+    end
+
+    let(:expected_dsl_using_t_foreign_key) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+          t.foreign_key "parent", name: "child_ibfk_1"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl_using_t_foreign_key)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy sorted_actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+
   context 'when change fk without name' do
     let(:actual_dsl) do
       erbh(<<-ERB)

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -43,6 +43,61 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
+  context 'when create fk using `t.foreign_key`' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(actual_dsl + <<-ERB)
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      ERB
+    end
+
+    let(:expected_dsl_using_t_foreign_key) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+          t.foreign_key "parent", name: "child_ibfk_1"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl_using_t_foreign_key)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+
+    it {
+      delta = client(bulk_change: true).diff(expected_dsl_using_t_foreign_key)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      expect(delta.script).to match_fuzzy <<-RUBY
+        add_foreign_key("child", "parent", **{:name=>"child_ibfk_1"})
+      RUBY
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+
   context 'when create fk when create table' do
     let(:dsl) do
       erbh(<<-ERB)

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -57,6 +57,61 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
+  context 'when drop fk using `t.foreign_key`' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+          t.foreign_key "parent", name: "child_ibfk_1"
+        end
+      ERB
+    end
+
+    let(:sorted_actual_dsl) do
+      expected_dsl + <<-RUBY
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      RUBY
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy sorted_actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+
+    it {
+      delta = client(bulk_change: true).diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy sorted_actual_dsl
+      expect(delta.script).to match_fuzzy <<-RUBY
+        remove_foreign_key("child", name: "child_ibfk_1")
+      RUBY
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+
   context 'when drop fk when drop table' do
     let(:dsl) do
       erbh(<<-ERB)

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

@@ -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.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.