ridgepole 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 367dff4faf9fd7e94588cdefe290cf13953cf82b9dc5110e91cfd5d4ee2507a3
-  data.tar.gz: 20ad65390cd7b12fe97e8fbae409aa5bc0d86a6c73c79a9916bfc55f46f03cb6
+  metadata.gz: 91c51bf51596b61eff43704847bd41b9f8035ceafd1f1e05e1cd72fc6632e582
+  data.tar.gz: 32aff893209c48b839286b7efe24d465e3dd808d3b8820f52a5fb4eb9ecbf606
 SHA512:
-  metadata.gz: 94039eb4e75e2f0b218275ffec9b8a1b4c28ae5b9c93ad64b584793acbabc1ece9eb8ddde4e6d3097ffc6a9346ef36a6318334048d99c8e85050e0b9ef3088bd
-  data.tar.gz: 5e4837104ea5b6b69e42fdcc82e29b71a33835ce8371b959c16f3c00b014047a88b3c01ecba74ab8d6e591fd3357d15019a1dc41c425ff4c10b49fcec6bbdc48
+  metadata.gz: 92c24eca95293b83ab73871c9baaff349e8d28be8ddc5583746d3beecf0b6986eb58127361654fc0742c95b68f9ac2c060ca689af98a9ca6558b78c960b2a35b
+  data.tar.gz: 6864c16bbd8723436219540b7a3ab0f5eccfb32ae5301ac827957b9671c8cf83d7a91ea13a9a364f3b94ef236d2b3334742adce0524f7cb22801d298757cb0cd

data/.github/workflows/test.yml

@@ -44,6 +44,7 @@ jobs:
         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
 

data/README.md

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

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -143,7 +143,7 @@ module Ridgepole
           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_table = fk_opts.delete(:to_table) || col.to_s.pluralize
             @base.add_foreign_key(@table_name, to_table, fk_opts)
           end
         end

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.8.11'
+  VERSION = '0.8.12'
 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
@@ -314,10 +301,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when use references with fk (no change)' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "products", force: :cascade do |t|
-        end
-
-        create_table "user", force: :cascade do |t|
+        create_table "users", force: :cascade do |t|
         end
 
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
@@ -326,23 +310,17 @@ 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
 
-        add_foreign_key("employees", "products", **{:column=>"products_id"})
-        add_foreign_key("employees", "user")
+        add_foreign_key("employees", "users")
       ERB
     end
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "products", force: :cascade do |t|
-        end
-
-        create_table "user", force: :cascade do |t|
+        create_table "users", force: :cascade do |t|
         end
 
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
@@ -351,7 +329,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, foreign_key: true
+          t.references :user, foreign_key: true
         end
       ERB
     end
@@ -375,9 +353,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-        create_table "products", force: :cascade do |t|
-        end
-        create_table "user", force: :cascade do |t|
+        create_table "users", force: :cascade do |t|
         end
       ERB
     end
@@ -390,11 +366,9 @@ 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, foreign_key: true
-        end
-        create_table "products", force: :cascade do |t|
+          t.references :user, foreign_key: true
         end
-        create_table "user", force: :cascade do |t|
+        create_table "users", force: :cascade do |t|
         end
       ERB
     end
@@ -407,17 +381,12 @@ 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
-        create_table "products", force: :cascade do |t|
-        end
-        create_table "user", force: :cascade do |t|
+        create_table "users", force: :cascade do |t|
         end
-        add_foreign_key("employees", "products", column: "products_id")
-        add_foreign_key("employees", "user")
+        add_foreign_key("employees", "users")
       ERB
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord