dynflow 1.6.4 → 1.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '068120950f509e0e118319244c51c2cc1c593b95c808e550636515dace4a984b'
4
- data.tar.gz: 0a7b42cc5c57ba401c983582cebd1b428c6a9876d6187f3e511bcf5b82f33d4e
3
+ metadata.gz: 2d535120af429db7ce30df6651ffc033d20e481f9c23652b96298cd53e5de2d7
4
+ data.tar.gz: 0d5c5f4f983bde9ce13afebb26c311673513c8a560fbde22b3472e67f468d770
5
5
  SHA512:
6
- metadata.gz: fa1c11576f57765c44d2efb27d80237e07e07733da768e79d2622cce9e5cdea295ae18894601905a431632c3a261668bb65a851f340baec681bbabec3e2d7dc1
7
- data.tar.gz: 51d939e678a1e90880767b772d10f25fb69870da708180d9c07a42e46840428a929620206a5a05f1014c17bc7e5d7f71d8eff92e0c99654e1ec31a9ab73d2889
6
+ metadata.gz: 81de21466f1ec2a76ec3396b06256dc873cdfdea62d6d39035e284a5f2e8ea5ed81783202163e86a0dcd38f841333c08de92c52989bc768e9763c9eedcab8e59
7
+ data.tar.gz: cf8c24e19b30475a5325c2e219657dbb625d7d42704250e1f8c001846f1d98c9a74ccb80c83c806c89c0a2f7944577ba8741d0ad963d8c0fb16cd7561af41940
@@ -127,7 +127,12 @@ module Dynflow
127
127
  db_pool_size = calculate_db_pool_size(world)
128
128
  ::ActiveRecord::Base.connection_pool.disconnect!
129
129
 
130
- config = ::ActiveRecord::Base.configurations[::Rails.env]
130
+ base_config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0]
131
+ config = if base_config.respond_to?(:configuration_hash)
132
+ ::Dynflow::Utils::IndifferentHash.new(base_config.configuration_hash.dup)
133
+ else
134
+ base_config.config.dup
135
+ end
131
136
  config['pool'] = db_pool_size if config['pool'].to_i < db_pool_size
132
137
  ::ActiveRecord::Base.establish_connection(config)
133
138
  end
@@ -158,7 +163,12 @@ module Dynflow
158
163
  protected
159
164
 
160
165
  def default_sequel_adapter_options(world)
161
- db_config = ::Rails.application.config.database_configuration[::Rails.env].dup
166
+ base_config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0]
167
+ db_config = if base_config.respond_to?(:configuration_hash)
168
+ ::Dynflow::Utils::IndifferentHash.new(base_config.configuration_hash.dup)
169
+ else
170
+ base_config.config.dup
171
+ end
162
172
  db_config['adapter'] = db_config['adapter'].gsub(/_?makara_?/, '')
163
173
  db_config['adapter'] = 'postgres' if db_config['adapter'] == 'postgresql'
164
174
  db_config['max_connections'] = calculate_db_pool_size(world) if increase_db_pool_size?
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Dynflow
3
- VERSION = '1.6.4'
3
+ VERSION = '1.6.7'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dynflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.4
4
+ version: 1.6.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Necas
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2022-02-28 00:00:00.000000000 Z
12
+ date: 2022-05-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: multi_json
@@ -678,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
678
678
  - !ruby/object:Gem::Version
679
679
  version: '0'
680
680
  requirements: []
681
- rubygems_version: 3.1.2
681
+ rubygems_version: 3.1.4
682
682
  signing_key:
683
683
  specification_version: 4
684
684
  summary: DYNamic workFLOW engine