ridgepole 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a820687bccfcbcfaa3290b28536a0ea3599d32a35a16e897f37a20a4e1ef75
-  data.tar.gz: c25c8a48b003aa297f7b1a979f609898b776c3393628d42c2dc2a0897d87be0e
+  metadata.gz: 6f850327d50c5d732987209c8c8eb5c9db3090e1b638f2ee9dbc8ced0959b128
+  data.tar.gz: 242e925ebc5c1a94d0c68e605e894a55efab238f1184b67d1a6a56f4aee51078
 SHA512:
-  metadata.gz: d58fae0cd35607eb2980be9600b0d31b04605c559445932d7f73ab7cec066267bb45da5ef783c0ab577fec2272f664214afd190d088c1976f299fcfb30a6c54a
-  data.tar.gz: 498c6a55c4d7480a7ac019e58ddc63a8212961bda3d587f9d30d860be1d04d8a8f33e5bcbac72044d759919a3abba46f36750cc4cf2bcd44b87d4af352f7318d
+  metadata.gz: 0451a8c71155ff9fd991045e04973cdf063c405dc1013c63883db20ce11bad93ce4f7cdd0533d5ae12f4a9c35bbf03e18e04a6487ad217baf614a090837095d4
+  data.tar.gz: f4bb253e35a0f7904a0b17effd29a5e388449d4a295282f9f1652f1dd11f6d8a9c1df8dbd176efcf884cda5e15e15bf80db61b69bfd7f702ee43de2e0b70a186

data/.github/workflows/test.yml

@@ -0,0 +1,62 @@
+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
+
+          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/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>
@@ -120,6 +120,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 * `>= 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))
 </details>
 
 ## Installation

data/lib/ridgepole/dsl_parser.rb

@@ -39,10 +39,7 @@ module Ridgepole
         next if attrs[:indices]&.any? { |_k, v| v[:column_name].first == fk_index }
         next if attrs[:options][:primary_key] == 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 before the next operation.
-        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/version.rb

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

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -186,13 +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 before the next operation.
-      MSG
-      subject.diff(dsl).migrate
-
-      expect(subject.diff(dsl).differ?).to be_truthy
+      expect do
+        subject.diff(dsl).migrate
+      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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -235,10 +235,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt

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