strong_migrations 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971d5d1eabb91dc04c72cc99a24f8b92f1b0d31d8d28369577f48c283b8d8624
-  data.tar.gz: '08a413578f564ada7f9768aeaf469719ca051e4c37057be6324e593c73fb3144'
+  metadata.gz: 9fa65b489492df55a19b402db34b26e6a8e4369ad0bd1078622e130d07813a85
+  data.tar.gz: 5ce0a9af74812f962a277ac87fefed4322448b3da5bf7bfbe778e83b5bbd1c88
 SHA512:
-  metadata.gz: b8ca27268e166609ec8253ce686c6fe9cbe6d7c4b298f8c80ce7f1690e76a2c997fad2806cce52c9765f6ee92e7e389fdf6c830d3ca8ebb0241574adc02c4b57
-  data.tar.gz: 18731d2b1bdd12698d6b860a470249a24ea12aaa0b5b74b6510d41527ef2126c46b27ef4aa7c7adb1437bd7a006d0bb7c46490d24ec15720009723e5b0d8eca4
+  metadata.gz: bec4fce43c3f0dd2a8c8e0f74c7aa09d0a4fadf05132285ad91496266476faef87323076fab6067499d9688100b81a78f274e7769af730bc9502f706e6ea5ebb
+  data.tar.gz: 9cebe149959161a5bf1abd62ff69e553187f867da3f49837c95f4843077e9880654eafe41786ff913e1fdba02cc2dd4c8eaf7d35996ce190779d62003a8314fc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.5.1 (2025-10-13)
+
+- Fixed `transaction_timeout` option with DDL transaction
+
 ## 2.5.0 (2025-07-27)
 
 - Added check for `rename_schema`

data/lib/strong_migrations/checker.rb

@@ -151,6 +151,16 @@ module StrongMigrations
       StrongMigrations.skipped_databases.map(&:to_s).include?(db_config_name)
     end
 
+    def set_transaction_timeout
+      return if defined?(@transaction_timeout_set)
+
+      if StrongMigrations.transaction_timeout
+        adapter.set_transaction_timeout(StrongMigrations.transaction_timeout)
+      end
+
+      @transaction_timeout_set = true
+    end
+
     private
 
     def check_adapter
@@ -183,9 +193,6 @@ module StrongMigrations
       if StrongMigrations.statement_timeout
         adapter.set_statement_timeout(StrongMigrations.statement_timeout)
       end
-      if StrongMigrations.transaction_timeout
-        adapter.set_transaction_timeout(StrongMigrations.transaction_timeout)
-      end
       if StrongMigrations.lock_timeout
         adapter.set_lock_timeout(StrongMigrations.lock_timeout)
       end

data/lib/strong_migrations/migrator.rb

@@ -1,7 +1,8 @@
 module StrongMigrations
   module Migrator
     def ddl_transaction(migration, ...)
-      return super unless StrongMigrations.lock_timeout_retries > 0 && use_transaction?(migration)
+      retries = StrongMigrations.lock_timeout_retries > 0 && use_transaction?(migration)
+      return super unless retries || StrongMigrations.transaction_timeout
 
       # handle MigrationProxy class
       migration = migration.send(:migration) if !migration.is_a?(ActiveRecord::Migration) && migration.respond_to?(:migration, true)
@@ -9,6 +10,9 @@ module StrongMigrations
       checker = migration.send(:strong_migrations_checker)
       return super if checker.skip?
 
+      checker.set_transaction_timeout
+      return super unless retries
+
       # retry migration since the entire transaction needs to be rerun
       checker.retry_lock_timeouts(check_committed: true) do
         # failed transaction reverts timeout, so need to re-apply

data/lib/strong_migrations/version.rb

@@ -1,3 +1,3 @@
 module StrongMigrations
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_migrations
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Andrew Kane