ridgepole 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3784ad1d842d1d94b1990eada126a7e089be6b7be6f1d764baf8d0f9e78f9dc1
-  data.tar.gz: f69dc5c28eac0444853c39bf46e0a64f3e6acfd7ced84d46485993594f56a3b4
+  metadata.gz: b6de4765b254e55e4087b4fe7d99a9c23493e0c54b0a7c7e957b88488fa234d2
+  data.tar.gz: 6d05534c60e9f9f0967179520d8ecd83bee84b96cbe1e80cd4336327f7cb8c37
 SHA512:
-  metadata.gz: 3c61e60599c78c740e21f36e087e8d9931e01ed801c05a64e78b11dcca30f872acbe34df427fe27da44734e07a1bbb2f408fb6e2bec6e037224a33cdb6455cd5
-  data.tar.gz: fd7fabfea47e6d71217e0b38463d3049c58864d02f5f7e094b98c533802b54dfb55fd2932af603a219c846830e73c3e6d6d408917f703f84a65377f486f5ec44
+  metadata.gz: 1bb9273027a3b3d74c7c18faf25ba4b47033a44b98b12b1de80e04cd521aeb994f45168e97603b56c87dac6839990322eb8b2131e438320772983b9636a8695e
+  data.tar.gz: 49099509a1f3d8e5ae98fb7fe442e942ba7c7def24cf8a065e7c0d8838826e8ba4ec6394e4f9a5fa12cb906f2e850cb1a89e10496bbd07801ba746bf429f6389

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 3.0
 
+### 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/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

data/lib/ridgepole/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Genki Sugawara