nandi 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 733fe2592dfd7df100effb90a4948a4ccaf4b4908aeda1c54913172a1691b360
-  data.tar.gz: 2332bef451d639247e038dbdc9e48a5c07ec50817c21ee43f9098e7255365e16
+  metadata.gz: 70ecd10143c43ea10379b4dc7c6d1bbf4d4bc3d654cbf15dde273b49cf229a08
+  data.tar.gz: 0b64d84387f9e4be7eed24ddadc9f74d58d118cca7d91e0e526f680ee5fcfba8
 SHA512:
-  metadata.gz: 27079ffb0df30af84792b98f10b15f0d804c06c095ce3b76cd1a805172cc144257a7c1a822b8921de4dd66c3c3df004923ce2caa8adbbfa201d0c81bd9a89f81
-  data.tar.gz: 3f5ba9f7b6a9e8cbb2367a6b2f91cfa441d6afe9fcb61c7d345fc3f028c9a1c1db3575c0495d550924ad0e8a734ed670e158c3622b2fb2476f210c08483f411a
+  metadata.gz: 8f057aa2c71d7169d6482a2fbc2fe7fb4721bfeef3b650a74c09e002fe9b7eff4fa3479b5e2c0af7940d91d88ca71dcddab0fbd169077fee1ec00cb26e447f60
+  data.tar.gz: 112cc9d2d08c4802767d2c481d11f30ff87844c765a0afcb0224dcb1bbfc1c69dc4d7c6dd618a79d744bb7fdff03f2945f216f2eba90511d99b6c4ad58fcdd59

data/lib/nandi/config.rb

@@ -78,6 +78,8 @@ module Nandi
     def access_exclusive_statement_timeout_limit(database_name = nil) = config(database_name).access_exclusive_statement_timeout_limit
     def concurrent_lock_timeout_limit(database_name = nil) = config(database_name).concurrent_lock_timeout_limit
     def concurrent_statement_timeout_limit(database_name = nil) = config(database_name).concurrent_statement_timeout_limit
+    def concurrent_lock_timeout(database_name = nil) = config(database_name).concurrent_lock_timeout
+    def concurrent_statement_timeout(database_name = nil) = config(database_name).concurrent_statement_timeout
     # rubocop:enable Layout/LineLength
 
     # Delegate setter methods to the default database for backwards compatibility
@@ -89,6 +91,8 @@ module Nandi
              :access_exclusive_statement_timeout_limit=,
              :concurrent_lock_timeout_limit=,
              :concurrent_statement_timeout_limit=,
+             :concurrent_lock_timeout=,
+             :concurrent_statement_timeout=,
              to: :default
 
     delegate :validate!, :default, :config, to: :databases

data/lib/nandi/instructions/add_index.rb

@@ -41,7 +41,7 @@ module Nandi
       end
 
       def field_names
-        field_names = fields.respond_to?(:map) ? fields.map(&:to_s).join("_") : fields
+        field_names = fields.respond_to?(:map) ? fields.join("_") : fields
         field_names.to_s.scan(/\w+/).join("_")
       end
 

data/lib/nandi/migration.rb

@@ -329,7 +329,7 @@ module Nandi
 
     def disable_lock_timeout?
       if self.class.lock_timeout.nil?
-        strictest_lock == LockWeights::SHARE
+        strictest_lock == LockWeights::SHARE && Nandi.config.concurrent_lock_timeout.nil?
       else
         false
       end
@@ -337,7 +337,7 @@ module Nandi
 
     def disable_statement_timeout?
       if self.class.statement_timeout.nil?
-        strictest_lock == LockWeights::SHARE
+        strictest_lock == LockWeights::SHARE && Nandi.config.concurrent_statement_timeout.nil?
       else
         false
       end
@@ -374,11 +374,19 @@ module Nandi
     end
 
     def default_statement_timeout
-      Nandi.config.access_exclusive_statement_timeout
+      if strictest_lock == LockWeights::SHARE
+        Nandi.config.concurrent_statement_timeout || Nandi.config.access_exclusive_statement_timeout
+      else
+        Nandi.config.access_exclusive_statement_timeout
+      end
     end
 
     def default_lock_timeout
-      Nandi.config.access_exclusive_lock_timeout
+      if strictest_lock == LockWeights::SHARE
+        Nandi.config.concurrent_lock_timeout || Nandi.config.access_exclusive_lock_timeout
+      else
+        Nandi.config.access_exclusive_lock_timeout
+      end
     end
 
     def invoke_custom_method(name, ...)

data/lib/nandi/multi_database.rb

@@ -50,6 +50,18 @@ module Nandi
       # @return [Integer]
       attr_accessor :concurrent_lock_timeout_limit
 
+      # The default lock timeout for migrations that take place concurrently
+      # (eg. add_index, remove_index). When set, concurrent migrations will use
+      # set_lock_timeout instead of disable_lock_timeout!. Default: nil (disabled).
+      # @return [Integer, nil]
+      attr_accessor :concurrent_lock_timeout
+
+      # The default statement timeout for migrations that take place concurrently
+      # (eg. add_index, remove_index). When set, concurrent migrations will use
+      # set_statement_timeout instead of disable_statement_timeout!. Default: nil (disabled).
+      # @return [Integer, nil]
+      attr_accessor :concurrent_statement_timeout
+
       # The directory for output files. Default: `db/migrate`
       # @return [String]
       attr_accessor :output_directory
@@ -87,6 +99,8 @@ module Nandi
           config[:concurrent_lock_timeout_limit] || DEFAULT_CONCURRENT_TIMEOUT_LIMIT
         @concurrent_statement_timeout_limit =
           config[:concurrent_statement_timeout_limit] || DEFAULT_CONCURRENT_TIMEOUT_LIMIT
+        @concurrent_lock_timeout = config[:concurrent_lock_timeout]
+        @concurrent_statement_timeout = config[:concurrent_statement_timeout]
       end
 
       def path_prefix(name, default)

data/lib/nandi/validator.rb

@@ -67,7 +67,7 @@ module Nandi
     def new_indexes_are_separated_from_other_migrations
       [migration.up_instructions, migration.down_instructions].map do |instructions|
         instructions.none? { |i| i.procedure == :add_index } ||
-          instructions.count == 1
+          instructions.one?
       end.all?
     end
 

data/lib/nandi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nandi
-  VERSION = "2.0.1"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nandi
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - GoCardless Engineering
 bindir: exe
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Fear-free migrations for PostgreSQL
 test_files: []