ridgepole 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a248172bd53075285dcb1fa69f4c8e3bcfa8ab382445e78823d1a284695c3d
-  data.tar.gz: f7568382f78041f9279ff389e1b4f17f389f6ebfef37bde0c9b557ea2f0efeed
+  metadata.gz: aa8b60187f54d3f6f510aae6326606c4d0885c3867cc48c6b51d27fd5ac1c5e1
+  data.tar.gz: 5c52635dff367490eeb5ebda435ea26e4c90f784ef4036c21fb6d58865b93674
 SHA512:
-  metadata.gz: 331e86965d4537a88a18d56fc593bf7359a8cee7d4ea69e1e401d53cf2c704b86dae70db004b29738025b2851b528d4a03cc8cea0270b56ffe96cbb41df4d3a9
-  data.tar.gz: 1704cb3599ee8de9695efa8a4af09134f876192ff902ec111a705bdb0ab6f56a8af7bf2e59148fee9037866dab605e622b99c11137330f66decf4df316728e00
+  metadata.gz: 54c4b813601a1bc68891456a7d95ab41641dc63270ca22b0652f06d6757d49b6740a6c0738cc3f5f28c69c5d80c22bd2ecb0b7e7d7de12e6c321f591b95db6cd
+  data.tar.gz: df2418e5c2bb8ebfe5759c04d3656e524f3b94e995ba24c67f6e74629bdce00667c324d0265433a7333b335ab9245b133c5212a5f0dc282a57692bb6c83b41cf

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## 3.2
 
+### 3.2.2 (2026/06/14)
+
+- Fix constraint removal order when dropping columns. [pull#705](https://github.com/ridgepole/ridgepole/pull/705)
+
+### 3.2.1 (2026/05/04)
+
+- Warn when an anonymous index ambiguously matches multiple DB indexes. [pull#692](https://github.com/ridgepole/ridgepole/pull/692)
+
 ### 3.2.0 (2026/03/28)
 
 - Fix spurious diff for `timestamp`/`datetime` with `precision: 6` on MySQL. [pull#665](https://github.com/ridgepole/ridgepole/pull/665)

data/README.md

@@ -9,6 +9,12 @@ 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)
 [![codecov](https://codecov.io/gh/ridgepole/ridgepole/graph/badge.svg)](https://codecov.io/gh/ridgepole/ridgepole)
 
+> [!TIP]
+> Also developing similar declarative schema tools — single Go binary, plain SQL as the schema definition:
+>
+> * [pistachio](https://github.com/winebarrel/pistachio): for PostgreSQL
+> * [myschema](https://github.com/winebarrel/myschema): for MySQL
+
 > [!warning]
 > The order of columns when exporting has changed in Rails 8.1. https://github.com/rails/rails/pull/53281
 >
@@ -315,11 +321,11 @@ EOS
 
 execute("CREATE OR REPLACE VIEW `active_users` AS #{view_select}") do |c|
   definition = c.raw_connection.query(<<-SQL).first&.first
-    SELECT SHA(VIEW_DEFINITION) FROM information_schema.views
+    SELECT VIEW_DEFINITION FROM information_schema.views
      WHERE TABLE_SCHEMA = 'mydb'
        AND TABLE_NAME = 'active_users';
   SQL
-  definition != view_select
+  definition&.strip != view_select
 end
 ```
 

data/lib/ridgepole/delta.rb

@@ -31,11 +31,11 @@ module Ridgepole
 
     def script
       buf = StringIO.new
-      pre_buf_for_fk = StringIO.new
-      post_buf_for_fk = StringIO.new
+      pre_buf = StringIO.new
+      post_buf = StringIO.new
 
       (@delta[:add] || {}).each do |table_name, attrs|
-        append_create_table(table_name, attrs, buf, post_buf_for_fk)
+        append_create_table(table_name, attrs, buf, post_buf)
       end
 
       (@delta[:rename] || {}).each do |table_name, attrs|
@@ -43,7 +43,7 @@ module Ridgepole
       end
 
       (@delta[:change] || {}).each do |table_name, attrs|
-        append_change(table_name, attrs, buf, pre_buf_for_fk, post_buf_for_fk)
+        append_change(table_name, attrs, buf, pre_buf, post_buf)
       end
 
       (@delta[:delete] || {}).each do |table_name, attrs|
@@ -51,9 +51,9 @@ module Ridgepole
       end
 
       [
-        pre_buf_for_fk,
+        pre_buf,
         buf,
-        post_buf_for_fk
+        post_buf
       ].map { |b| b.string.strip }.join("\n\n").strip
     end
 
@@ -221,7 +221,7 @@ module Ridgepole
       end
     end
 
-    def append_create_table(table_name, attrs, buf, post_buf_for_fk)
+    def append_create_table(table_name, attrs, buf, post_buf)
       options = attrs[:options] || {}
       definition = attrs[:definition] || {}
       indices = attrs[:indices] || {}
@@ -289,12 +289,12 @@ end
 
       unless (foreign_keys = attrs[:foreign_keys] || {}).empty?
         foreign_keys.each_value do |foreign_key_attrs|
-          append_add_foreign_key(table_name, foreign_key_attrs, post_buf_for_fk, @options)
+          append_add_foreign_key(table_name, foreign_key_attrs, post_buf, @options)
         end
       end
 
       buf.puts
-      post_buf_for_fk.puts
+      post_buf.puts
     end
 
     def partition_indices_for_create(definition, indices)
@@ -370,7 +370,7 @@ change_table_comment(#{table_name.inspect}, #{table_comment.inspect})
       end
     end
 
-    def append_change(table_name, attrs, buf, pre_buf_for_fk, post_buf_for_fk)
+    def append_change(table_name, attrs, buf, pre_buf, post_buf)
       definition = attrs[:definition] || {}
       primary_key_definition = attrs[:primary_key_definition] || {}
       indices = attrs[:indices] || {}
@@ -393,10 +393,10 @@ change_table_comment(#{table_name.inspect}, #{table_comment.inspect})
         end
       end
 
-      append_change_foreign_keys(table_name, foreign_keys, pre_buf_for_fk, post_buf_for_fk, @options) unless foreign_keys.empty?
-      append_change_check_constraints(table_name, check_constraints, buf) unless check_constraints.empty?
-      append_change_exclusion_constraints(table_name, exclusion_constraints, buf) unless exclusion_constraints.empty?
-      append_change_unique_constraints(table_name, unique_constraints, buf) unless unique_constraints.empty?
+      append_change_foreign_keys(table_name, foreign_keys, pre_buf, post_buf, @options) unless foreign_keys.empty?
+      append_change_check_constraints(table_name, check_constraints, pre_buf, post_buf) unless check_constraints.empty?
+      append_change_exclusion_constraints(table_name, exclusion_constraints, pre_buf, post_buf) unless exclusion_constraints.empty?
+      append_change_unique_constraints(table_name, unique_constraints, pre_buf, post_buf) unless unique_constraints.empty?
 
       if table_options || table_charset || table_collation
         append_change_table_raw_options(table_name, table_options, table_charset, table_collation,
@@ -407,8 +407,8 @@ change_table_comment(#{table_name.inspect}, #{table_comment.inspect})
       append_change_column_comments(table_name, column_comments, buf) unless column_comments.empty?
 
       buf.puts
-      pre_buf_for_fk.puts
-      post_buf_for_fk.puts
+      pre_buf.puts
+      post_buf.puts
     end
 
     def append_change_column_comments(table_name, column_comments, buf)
@@ -560,13 +560,13 @@ remove_index(#{table_name.inspect}, #{target})
       end
     end
 
-    def append_change_foreign_keys(table_name, delta, pre_buf_for_fk, post_buf_for_fk, options)
+    def append_change_foreign_keys(table_name, delta, pre_buf, post_buf, options)
       (delta[:delete] || {}).each_value do |attrs|
-        append_remove_foreign_key(table_name, attrs, pre_buf_for_fk, options)
+        append_remove_foreign_key(table_name, attrs, pre_buf, options)
       end
 
       (delta[:add] || {}).each_value do |attrs|
-        append_add_foreign_key(table_name, attrs, post_buf_for_fk, options)
+        append_add_foreign_key(table_name, attrs, post_buf, options)
       end
     end
 
@@ -594,13 +594,13 @@ remove_foreign_key(#{table_name.inspect}, #{target})
     RUBY
     end
 
-    def append_change_check_constraints(table_name, delta, buf)
+    def append_change_check_constraints(table_name, delta, pre_buf, post_buf)
       (delta[:delete] || {}).each_value do |attrs|
-        append_remove_check_constraint(table_name, attrs, buf)
+        append_remove_check_constraint(table_name, attrs, pre_buf)
       end
 
       (delta[:add] || {}).each_value do |attrs|
-        append_add_check_constraint(table_name, attrs, buf)
+        append_add_check_constraint(table_name, attrs, post_buf)
       end
     end
 
@@ -628,13 +628,13 @@ remove_check_constraint(#{table_name.inspect}, #{expression.inspect}, **#{attrs_
       RUBY
     end
 
-    def append_change_exclusion_constraints(table_name, delta, buf)
+    def append_change_exclusion_constraints(table_name, delta, pre_buf, post_buf)
       (delta[:delete] || {}).each_value do |attrs|
-        append_remove_exclusion_constraint(table_name, attrs, buf)
+        append_remove_exclusion_constraint(table_name, attrs, pre_buf)
       end
 
       (delta[:add] || {}).each_value do |attrs|
-        append_add_exclusion_constraint(table_name, attrs, buf)
+        append_add_exclusion_constraint(table_name, attrs, post_buf)
       end
     end
 
@@ -662,13 +662,13 @@ remove_exclusion_constraint(#{table_name.inspect}, #{expression.inspect}, **#{at
       RUBY
     end
 
-    def append_change_unique_constraints(table_name, delta, buf)
+    def append_change_unique_constraints(table_name, delta, pre_buf, post_buf)
       (delta[:delete] || {}).each_value do |attrs|
-        append_remove_unique_constraint(table_name, attrs, buf)
+        append_remove_unique_constraint(table_name, attrs, pre_buf)
       end
 
       (delta[:add] || {}).each_value do |attrs|
-        append_add_unique_constraint(table_name, attrs, buf)
+        append_add_unique_constraint(table_name, attrs, post_buf)
       end
     end
 

data/lib/ridgepole/diff.rb

@@ -104,7 +104,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_indices_change(table_name, 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)
       scan_exclusion_constraints_change(from[:exclusion_constraints], to[:exclusion_constraints], table_delta)
@@ -356,7 +356,7 @@ module Ridgepole
       end
     end
 
-    def scan_indices_change(from, to, to_columns, table_delta, _from_table_options, to_table_options)
+    def scan_indices_change(table_name, from, to, to_columns, table_delta, _from_table_options, to_table_options)
       from = (from || {}).dup
       to = (to || {}).dup
       indices_delta = {}
@@ -365,7 +365,18 @@ module Ridgepole
         ignore_index = to_attrs.fetch(:options, {}).delete(:ignore)
 
         if index_name.is_a?(Array)
-          from_index_name, from_attrs = from.find { |_name, attrs| attrs[:column_name] == index_name }
+          matching = from.select { |_name, attrs| attrs[:column_name] == index_name }
+
+          if matching.size > 1 && !ignore_index
+            @logger.warn(
+              "[WARNING] Multiple existing indexes on `#{table_name}` match column #{index_name.inspect}: " \
+              "#{matching.keys.map(&:inspect).join(', ')}. " \
+              'The choice of which index to keep depends on iteration order; ' \
+              'specify `name:` explicitly to disambiguate.'
+            )
+          end
+
+          from_index_name, from_attrs = matching.first
 
           if from_attrs
             from.delete(from_index_name)

data/lib/ridgepole/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Genki Sugawara
@@ -245,14 +245,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.85.1
+        version: 1.87.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.85.1
+        version: 1.87.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement