ridgepole 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f54f0a59342af5d5d5bc4a1bce81f963a5f85b8b6da78702dbb03db59488dfe
-  data.tar.gz: d163b0a5ef7ff03125b83d40b977e6c6f7097f7a6286a4c7d1ae165e19638126
+  metadata.gz: 3784ad1d842d1d94b1990eada126a7e089be6b7be6f1d764baf8d0f9e78f9dc1
+  data.tar.gz: f69dc5c28eac0444853c39bf46e0a64f3e6acfd7ced84d46485993594f56a3b4
 SHA512:
-  metadata.gz: 1092d39833a655561847f2e04a98056311b63249baabf246bfc25aacd23003a6b8573e17ba835afe3b75bd1f88e6c903dc8f8d7aa471c3c9a69a7331f55acaaf
-  data.tar.gz: 2c6ceafe3191a18f0558ab0d7acf74b6133c5389a439602d1159cbdc47980cc8727ed21dfef11e55b3fc026312e32b6ceaf4475dbe36be5df6fe2a0d109bb877
+  metadata.gz: 3c61e60599c78c740e21f36e087e8d9931e01ed801c05a64e78b11dcca30f872acbe34df427fe27da44734e07a1bbb2f408fb6e2bec6e037224a33cdb6455cd5
+  data.tar.gz: fd7fabfea47e6d71217e0b38463d3049c58864d02f5f7e094b98c533802b54dfb55fd2932af603a219c846830e73c3e6d6d408917f703f84a65377f486f5ec44

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 3.0
 
+### 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)
+- Fix for changes to `create_table` in ActiveRecord 8.2. [pull#645](https://github.com/ridgepole/ridgepole/pull/645)
+
 ### 3.1.3 (2026/01/29)
 
 - Show `COMMENT` SQL in dry-run. [pull#632](https://github.com/ridgepole/ridgepole/pull/632)

data/README.md

@@ -412,9 +412,9 @@ see https://github.com/ridgepole/ridgepole/issues/568
 docker compose up -d
 bundle install
 bundle exec appraisal install
-bundle exec appraisal activerecord-8.2 rake
-# POSTGRESQL=1 bundle exec appraisal activerecord-8.2 rake
-# MYSQL80=1 bundle exec appraisal activerecord-8.2 rake
+bundle exec appraisal activerecord-8.1 rake
+# POSTGRESQL=1 bundle exec appraisal activerecord-8.1 rake
+# MYSQL80=1 bundle exec appraisal activerecord-8.1 rake
 ```
 
 > [!note]

data/lib/ridgepole/client.rb

@@ -10,7 +10,7 @@ module Ridgepole
       # XXX: If the required processing in class method?
       @options[:index_removed_drop_column] = true if !@options.key?(:index_removed_drop_column) && (Ridgepole::DefaultsLimit.adapter == :postgresql)
 
-      Ridgepole::ExecuteExpander.expand_execute(ActiveRecord::Base.connection)
+      Ridgepole::ExecuteExpander.expand_execute(ActiveRecord::Base.connection, @options)
       @dumper = Ridgepole::Dumper.new(@options)
       @parser = Ridgepole::DSLParser.new(@options)
       @diff = Ridgepole::Diff.new(@options)

data/lib/ridgepole/delta.rb

@@ -74,7 +74,7 @@ module Ridgepole
           ActiveRecord::Migration.disable_logging = true
           buf = StringIO.new
 
-          callback = proc do |sql, _name|
+          callback = proc do |sql|
             buf.puts sql if sql =~ /\A(CREATE|ALTER|DROP|RENAME|COMMENT)\b/i
           end
 
@@ -446,6 +446,13 @@ rename_column(#{table_name.inspect}, #{from_column_name.inspect}, #{to_column_na
       # Fix for https://github.com/rails/rails/commit/7f0567b43b73b1bd1a16bfac9cd32fcbf1321b51
       if Ridgepole::ConnectionAdapters.mysql?
         options[:comment] = nil unless options.key?(:comment)
+
+        # Generated/virtual columns cannot have DEFAULT values in MySQL.
+        # cf. https://github.com/ridgepole/ridgepole/issues/482
+        if type == :virtual
+          options.delete(:default)
+          options.delete(:unsigned)
+        end
       end
 
       if @options[:bulk_change]

data/lib/ridgepole/diff.rb

@@ -410,15 +410,17 @@ module Ridgepole
 
     def normalize_column_options!(attrs, primary_key = false)
       opts = attrs[:options]
-      opts[:null] = true if !opts.key?(:null) && !primary_key
+      opts[:null] = true if !opts.key?(:null) && !primary_key && attrs[:type] != :virtual
       default_limit = Ridgepole::DefaultsLimit.default_limit(attrs[:type], @options)
       opts.delete(:limit) if opts[:limit] == default_limit
 
       # XXX: MySQL only?
-      opts[:default] = nil if !opts.key?(:default) && !primary_key
+      # Generated/virtual columns cannot have DEFAULT values in MySQL.
+      # cf. https://github.com/ridgepole/ridgepole/issues/482
+      opts[:default] = nil if !opts.key?(:default) && !primary_key && attrs[:type] != :virtual
 
       if Ridgepole::ConnectionAdapters.mysql?
-        opts[:unsigned] = false unless opts.key?(:unsigned)
+        opts[:unsigned] = false if !opts.key?(:unsigned) && attrs[:type] != :virtual
 
         if attrs[:type] == :integer && opts[:limit]
           min = Ridgepole::DefaultsLimit.default_limit(:integer, @options)

data/lib/ridgepole/execute_expander.rb

@@ -13,19 +13,24 @@ module Ridgepole
     end
 
     module ConnectionAdapterExt
-      def execute(*args)
-        sql = args.fetch(0)
-        name = args[1]
-
+      def execute_expander_internal_execute(sql, &block)
+        # Generated/virtual columns cannot have DEFAULT values in MySQL.
+        # Rails' change_column always adds DEFAULT from the existing column,
+        # so we strip it from the SQL for virtual columns.
+        # cf. https://github.com/ridgepole/ridgepole/issues/482
+        if Ridgepole::ConnectionAdapters.mysql? && !Ridgepole::ExecuteExpander.options[:bulk_change]
+          # NOTE: bulk_change does not support changing MySQL generated columns with `DEFAULT NULL`.
+          sql = sql.sub(/\bDEFAULT\s+NULL\z/i, '') if /\AALTER\s+TABLE\b/i.match?(sql) && /\bAS\s*\(/i.match?(sql) && /\bDEFAULT\s+NULL\z/i.match?(sql)
+        end
         if Ridgepole::ExecuteExpander.noop
           if (callback = Ridgepole::ExecuteExpander.callback)
             sql = append_alter_extra(sql)
-            callback.call(sql, name)
+            callback.call(sql)
           end
 
           if /\A(SELECT|SHOW)\b/i.match?(sql)
             begin
-              super(sql, name)
+              block.call(sql)
             rescue StandardError
               Stub.new
             end
@@ -34,7 +39,7 @@ module Ridgepole
           end
         elsif Ridgepole::ExecuteExpander.use_script
           if /\A(SELECT|SHOW)\b/i.match?(sql)
-            super(sql, name)
+            block.call(sql)
           else
             sql = append_alter_extra(sql)
             Ridgepole::ExecuteExpander.sql_executer.execute(sql)
@@ -42,10 +47,28 @@ module Ridgepole
           end
         else
           sql = append_alter_extra(sql)
+          block.call(sql)
+        end
+      end
+
+      def execute(*args)
+        name = args[1]
+        execute_expander_internal_execute(args.fetch(0)) do |sql|
           super(sql, name)
         end
       end
 
+      def execute_batch(statements, name = nil, **kwargs)
+        new_statements = []
+        statements.each do |statement|
+          execute_expander_internal_execute(statement) do |sql|
+            new_statements << sql
+          end
+        end
+        super(new_statements, name, **kwargs) unless new_statements.empty?
+        statements
+      end
+
       private
 
       def append_alter_extra(sql)
@@ -69,6 +92,7 @@ module Ridgepole
     cattr_accessor :use_script,   instance_writer: false, instance_reader: false
     cattr_accessor :sql_executer, instance_writer: false, instance_reader: false
     cattr_accessor :alter_extra,  instance_writer: false, instance_reader: false
+    cattr_accessor :options,      instance_writer: false, instance_reader: false
 
     class << self
       def without_operation(callback = nil)
@@ -96,9 +120,11 @@ module Ridgepole
         self.alter_extra = nil
       end
 
-      def expand_execute(connection)
+      def expand_execute(connection, options)
         return if connection.is_a?(ConnectionAdapterExt)
 
+        self.options = options
+
         connection.class_eval do
           prepend ConnectionAdapterExt
         end

data/lib/ridgepole/version.rb

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

metadata

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