ridgepole 0.6.4.beta7 → 0.6.4.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85f4b8fba0204ab640ff42e01840aaac4c20c5f
-  data.tar.gz: 845a7fb75b36c131cb50c8bcfcef07337d3bf1b8
+  metadata.gz: c1ae2391d3c7bf2181214d399041cc5c0f60bbd2
+  data.tar.gz: 7ad90f10b0ad7048c4d239851e6817ab816a31b5
 SHA512:
-  metadata.gz: 983d3bcb1fe098093d15e5534ae8527754526c8e38d0b005960c5437a15b5a33abcf78cdc92ad0ed42ae55d203b041448321c67ed762be554078b901d76c2a6b
-  data.tar.gz: 4c9746ef67883ddd8aa34ff9f631da579b38f0ec0fc3aa4316d67cba94cd3c44cf9a37fa5a9226d94b700982de921722a89dfc5f035b76414634aa9336cf2e90
+  metadata.gz: 17133898702087b8e861f19733ccb2635681ffe7947c2f6ad85182fd807df326642ee3d8eeb2bd2cb3520c0175d748230133088dd3ddeeff3a58b1f229ffa14f
+  data.tar.gz: ff545ea16b28593d1336cda7724cffc8df406b6cc2d86ed691cabf46cbeb10f97e712fa71b6f4975ba9240517746ff5b19eb6c279d607fca41e9f68db90cc0af

data/.travis.yml

@@ -1,4 +1,5 @@
-sudo: false
+dist: trusty
+sudo: required
 language: ruby
 cache: bundler
 rvm:
@@ -7,7 +8,7 @@ rvm:
   - 2.2.4
   - 2.3.0
 before_install:
-  - gem update bundler
+  - gem install bundler
 script:
   - bundle install
   - bundle exec rake
@@ -18,3 +19,8 @@ env:
     - POSTGRESQL=1
 addons:
   postgresql: "9.4"
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6

data/README.md

@@ -49,6 +49,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add `--dump-with-default-fk-name` option
   * Support `t.index` ([pull#64](https://github.com/winebarrel/ridgepole/pull/64))
   * Remove migration_comments
+  * Fix foreign key apply order
 
 ## Installation
 
@@ -99,7 +100,6 @@ Usage: ridgepole [options]
         --dump-without-table-options
         --dump-with-default-fk-name
         --index-removed-drop-column
-        --enable-migration-comments
     -r, --require LIBS
         --log-file LOG_FILE
         --verbose

data/lib/ridgepole/delta.rb

@@ -22,9 +22,10 @@ class Ridgepole::Delta
 
   def script
     buf = StringIO.new
+    buf_for_fk = StringIO.new
 
     (@delta[:add] || {}).each do |table_name, attrs|
-      append_create_table(table_name, attrs, buf)
+      append_create_table(table_name, attrs, buf, buf_for_fk)
     end
 
     (@delta[:rename] || {}).each do |table_name, attrs|
@@ -32,14 +33,14 @@ class Ridgepole::Delta
     end
 
     (@delta[:change] || {}).each do |table_name, attrs|
-      append_change(table_name, attrs, buf)
+      append_change(table_name, attrs, buf, buf_for_fk)
     end
 
     (@delta[:delete] || {}).each do |table_name, attrs|
       append_drop_table(table_name, attrs, buf)
     end
 
-    buf.string.strip
+    (buf.string.strip + "\n\n" + buf_for_fk.string.strip).strip
   end
 
   def differ?
@@ -210,7 +211,7 @@ class Ridgepole::Delta
     end
   end
 
-  def append_create_table(table_name, attrs, buf)
+  def append_create_table(table_name, attrs, buf, buf_for_fk)
     options = attrs[:options] || {}
     options[:options] ||= @options[:table_options] if @options[:table_options]
     definition = attrs[:definition] || {}
@@ -244,11 +245,12 @@ end
 
     unless (foreign_keys = attrs[:foreign_keys] || {}).empty?
       foreign_keys.each do |foreign_key_name, foreign_key_attrs|
-        append_add_foreign_key(table_name, foreign_key_name, foreign_key_attrs, buf, @options)
+        append_add_foreign_key(table_name, foreign_key_name, foreign_key_attrs, buf_for_fk, @options)
       end
     end
 
     buf.puts
+    buf_for_fk.puts
   end
 
   def append_rename_table(to_table_name, from_table_name, buf)
@@ -267,7 +269,7 @@ drop_table(#{table_name.inspect})
     buf.puts
   end
 
-  def append_change(table_name, attrs, buf)
+  def append_change(table_name, attrs, buf, buf_for_fk)
     definition = attrs[:definition] || {}
     indices = attrs[:indices] || {}
     foreign_keys = attrs[:foreign_keys] || {}
@@ -280,10 +282,11 @@ drop_table(#{table_name.inspect})
     end
 
     unless foreign_keys.empty?
-      append_change_foreign_keys(table_name, foreign_keys, buf, @options)
+      append_change_foreign_keys(table_name, foreign_keys, buf_for_fk, @options)
     end
 
     buf.puts
+    buf_for_fk.puts
   end
 
   def append_change_table(table_name, buf)

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.4.beta7'
+  VERSION = '0.6.4.beta8'
 end

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -55,10 +55,6 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
   context 'when create fk when create table' do
     let(:dsl) {
       <<-RUBY
-# Define parent before child
-create_table "parent", force: :cascade do |t|
-end
-
 create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
@@ -66,12 +62,14 @@ end
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
+
+create_table "parent", force: :cascade do |t|
+end
       RUBY
     }
 
     let(:sorted_dsl) {
       <<-RUBY
-
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", limit: 4
 end
@@ -99,10 +97,6 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
   context 'already defined' do
     let(:dsl) {
       <<-RUBY
-# Define parent before child
-create_table "parent", force: :cascade do |t|
-end
-
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
@@ -112,6 +106,9 @@ add_index "child", ["parent_id"], name: "par_id", using: :btree
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"
+
+create_table "parent", force: :cascade do |t|
+end
       RUBY
     }
 
@@ -127,10 +124,6 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
   context 'no name' do
     let(:dsl) {
       <<-RUBY
-# Define parent before child
-create_table "parent", force: :cascade do |t|
-end
-
 create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
@@ -138,6 +131,9 @@ end
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
 add_foreign_key "child", "parent"
+
+create_table "parent", force: :cascade do |t|
+end
       RUBY
     }
 
@@ -153,11 +149,10 @@ add_foreign_key "child", "parent"
   context 'orphan fk' do
     let(:dsl) {
       <<-RUBY
-# Define parent before child
+add_foreign_key "child", "parent", name: "child_ibfk_1"
+
 create_table "parent", force: :cascade do |t|
 end
-
-add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.4.beta7
+  version: 0.6.4.beta8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-mysql-awesome
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.7
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
@@ -131,9 +131,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -258,17 +258,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.