nandi 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec4e2b089c4336135b3899d3d01ac55fd0876fa5f76b22f1672fb494c2267fce
-  data.tar.gz: f66eac48b75fcf959bacc454197c6fb09c6332026ea08a2587e02f6fcc6049fe
+  metadata.gz: 0bcecda52a441da340e251adb8b8c0e3e323579fb10df1d23ca1612867f8cd9a
+  data.tar.gz: 7c56e3cf4f93f97e7a62b2b180b977ee21b7f199b49b8989acdcaa3a8f918b81
 SHA512:
-  metadata.gz: adc1220776ae8fb445ba59c7755e6b80e3449897211485804461a02ebace759d22d098955e67d3ded835f9ff8871c72116b62e4c6aa7f7f9bd5a2f5ecaff3766
-  data.tar.gz: 9d6d92342078cc00360874bc73b8a87407497ef0c694aaefbb5b465215b3965063fab62b9ad753c937110231de7b368c48cabb829b004a510e98c423e333e63a
+  metadata.gz: bf4c111c2982f1e4ae8aa6c1b8b83f04b084a1adf2eb2da1af375c7b26de608db76da6aafbbb799dc5b26b53c9021e8912d84bd3f25987160aaf71dec7a4a546
+  data.tar.gz: '09f340dd4c6a435047e326b424b07450715f04594bd326d6a01cdd12e3ed6e222f5e5dc06f11a9174b0b429857b6f1d80419f49b63fd35c979ad2a439829e49e'

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,11 @@ module Nandi
     end
 
     def default_statement_timeout
-      Nandi.config.access_exclusive_statement_timeout
+      Nandi.config.concurrent_statement_timeout || Nandi.config.access_exclusive_statement_timeout
     end
 
     def default_lock_timeout
-      Nandi.config.access_exclusive_lock_timeout
+      Nandi.config.concurrent_lock_timeout || Nandi.config.access_exclusive_lock_timeout
     end
 
     def invoke_custom_method(name, ...)

data/lib/nandi/multi_database.rb

@@ -50,17 +50,30 @@ 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
 
-      attr_reader :name, :default
+      attr_reader :name, :default, :raw_config
 
       attr_accessor :migration_directory,
                     :lockfile_name
 
       def initialize(name:, config:)
         @name = name
+        @raw_config = config
         @default = @name == :primary || config[:default] == true
 
         # Paths and files
@@ -86,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)
@@ -115,6 +130,10 @@ module Nandi
 
     def register(name, config)
       name = name.to_sym
+
+      # Allow re-registration with identical config (for Rails reloading)
+      return @databases[name] if @databases.key?(name) && @databases[name].raw_config == config
+
       raise ArgumentError, "Database #{name} already registered" if @databases.key?(name)
 
       @databases[name] = Database.new(name: name, config: config)

data/lib/nandi/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nandi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - GoCardless Engineering
 bindir: exe
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport