ridgepole 3.1.4 → 3.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3784ad1d842d1d94b1990eada126a7e089be6b7be6f1d764baf8d0f9e78f9dc1
-  data.tar.gz: f69dc5c28eac0444853c39bf46e0a64f3e6acfd7ced84d46485993594f56a3b4
+  metadata.gz: 3779bc8749c7a1bbfff8cffe381af079bdeaa0caaa6b7f9058990c0089a9052b
+  data.tar.gz: a71190beaa092b5167020190ffc76405712116d8c0f9cab99c286cdf2e49824f
 SHA512:
-  metadata.gz: 3c61e60599c78c740e21f36e087e8d9931e01ed801c05a64e78b11dcca30f872acbe34df427fe27da44734e07a1bbb2f408fb6e2bec6e037224a33cdb6455cd5
-  data.tar.gz: fd7fabfea47e6d71217e0b38463d3049c58864d02f5f7e094b98c533802b54dfb55fd2932af603a219c846830e73c3e6d6d408917f703f84a65377f486f5ec44
+  metadata.gz: 2e61dd23b379debefeeaafdfbc9b7f9381a3b8e8cf3fc07c893038b1231a4f401dd440f35bd19802d0829a643b0f40d5363b2f3e934cafadfa2aa9766cd7cdcd
+  data.tar.gz: 5ca8c6ced24e4d9276da3cef89278497e177b11af4c3a5b468401d7773dd8559c6de2f6178178f9db5110c17b3dd40b30610459dae19de6dfb9113ad63c92f79

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## 3.0
 
+### 3.2.0.beta (2026/03/22)
+
+- Use `udiff` instead of `diffy`. [pull#657](https://github.com/ridgepole/ridgepole/pull/657)
+
+### 3.1.5 (2026/03/21)
+
+- Fix for renaming references column. [pull#652](https://github.com/ridgepole/ridgepole/pull/652)
+- Fix for creating table with non-PK auto_increment column. [pull#650](https://github.com/ridgepole/ridgepole/pull/650)
+
 ### 3.1.4 (2026/03/20)
 
 - Fix for errors when changing generated columns. [pull#642](https://github.com/ridgepole/ridgepole/pull/642) [pull#646](https://github.com/ridgepole/ridgepole/pull/646)

data/README.md

@@ -15,6 +15,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 > If you do not want to sort the columns, use `--disable-sort-columns` option.
 
 > [!note]
+> * ridgepole v3.2.0
+>   * Use `udiff` instead of `diffy` (cf. https://github.com/ridgepole/ridgepole/pull/657)
 > * ridgepole v3.1.0
 >   * Support Rails 8.1 (cf. https://github.com/ridgepole/ridgepole/pull/589)
 > * ridgepole v3.0.0

data/lib/ridgepole/delta.rb

@@ -243,10 +243,18 @@ create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(optio
       RUBY
       end
 
-      if @options[:create_table_with_index] && !indices.empty?
-        indices.each do |index_name, index_attrs|
-          append_add_index(table_name, index_name, index_attrs, buf, true)
-        end
+      # Partition indices: indices referencing auto_increment columns must be
+      # inside CREATE TABLE on MySQL to avoid "must be defined as a key" error.
+      # cf. https://github.com/ridgepole/ridgepole/issues/494
+      if @options[:create_table_with_index]
+        indices_in_create = indices
+        indices_after_create = {}
+      else
+        indices_in_create, indices_after_create = partition_indices_for_create(definition, indices)
+      end
+
+      indices_in_create.each do |index_name, index_attrs|
+        append_add_index(table_name, index_name, index_attrs, buf, true)
       end
 
       unless (check_constraints = attrs[:check_constraints] || {}).empty?
@@ -271,9 +279,9 @@ create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(optio
 end
       RUBY
 
-      if !@options[:create_table_with_index] && !indices.empty?
+      unless indices_after_create.empty?
         append_change_table(table_name, buf) do
-          indices.each do |index_name, index_attrs|
+          indices_after_create.each do |index_name, index_attrs|
             append_add_index(table_name, index_name, index_attrs, buf)
           end
         end
@@ -289,6 +297,30 @@ end
       post_buf_for_fk.puts
     end
 
+    def partition_indices_for_create(definition, indices)
+      return [{}, indices] unless Ridgepole::ConnectionAdapters.mysql?
+
+      auto_increment_columns = definition.select do |_col_name, col_attrs|
+        col_attrs.dig(:options, :auto_increment)
+      end.keys
+
+      return [{}, indices] if auto_increment_columns.empty?
+
+      in_create = {}
+      after_create = {}
+
+      indices.each do |idx_name, idx_attrs|
+        columns = Array(idx_attrs[:column_name])
+        if (columns & auto_increment_columns).any?
+          in_create[idx_name] = idx_attrs
+        else
+          after_create[idx_name] = idx_attrs
+        end
+      end
+
+      [in_create, after_create]
+    end
+
     def append_rename_table(to_table_name, from_table_name, buf)
       buf.puts(<<-RUBY)
 rename_table(#{from_table_name.inspect}, #{to_table_name.inspect})

data/lib/ridgepole/diff.rb

@@ -103,6 +103,7 @@ module Ridgepole
 
       scan_options_change(table_name, from[:options], to[:options], table_delta)
       scan_definition_change(from[:definition], to[:definition], from[:indices], table_name, from[:options], table_delta)
+      apply_column_renames_to_indices(from[:indices], table_delta.dig(:definition, :rename))
       scan_indices_change(from[:indices], to[:indices], to[:definition], table_delta, from[:options], to[:options])
       scan_foreign_keys_change(from[:foreign_keys], to[:foreign_keys], table_delta, @options)
       scan_check_constraints_change(from[:check_constraints], to[:check_constraints], table_delta)
@@ -342,6 +343,19 @@ module Ridgepole
       end
     end
 
+    def apply_column_renames_to_indices(indices, renames)
+      return unless indices && renames
+
+      # renames: { new_column_name => old_column_name }
+      rename_map = renames.invert # { old_column_name => new_column_name }
+
+      indices.each_value do |attrs|
+        next unless attrs[:column_name].is_a?(Array)
+
+        attrs[:column_name] = attrs[:column_name].map { |col| rename_map[col] || col }
+      end
+    end
+
     def scan_indices_change(from, to, to_columns, table_delta, _from_table_options, to_table_options)
       from = (from || {}).dup
       to = (to || {}).dup
@@ -683,13 +697,12 @@ module Ridgepole
       obj1 = Ridgepole::Ext::PpSortHash.extend_if_hash(obj1)
       obj2 = Ridgepole::Ext::PpSortHash.extend_if_hash(obj2)
 
-      diffy = Diffy::Diff.new(
+      diff = Udiff::Diff.new(
         obj1.pretty_inspect,
-        obj2.pretty_inspect,
-        diff: '-u'
+        obj2.pretty_inspect
       )
 
-      diffy.to_s(@options[:color] ? :color : :text).gsub(/\s+\z/m, '')
+      diff.to_s(@options[:color] ? :color : :text).gsub(/\s+\z/m, '')
     end
 
     def collect_relation_info!(table_name, table_attr, relation_info)

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '3.1.4'
+  VERSION = '3.2.0.beta'
 end

data/lib/ridgepole.rb

@@ -11,7 +11,7 @@ require 'active_record'
 require 'active_support'
 require 'active_support/core_ext'
 
-require 'diffy'
+require 'udiff'
 
 module Ridgepole; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
@@ -30,7 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '8.3'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,19 +44,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: udiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement