ridgepole 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b24a10a4161326fb28338d3a5e6bbedea7a70d8c7425a070b7955212532b939e
-  data.tar.gz: c95733535de966cf7c191b5c9c52c36d561315efd241f30665723d62e70bf280
+  metadata.gz: 0a3e5a9549db69b5028a0f9a8bc7cff951a3617ca7eced3c6be06f31bc373f4e
+  data.tar.gz: 756a16fecffa1a8c0f62a3f0a5d58a142377ca99509106865354ae6b8676317f
 SHA512:
-  metadata.gz: 9126dc1fbd0ca8000bdcb6daf5ef5050ffe1524081e8b161f48783574c448f432e9f7e7c74832b2c0b9d04c9074313350753aefaa61860f9380d5e5e904ee369
-  data.tar.gz: 062aa79acfcaa448720bffbc1f3f6973aee7302e9e9e24399270a5ac998c0b5ef656c8fc69424f7c44e1ddd50cb8a74031df2fed9be1977f9c899dd08cc056f4
+  metadata.gz: 6441491b72d7dcdfad0e74e58bfd6a950d3ed7876e9060e5812b86b013ddae9cd69d65f86ac1d7d32f4b046d0c1e2e126deade4ef891ab25954b4683d13bd32d
+  data.tar.gz: f30396aead19b62e243a2b135a27a2313ebbd05d429803ea8e0ee38c841f6729801a211cfa57e6d8f9b59fbef834f23d43d73d4f1684455bee19210f8eecce0e

data/README.md

@@ -101,6 +101,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Fix for `add_foreign_key(..., column: ,,,)` ([pull#278](https://github.com/winebarrel/ridgepole/pull/278))
 * `>= 0.8.0`
   * Support Rails 6.0
+* `>= 0.8.1`
+  * Drop tables in an order considering foreign key constraints ([pull#284](https://github.com/winebarrel/ridgepole/pull/284))
 </details>
 
 ## Installation

data/lib/ridgepole/delta.rb

@@ -42,7 +42,7 @@ module Ridgepole
         append_change(table_name, attrs, buf, pre_buf_for_fk, post_buf_for_fk)
       end
 
-      (@delta[:delete] || {}).each do |table_name, attrs|
+      (@delta[:delete] || {}).reverse_each do |table_name, attrs|
         append_drop_table(table_name, attrs, buf)
       end
 

data/lib/ridgepole/dsl_parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'tsort'
+
 module Ridgepole
   class DSLParser
     def initialize(options = {})
@@ -10,7 +12,11 @@ module Ridgepole
       definition, execute = Context.eval(dsl, opts)
       check_orphan_index(definition)
       check_orphan_foreign_key(definition)
-      [definition, execute]
+      sorted_definition = {}
+      DependencyGraph.new(definition).tsort_each do |table_name|
+        sorted_definition[table_name] = definition[table_name]
+      end
+      [sorted_definition, execute]
     end
 
     private
@@ -26,5 +32,22 @@ module Ridgepole
         raise "Table `#{table_name}` to create the foreign key is not defined: #{attrs[:foreign_keys].keys.join(',')}" if attrs[:foreign_keys] && !(attrs[:definition])
       end
     end
+
+    class DependencyGraph
+      include TSort
+
+      def initialize(definition)
+        @definition = definition
+      end
+
+      def tsort_each_child(table_name, &block)
+        keys = @definition[table_name].fetch(:foreign_keys, {})
+        keys.each_value { |v| block.call(v[:to_table]) }
+      end
+
+      def tsort_each_node(&block)
+        @definition.each_key(&block)
+      end
+    end
   end
 end

data/lib/ridgepole/version.rb

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

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -60,29 +60,29 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk when drop table' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "0_parent", <%= i cond('>= 5.1',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", <%= i cond(5.0, using: :btree) %>
+        create_table "1_child", force: :cascade do |t|
+          t.integer "0_parent_id"
+          t.index ["0_parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "1_child", "0_parent", name: "child_ibfk_1"
       ERB
     end
 
     let(:sorted_dsl) do
       erbh(<<-ERB)
-        create_table "child", force: :cascade do |t|
-          t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        create_table "0_parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "1_child", force: :cascade do |t|
+          t.integer "0_parent_id"
+          t.index ["0_parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "1_child", "0_parent", name: "child_ibfk_1"
       ERB
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -442,8 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.