ridgepole 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d387024f72e2f0cadf0c913d9d6d1863753401ed8cdd35759effd47e5405d3fd
-  data.tar.gz: ed16c2c4ce6e91797eba24c94384dc2e03db5e39ca18e9119daa4e19a67bd97e
+  metadata.gz: 90db85660b9c1b91946bec50b7af82e03d3b686a3270ba4c12f7253dd31ecd40
+  data.tar.gz: '09660a78f0e35155b58423d737391b531405aa895edab86bcc8f6f4213461fef'
 SHA512:
-  metadata.gz: ea58375d9d0f3aa45084f08dabdea2719bbdd973229214dd60388fdd375d05dc3814b9131afb48a0c3b445b505a23f7c25b99a27f255549db81abf948a88a04e
-  data.tar.gz: 692d7e680804f86feab03fdebf1aa8f0f88af8f752e04cafec57a5406be64240114d6327a1651a74dae483d31336d0ab09b0f566524f8bd7f133a3e0e9862bb7
+  metadata.gz: 4e86c295eaafec04bcd2235932312e74d327abb7db2f5be519da092c87a585ade3c9ce7887720426b76ad532ec7e467e4cebd1f570e9a8cb6b0ff3dbcba7f13e
+  data.tar.gz: 55dc8d759ec3d788fc07f24ca15c48ca323166bf838f6ebe8ae13383192c5c15577da07d2f431f30c5c8571dfed24fa90dd62aa72cd20afff7abc40af0bca4ba

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 3.0
 
+### 3.1.1 (2025/10/31)
+
+- Add `--disable-sort-columns` option [pull#601](https://github.com/ridgepole/ridgepole/pull/601)
+
 ### 3.1.0 (2025/10/30)
 
 - Support Rails 8.1 [pull#589](https://github.com/ridgepole/ridgepole/pull/589)

data/README.md

@@ -9,7 +9,14 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 [![test](https://github.com/ridgepole/ridgepole/actions/workflows/test.yml/badge.svg)](https://github.com/ridgepole/ridgepole/actions/workflows/test.yml)
 [![Coverage Status](https://coveralls.io/repos/github/ridgepole/ridgepole/badge.svg?branch=3.0)](https://coveralls.io/github/ridgepole/ridgepole?branch=3.0)
 
+> [!warning]
+> The order of columns when exporting has changed in Rails 8.1. https://github.com/rails/rails/pull/53281
+>
+> If you do not want to sort the columns, use `--disable-sort-columns` option.
+
 > [!note]
+> * ridgepole v3.1.0
+>   * Support Rails 8.1 (cf. https://github.com/ridgepole/ridgepole/pull/589)
 > * ridgepole v3.0.0
 >   * Support Rails 8.0 (cf. https://github.com/ridgepole/ridgepole/pull/504)
 > * ridgepole v2.0.0
@@ -92,6 +99,7 @@ Usage: ridgepole [options]
         --skip-column-comment-change
         --allow-pk-change
         --create-table-with-index
+        --disable-sort-columns
         --mysql-dump-auto-increment
     -r, --require LIBS
         --log-file LOG_FILE

data/bin/ridgepole

@@ -145,6 +145,7 @@ ARGV.options do |opt|
   opt.on('',   '--skip-column-comment-change') { options[:skip_column_comment_change] = true }
   opt.on('',   '--allow-pk-change') { options[:allow_pk_change] = true }
   opt.on('',   '--create-table-with-index') { options[:create_table_with_index] = true }
+  opt.on('',   '--disable-sort-columns') { options[:disable_sort_columns] = true }
 
   opt.on('',   '--mysql-dump-auto-increment') do
     options[:mysql_dump_auto_increment] = true

data/lib/ridgepole/client.rb

@@ -16,6 +16,7 @@ module Ridgepole
       @diff = Ridgepole::Diff.new(@options)
 
       require 'ridgepole/ext/abstract_mysql_adapter/dump_auto_increment' if @options[:mysql_dump_auto_increment]
+      require 'ridgepole/ext/schema_dumper/disable_sort_columns' if @options[:disable_sort_columns]
     end
 
     def dump(&block)

data/lib/ridgepole/ext/schema_dumper/disable_sort_columns.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'active_record/schema_dumper'
+
+module Ridgepole
+  module Ext
+    module SchemaDumper
+      module DisableSortColumns
+        def table(table, stream)
+          def @connection.columns(*_args)
+            cols = super
+            def cols.sort_by(*_args, &_block)
+              self
+            end
+            cols
+          end
+          super
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  class SchemaDumper
+    prepend Ridgepole::Ext::SchemaDumper::DisableSortColumns
+  end
+end

data/lib/ridgepole/ext/schema_dumper/foreign_keys.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'active_record/schema_dumper'
+
+module Ridgepole
+  module Ext
+    module SchemaDumper
+      module ForeignKeys
+        def self.prepended(klass)
+          klass.extend ClassMethods
+        end
+
+        module ClassMethods
+          attr_reader :__with_default_fk_name
+
+          def with_default_fk_name(value)
+            @__with_default_fk_name = value
+            yield
+          ensure
+            remove_instance_variable(:@__with_default_fk_name)
+          end
+        end
+
+        def foreign_keys(table, stream)
+          return super unless ActiveRecord::SchemaDumper.__with_default_fk_name
+
+          if (foreign_keys = @connection.foreign_keys(table)).any?
+            add_foreign_key_statements = foreign_keys.map do |foreign_key|
+              parts = [
+                "add_foreign_key #{remove_prefix_and_suffix(foreign_key.from_table).inspect}",
+                remove_prefix_and_suffix(foreign_key.to_table).inspect
+              ]
+
+              parts << "column: #{foreign_key.column.inspect}" if foreign_key.column != foreign_key_column_for(foreign_key)
+
+              parts << "primary_key: #{foreign_key.primary_key.inspect}" if foreign_key.custom_primary_key?
+
+              parts << "name: #{foreign_key.name.inspect}"
+
+              parts << "on_update: #{foreign_key.on_update.inspect}" if foreign_key.on_update
+              parts << "on_delete: #{foreign_key.on_delete.inspect}" if foreign_key.on_delete
+
+              "  #{parts.join(', ')}"
+            end
+
+            stream.puts add_foreign_key_statements.sort.join("\n")
+          end
+        end
+
+        private
+
+        def foreign_key_column_for(foreign_key)
+          if ActiveRecord.gem_version < Gem::Version.new('7.1.0')
+            @connection.foreign_key_column_for(foreign_key.to_table)
+          else
+            @connection.foreign_key_column_for(foreign_key.to_table, 'id')
+          end
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  class SchemaDumper
+    prepend Ridgepole::Ext::SchemaDumper::ForeignKeys
+  end
+end

data/lib/ridgepole/version.rb

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

data/lib/ridgepole.rb

@@ -17,7 +17,7 @@ module Ridgepole; end
 
 require 'ridgepole/ext/abstract_adapter/disable_table_options'
 require 'ridgepole/ext/pp_sort_hash'
-require 'ridgepole/ext/schema_dumper'
+require 'ridgepole/ext/schema_dumper/foreign_keys'
 require 'ridgepole/client'
 require 'ridgepole/connection_adapters'
 require 'ridgepole/default_limit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Genki Sugawara
@@ -337,7 +337,8 @@ files:
 - lib/ridgepole/ext/abstract_adapter/disable_table_options.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/dump_auto_increment.rb
 - lib/ridgepole/ext/pp_sort_hash.rb
-- lib/ridgepole/ext/schema_dumper.rb
+- lib/ridgepole/ext/schema_dumper/disable_sort_columns.rb
+- lib/ridgepole/ext/schema_dumper/foreign_keys.rb
 - lib/ridgepole/external_sql_executer.rb
 - lib/ridgepole/logger.rb
 - lib/ridgepole/migration_ext.rb

data/lib/ridgepole/ext/schema_dumper.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_record/schema_dumper'
-
-module Ridgepole
-  module Ext
-    module SchemaDumper
-      def self.prepended(klass)
-        klass.extend ClassMethods
-      end
-
-      module ClassMethods
-        attr_reader :__with_default_fk_name
-
-        def with_default_fk_name(value)
-          @__with_default_fk_name = value
-          yield
-        ensure
-          remove_instance_variable(:@__with_default_fk_name)
-        end
-      end
-
-      def foreign_keys(table, stream)
-        return super unless ActiveRecord::SchemaDumper.__with_default_fk_name
-
-        if (foreign_keys = @connection.foreign_keys(table)).any?
-          add_foreign_key_statements = foreign_keys.map do |foreign_key|
-            parts = [
-              "add_foreign_key #{remove_prefix_and_suffix(foreign_key.from_table).inspect}",
-              remove_prefix_and_suffix(foreign_key.to_table).inspect
-            ]
-
-            parts << "column: #{foreign_key.column.inspect}" if foreign_key.column != foreign_key_column_for(foreign_key)
-
-            parts << "primary_key: #{foreign_key.primary_key.inspect}" if foreign_key.custom_primary_key?
-
-            parts << "name: #{foreign_key.name.inspect}"
-
-            parts << "on_update: #{foreign_key.on_update.inspect}" if foreign_key.on_update
-            parts << "on_delete: #{foreign_key.on_delete.inspect}" if foreign_key.on_delete
-
-            "  #{parts.join(', ')}"
-          end
-
-          stream.puts add_foreign_key_statements.sort.join("\n")
-        end
-      end
-
-      private
-
-      def foreign_key_column_for(foreign_key)
-        if ActiveRecord.gem_version < Gem::Version.new('7.1.0')
-          @connection.foreign_key_column_for(foreign_key.to_table)
-        else
-          @connection.foreign_key_column_for(foreign_key.to_table, 'id')
-        end
-      end
-    end
-  end
-end
-
-module ActiveRecord
-  class SchemaDumper
-    prepend Ridgepole::Ext::SchemaDumper
-  end
-end