ridgepole 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 364d6de92b64d5c1a7cd1328496cd707fe2b23aa
-  data.tar.gz: 6b29744eff3e8f363e0bd6f85a06b3b0f98987e5
+  metadata.gz: 9e1f7e2e2dcdca2d9af34e642e60289ee5666551
+  data.tar.gz: db223194fa6fff23ee8d8f5beeba4736f77a7f79
 SHA512:
-  metadata.gz: '089adc989dd8876a2e0882069ccce72632724de4dcef042a45f5865988eb0f40c7220370a1818df256ab5b1e3012e46c1e5ecee5a778efd3688dc1556dc091dc'
-  data.tar.gz: f09e7853188b8df4b72f4d7c6739079b2796ed2ad37f9feb62f1923838127cccba40030c871785cc8c767694401e8ef4bca2eec4443a538fd20d899e2eac109f
+  metadata.gz: 7d83dda15c6f6ba6374abfc165c688418d678d078d5ce1764f918c35209a3c67a1c61a04666b346be81076a4a19f6cd1622b6f876d79308c55401e9b14229706
+  data.tar.gz: 15cf3590d6a87f73744136b3b9f5170abedf673ccce912b16d3f6440fd7632d79e11704b6e642c890fb4260d46f92a8b57fe086cd651fb90d0250c0695b23d44

data/.travis.yml

@@ -10,9 +10,6 @@ rvm:
   - 2.3.6
   - 2.4.3
   - 2.5.0
-before_install:
-  - gem update --system
-  - gem install bundler
 before_script:
   - sudo service mysql stop
   - sudo service postgresql stop

data/README.md

@@ -5,10 +5,10 @@ Ridgepole is a tool to manage DB schema.
 It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.html#types-of-schema-dumps), and updates DB schema according to DSL.
 (like Chef/Puppet)
 
-[![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
-[![Unstable Version](https://img.shields.io/badge/unstable-0.7.3.beta3-green.svg?longCache=true&style=flat)](https://rubygems.org/gems/ridgepole/versions/0.7.3.beta3)
+[![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)<!--
+[![Unstable Version](https://img.shields.io/badge/unstable-0.7.3.beta3-green.svg?longCache=true&style=flat)](https://rubygems.org/gems/ridgepole/versions/0.7.3.beta3) -->
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.7)](https://travis-ci.org/winebarrel/ridgepole)
-<!-- [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.7)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.7) -->
+[![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.7)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.7)
 
 **ChangeLog**
 
@@ -87,6 +87,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add `--mysql-change-table-comment option` ([pull#166](https://github.com/winebarrel/ridgepole/pull/166))
   * Refactoring with RuboCop
   * Support primary key adding/dropping ([issue#246](https://github.com/winebarrel/ridgepole/issues/246))
+* `>= 0.7.4`
+  * Fix `add_foreign_key` options ([issue#250](https://github.com/winebarrel/ridgepole/issues/250))
 
 ## Installation
 

data/lib/ridgepole/dsl_parser/context.rb

@@ -86,6 +86,8 @@ module Ridgepole
         from_table = from_table.to_s
         to_table = to_table.to_s
         options[:name] = options[:name].to_s if options[:name]
+        options[:primary_key] = options[:primary_key].to_s if options[:primary_key]
+        options[:column] = options[:column].to_s if options[:column]
         @__definition[from_table] ||= {}
         @__definition[from_table][:foreign_keys] ||= {}
         idx = options[:name] || [from_table, to_table]

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.3'.freeze
+  VERSION = '0.7.4'.freeze
 end

data/ridgepole.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'erbh', '>= 0.1.2'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
   spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
-  spec.add_development_dependency 'mysql2', '~> 0.3.20'
+  spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

data/spec/mysql/fk/migrate_change_fk2_spec.rb

@@ -0,0 +1,45 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change fk' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "users", id: false, force: :cascade do |t|
+          t.bigint :my_original_id, null: false
+          t.index %i[my_original_id], unique: true
+        end
+
+        create_table "lessons", force: :cascade do |t|
+          t.bigint :user_id2, null: false
+          t.index %i[user_id2], name: :index_lessons_on_user_id2
+        end
+
+        add_foreign_key :lessons, :users, primary_key: :my_original_id, column: :user_id2
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "lessons", force: :cascade do |t|
+          t.bigint "user_id2", null: false
+          t.index ["user_id2"], name: "index_lessons_on_user_id2", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "users", id: false, force: :cascade do |t|
+          t.bigint "my_original_id", null: false
+          t.index ["my_original_id"], name: "index_users_on_my_original_id", unique: true, <%= i cond(5.0, using: :btree) %>
+        end
+
+        add_foreign_key "lessons", "users", primary_key: "my_original_id", column: "user_id2"
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+
+    subject { client }
+
+    it {
+      expect(subject.diff(actual_dsl).differ?).to be_falsey
+      expect(subject.diff(expected_dsl).differ?).to be_falsey
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -132,16 +132,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -291,6 +291,7 @@ files:
 - spec/mysql/dump/dump_spec.rb
 - spec/mysql/dump/dump_unknown_column_type_spec.rb
 - spec/mysql/dump/dump_without_table_options_spec.rb
+- spec/mysql/fk/migrate_change_fk2_spec.rb
 - spec/mysql/fk/migrate_change_fk_spec.rb
 - spec/mysql/fk/migrate_create_fk_spec.rb
 - spec/mysql/fk/migrate_drop_fk_spec.rb
@@ -448,6 +449,7 @@ test_files:
 - spec/mysql/dump/dump_spec.rb
 - spec/mysql/dump/dump_unknown_column_type_spec.rb
 - spec/mysql/dump/dump_without_table_options_spec.rb
+- spec/mysql/fk/migrate_change_fk2_spec.rb
 - spec/mysql/fk/migrate_change_fk_spec.rb
 - spec/mysql/fk/migrate_create_fk_spec.rb
 - spec/mysql/fk/migrate_drop_fk_spec.rb