nandi 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 986532981584b1518a8422a2cc212ed963782fb31554012a0e2b4da50bf8a3db
-  data.tar.gz: 282b4f7c95256f6a8af1090b82a2324d0cc12e4570bf22608c219d8486cb5334
+  metadata.gz: ea1c9b758014a99ea83562525b13d80c54ed0dd310ffd64eaebae6009235cebf
+  data.tar.gz: 77d9ae338cd152b213acaa18c2e6ba6ecbe56f7f1fe955264694d98d8b526030
 SHA512:
-  metadata.gz: 7788cca1a5ca77b8e8e04decc6819b41078936452f3ab2cae00a3b35ca6c338f4fb4870e2d8eb11f4f3109029c41a2ccd327fb980417e1b95c1bf48644bca23e
-  data.tar.gz: 2331b4022d381b2863ecbf2429365aa2870fb39386fde1cb0aa27ea8800fc3c7777490896a2d55af95696d8b0457c2f485890f5dcd8878019f1a50b2ea28af09
+  metadata.gz: c3b1935d279ba467262f79d7153ad5cfe1741da7d6c42ba618dd038f7216cc32435403343ad3adfde4e800953658cf5c8db75ab5b2fc434faef54d6871b4081b
+  data.tar.gz: 0c71da4c6691fe6e3b75acaa32c23af55b32c4b94ce3a7e7afc2021e98f2c64ba1aeb19e7da9a182ba0584c716fec3a725d1dff7ce7c789c49bb18f2a8cf170b

data/lib/nandi/compiled_migration.rb

@@ -50,7 +50,7 @@ module Nandi
     end
 
     def migration
-      @migration ||= class_name.camelize.constantize.new(Nandi.validator)
+      @migration ||= class_name.camelize.constantize.new(Nandi.validator, database_name: db_name)
     end
 
     def compiled_digest

data/lib/nandi/migration.rb

@@ -69,12 +69,18 @@ module Nandi
     end
 
     # @param validator [Nandi::Validator]
-    def initialize(validator)
+    # @param database_name [Symbol, nil] The database this migration is being compiled
+    #   for. Used to resolve per-database config. Defaults to the default database.
+    def initialize(validator, database_name: nil)
       @validator = validator
+      @database_name = database_name
       @instructions = Hash.new { |h, k| h[k] = InstructionSet.new([]) }
       validate
     end
 
+    # @api private
+    attr_reader :database_name
+
     # @api private
     def up_instructions
       compile_instructions(:up)
@@ -331,7 +337,7 @@ module Nandi
 
     def disable_lock_timeout?
       if self.class.lock_timeout.nil?
-        strictest_lock == LockWeights::SHARE && Nandi.config.concurrent_lock_timeout.nil?
+        strictest_lock == LockWeights::SHARE && Nandi.config.concurrent_lock_timeout(database_name).nil?
       else
         false
       end
@@ -339,7 +345,7 @@ module Nandi
 
     def disable_statement_timeout?
       if self.class.statement_timeout.nil?
-        strictest_lock == LockWeights::SHARE && Nandi.config.concurrent_statement_timeout.nil?
+        strictest_lock == LockWeights::SHARE && Nandi.config.concurrent_statement_timeout(database_name).nil?
       else
         false
       end
@@ -377,17 +383,18 @@ module Nandi
 
     def default_statement_timeout
       if strictest_lock == LockWeights::SHARE
-        Nandi.config.concurrent_statement_timeout || Nandi.config.access_exclusive_statement_timeout
+        Nandi.config.concurrent_statement_timeout(database_name) ||
+          Nandi.config.access_exclusive_statement_timeout(database_name)
       else
-        Nandi.config.access_exclusive_statement_timeout
+        Nandi.config.access_exclusive_statement_timeout(database_name)
       end
     end
 
     def default_lock_timeout
       if strictest_lock == LockWeights::SHARE
-        Nandi.config.concurrent_lock_timeout || Nandi.config.access_exclusive_lock_timeout
+        Nandi.config.concurrent_lock_timeout(database_name) || Nandi.config.access_exclusive_lock_timeout(database_name)
       else
-        Nandi.config.access_exclusive_lock_timeout
+        Nandi.config.access_exclusive_lock_timeout(database_name)
       end
     end
 

data/lib/nandi/timeout_policies/access_exclusive.rb

@@ -43,11 +43,11 @@ module Nandi
       end
 
       def statement_timeout_maximum
-        Nandi.config.access_exclusive_statement_timeout_max
+        Nandi.config.access_exclusive_statement_timeout_max(migration.database_name)
       end
 
       def lock_timeout_maximum
-        Nandi.config.access_exclusive_lock_timeout_max
+        Nandi.config.access_exclusive_lock_timeout_max(migration.database_name)
       end
     end
   end

data/lib/nandi/timeout_policies/concurrent.rb

@@ -53,11 +53,11 @@ module Nandi
       end
 
       def minimum_lock_timeout
-        Nandi.config.concurrent_lock_timeout_min
+        Nandi.config.concurrent_lock_timeout_min(migration.database_name)
       end
 
       def minimum_statement_timeout
-        Nandi.config.concurrent_statement_timeout_min
+        Nandi.config.concurrent_statement_timeout_min(migration.database_name)
       end
     end
   end

data/lib/nandi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nandi
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - GoCardless Engineering