ridgepole 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ca4e6b9d4ac5f62c434e2cd3116f13b77e308666beb4e7e242def292d25957
-  data.tar.gz: 3cb9d7fb9e6949b9627ddb23219b5dbe7a7e34168e00fcf0cb073fd123b90e36
+  metadata.gz: a86332195811295a61f945779cad2b09c6fd8b01df116e505f89995c576f978c
+  data.tar.gz: 491952fd6d83ffb361bbae4153b0fff3d216512948ed0f6b521e408375f898ab
 SHA512:
-  metadata.gz: 9ba1cab03cb73b791fc28bf52985dd7caef619694fad6fc0ab9b22eedc53791da70050d6c77b4017019708dade6387777836c427dc080c9dace6690ac83a1a3b
-  data.tar.gz: 3f8446b608a6bdc86095aa3639bd3e57bcebdf423c858edf3f12613e98a6674be7bf210ec6443d0964189143cae3f5af4223a36cda705e8c0bf3ddaf44026fab
+  metadata.gz: e7868cb379bb0329e9efef9a5402c9ef5f369740aa4cd1ff68e80798582fbf32bdb6b15840e9866c0dff7aa3fe903aab8f7d7b07359137072face3c462407698
+  data.tar.gz: 94a72fd2146fbcdaa81c235916b3445c13d8eb3297b5c686c011938f6918d85383fb44b00513c52e96fca78b34b1a7b035558d03f36991e1cc0d277f9aa75ebe

data/README.md

@@ -105,6 +105,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Drop tables in an order considering foreign key constraints ([pull#284](https://github.com/winebarrel/ridgepole/pull/284))
 * `>= 0.8.2`
   * Support `postgres://` schema ([pull#285](https://github.com/winebarrel/ridgepole/pull/285))
+* `>= 0.8.3`
+  * Fix "topological sort failed" error ([pull#287](https://github.com/winebarrel/ridgepole/pull/287))
 </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] || {}).reverse_each do |table_name, attrs|
+      (@delta[:delete] || {}).each do |table_name, attrs|
         append_drop_table(table_name, attrs, buf)
       end
 

data/lib/ridgepole/diff.rb

@@ -47,6 +47,14 @@ module Ridgepole
 
           delta[:delete] ||= {}
           delta[:delete][table_name] = from_attrs
+
+          foreign_keys = from_attrs.fetch(:foreign_keys, {})
+          next if foreign_keys.empty?
+
+          table_delta = {}
+          scan_foreign_keys_change(foreign_keys, {}, table_delta, @options)
+          delta[:change] ||= {}
+          delta[:change][table_name] = table_delta
         end
       end
 

data/lib/ridgepole/dsl_parser.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'tsort'
-
 module Ridgepole
   class DSLParser
     def initialize(options = {})
@@ -12,11 +10,7 @@ module Ridgepole
       definition, execute = Context.eval(dsl, opts)
       check_orphan_index(definition)
       check_orphan_foreign_key(definition)
-      sorted_definition = {}
-      DependencyGraph.new(definition).tsort_each do |table_name|
-        sorted_definition[table_name] = definition[table_name]
-      end
-      [sorted_definition, execute]
+      [definition, execute]
     end
 
     private
@@ -32,22 +26,5 @@ 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.2'
+  VERSION = '0.8.3'
 end

data/spec/mysql/fk/migrate_drop_fk_spec.rb

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

metadata

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