dynflow 1.6.4 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068120950f509e0e118319244c51c2cc1c593b95c808e550636515dace4a984b'
-  data.tar.gz: 0a7b42cc5c57ba401c983582cebd1b428c6a9876d6187f3e511bcf5b82f33d4e
+  metadata.gz: 2d535120af429db7ce30df6651ffc033d20e481f9c23652b96298cd53e5de2d7
+  data.tar.gz: 0d5c5f4f983bde9ce13afebb26c311673513c8a560fbde22b3472e67f468d770
 SHA512:
-  metadata.gz: fa1c11576f57765c44d2efb27d80237e07e07733da768e79d2622cce9e5cdea295ae18894601905a431632c3a261668bb65a851f340baec681bbabec3e2d7dc1
-  data.tar.gz: 51d939e678a1e90880767b772d10f25fb69870da708180d9c07a42e46840428a929620206a5a05f1014c17bc7e5d7f71d8eff92e0c99654e1ec31a9ab73d2889
+  metadata.gz: 81de21466f1ec2a76ec3396b06256dc873cdfdea62d6d39035e284a5f2e8ea5ed81783202163e86a0dcd38f841333c08de92c52989bc768e9763c9eedcab8e59
+  data.tar.gz: cf8c24e19b30475a5325c2e219657dbb625d7d42704250e1f8c001846f1d98c9a74ccb80c83c806c89c0a2f7944577ba8741d0ad963d8c0fb16cd7561af41940

data/lib/dynflow/rails/configuration.rb

@@ -127,7 +127,12 @@ module Dynflow
           db_pool_size = calculate_db_pool_size(world)
           ::ActiveRecord::Base.connection_pool.disconnect!
 
-          config = ::ActiveRecord::Base.configurations[::Rails.env]
+          base_config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0]
+          config = if base_config.respond_to?(:configuration_hash)
+                     ::Dynflow::Utils::IndifferentHash.new(base_config.configuration_hash.dup)
+                   else
+                     base_config.config.dup
+                   end
           config['pool'] = db_pool_size if config['pool'].to_i < db_pool_size
           ::ActiveRecord::Base.establish_connection(config)
         end
@@ -158,7 +163,12 @@ module Dynflow
       protected
 
       def default_sequel_adapter_options(world)
-        db_config            = ::Rails.application.config.database_configuration[::Rails.env].dup
+        base_config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0]
+        db_config = if base_config.respond_to?(:configuration_hash)
+                      ::Dynflow::Utils::IndifferentHash.new(base_config.configuration_hash.dup)
+                    else
+                      base_config.config.dup
+                    end
         db_config['adapter'] = db_config['adapter'].gsub(/_?makara_?/, '')
         db_config['adapter'] = 'postgres' if db_config['adapter'] == 'postgresql'
         db_config['max_connections'] = calculate_db_pool_size(world) if increase_db_pool_size?

data/lib/dynflow/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dynflow
-  VERSION = '1.6.4'
+  VERSION = '1.6.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.7
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -678,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: DYNamic workFLOW engine