safe-pg-migrations 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af168a4b4f24db150d75db6f1451f1871aaedb01d3ae6356700b2b5e9a9c9554
-  data.tar.gz: 95a282efef8b4a2ff73a6fdaa503b2f37f8b6d295b6ef93d723d1aa42e15609b
+  metadata.gz: af76c6a71e7dce8e5600ef503a813e679517ff798bbafca264d42d4715f2ed49
+  data.tar.gz: f69b55af92135e78ce3ca71589b006d4f2022c82002ea3c3ef66f2af676c2f23
 SHA512:
-  metadata.gz: ab2c63020f0f282740638a77faced95ab1449597e51c6cde8d0e1e7b884c2768c231922f69278f8afc719e5295953ac13153ce5a372dbc831b6d3b41c2c027f9
-  data.tar.gz: 77181bd3101c0f16de3d2f1d7efea52144140346ee841224e2939e4408206dca2e811084641b0541f99d3a2ef0587c3e351cedecf97b5f9daaa5c592de2cd1b5
+  metadata.gz: 447160106752cfce33c77671cecd77fd2ead10c5457b51ef739b2ffb5583a8c8ba0931fab9570b0936d1add997313b1a2622a6e6f32538759b60c71bd319686c
+  data.tar.gz: 2b3069d2d35658a4681c989cc1b58a6a0b5d92dd6a73001c9cf3aa3103cec76b049d31e84c061082e9d50e33158215e6b048ba145d5bcfda72b7ebeba9f1eafe

data/lib/safe-pg-migrations/configuration.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/numeric/time'
+require 'safe-pg-migrations/helpers/pg_helper'
 
 module SafePgMigrations
   class Configuration
+    include Helpers::PgHelper
+
     attr_accessor(*%i[
                     backfill_batch_size
                     backfill_pause
@@ -77,12 +80,5 @@ module SafePgMigrations
       # By reducing the lock timeout by a very small margin, we ensure that the lock timeout is raised in priority
       pg_duration safe_timeout * 0.99
     end
-
-    private
-
-    def pg_duration(duration)
-      value, unit = duration.integer? ? [duration, 's'] : [(duration * 1000).to_i, 'ms']
-      "#{value}#{unit}"
-    end
   end
 end

data/lib/safe-pg-migrations/helpers/pg_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module SafePgMigrations
+  module Helpers
+    module PgHelper
+      def pg_duration(duration)
+        value, unit = duration.integer? ? [duration, 's'] : [(duration * 1000).to_i, 'ms']
+        "#{value}#{unit}"
+      end
+    end
+  end
+end

data/lib/safe-pg-migrations/plugins/statement_retrier.rb

@@ -3,6 +3,7 @@
 module SafePgMigrations
   module StatementRetrier
     include Helpers::StatementsHelper
+    include Helpers::PgHelper
 
     RETRIABLE_SCHEMA_STATEMENTS.each do |method|
       define_method method do |*args, **options, &block|
@@ -13,17 +14,14 @@ module SafePgMigrations
     private
 
     def retry_if_lock_timeout
-      initial_lock_timeout = SafePgMigrations.config.lock_timeout
+      @lock_timeout = SafePgMigrations.config.lock_timeout
       number_of_retries = 0
       begin
         number_of_retries += 1
         yield
-      rescue ActiveRecord::LockWaitTimeout
+      rescue ActiveRecord::LockWaitTimeout => e
         # Retrying is useless if we're inside a transaction.
-        if transaction_open? || number_of_retries >= SafePgMigrations.config.max_tries
-          SafePgMigrations.config.lock_timeout = initial_lock_timeout
-          raise
-        end
+        raise e if transaction_open? || number_of_retries >= SafePgMigrations.config.max_tries
 
         retry_delay = SafePgMigrations.config.retry_delay
         Helpers::Logger.say "Retrying in #{retry_delay} seconds...", sub_item: true
@@ -39,20 +37,23 @@ module SafePgMigrations
     end
 
     def increase_lock_timeout
-      Helpers::Logger.say "  Increasing the lock timeout... Currently set to #{SafePgMigrations.config.lock_timeout}",
+      Helpers::Logger.say "  Increasing the lock timeout... Currently set to #{pg_duration(@lock_timeout)}",
                           sub_item: true
-      SafePgMigrations.config.lock_timeout = (SafePgMigrations.config.lock_timeout + lock_timeout_step)
-      unless SafePgMigrations.config.lock_timeout < SafePgMigrations.config.max_lock_timeout_for_retry
-        SafePgMigrations.config.lock_timeout = SafePgMigrations.config.max_lock_timeout_for_retry
+      @lock_timeout += lock_timeout_step
+      unless @lock_timeout < SafePgMigrations.config.max_lock_timeout_for_retry
+        @lock_timeout = SafePgMigrations.config.max_lock_timeout_for_retry
       end
-      Helpers::Logger.say "  Lock timeout is now set to #{SafePgMigrations.config.lock_timeout}", sub_item: true
+      execute("SET lock_timeout TO '#{pg_duration(@lock_timeout)}'")
+      Helpers::Logger.say "  Lock timeout is now set to #{pg_duration(@lock_timeout)}", sub_item: true
     end
 
     def lock_timeout_step
+      return @lock_timeout_step if defined?(@lock_timeout_step)
+
       max_lock_timeout_for_retry = SafePgMigrations.config.max_lock_timeout_for_retry
       lock_timeout = SafePgMigrations.config.lock_timeout
       max_tries = SafePgMigrations.config.max_tries
-      @lock_timeout_step ||= (max_lock_timeout_for_retry - lock_timeout) / (max_tries - 1)
+      @lock_timeout_step = (max_lock_timeout_for_retry - lock_timeout) / (max_tries - 1)
     end
   end
 end

data/lib/safe-pg-migrations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SafePgMigrations
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe-pg-migrations
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Matthieu Prat
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,6 +57,7 @@ files:
 - lib/safe-pg-migrations/helpers/blocking_activity_selector.rb
 - lib/safe-pg-migrations/helpers/index_helper.rb
 - lib/safe-pg-migrations/helpers/logger.rb
+- lib/safe-pg-migrations/helpers/pg_helper.rb
 - lib/safe-pg-migrations/helpers/satisfied_helper.rb
 - lib/safe-pg-migrations/helpers/session_setting_management.rb
 - lib/safe-pg-migrations/helpers/statements_helper.rb
@@ -99,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Make your PG migrations safe.