dynflow 1.6.6 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d0b1467496599ac3e304bca93b63413aeac7fda0320e16cf5972e33f16d0a02
-  data.tar.gz: e8fe13761a0171e81a134509e5e39bdae5ba8232aa575fedcb24fcdf7bd3094e
+  metadata.gz: e8f8620a4de5e01dbd253d659f07f4221a41a88112c7ca9b1440591bfc0a7b2f
+  data.tar.gz: 13d941834dc18889bef6c0bf8bee95f5286104974fa0ded2bb9a5ffda6f6ea81
 SHA512:
-  metadata.gz: '080f023d076d02d9025aa16ad97eb4aa0fc815cd731318596cd66fb8ce96e49497ccd5beb427d7aa05b0fcdb3d2f8f744c52af430cdb9b55d2e6cfb4022b9c19'
-  data.tar.gz: e18efbc9ab0110328b54296de3b95906b04757a799efc791cbb8a68564abcb03c76a49c4b716ab7dc4755a489d00b4441f1930faeb466d8e9ed7c12c0265e140
+  metadata.gz: f84d05b76492e25562a8cb06628bfd69f8d7f5a28b62d9bdd97469db206c8d0378209609376283c21fa664a7b13587df1babc828f92f15e58e95fe5ad411a85c
+  data.tar.gz: fbb2db621fb8903f314cb061258230b5c0567c4aaf6beb8e051027f4206c2a14ed2c734b90160437060c5fa36823c7febb946d7b41d5d974d798b58410e083e5

data/lib/dynflow/action/with_sub_plans.rb

@@ -3,6 +3,12 @@ module Dynflow
   module Action::WithSubPlans
     include Dynflow::Action::Cancellable
 
+    class SubtaskFailedException < RuntimeError
+      def backtrace
+        []
+      end
+    end
+
     SubPlanFinished = Algebrick.type do
       fields! :execution_plan_id => String,
               :success           => type { variants TrueClass, FalseClass }
@@ -228,7 +234,7 @@ module Dynflow
     end
 
     def check_for_errors!
-      fail "A sub task failed" if output[:failed_count] > 0
+      raise SubtaskFailedException.new("A sub task failed") if output[:failed_count] > 0
     end
 
     def uses_concurrency_control

data/lib/dynflow/persistence_adapters/sequel.rb

@@ -335,6 +335,8 @@ module Dynflow
         if value
           record = prepare_record(what, value, (existing_record || condition), with_data)
           if existing_record
+            record = prune_unchanged(what, existing_record, record)
+            return value if record.empty?
             condition = update_conditions.merge(condition)
             return with_retry { table.where(condition).update(record) }
           else
@@ -356,6 +358,14 @@ module Dynflow
         end
       end
 
+      def prune_unchanged(what, object, record)
+        record = record.dup
+        table(what).columns.each do |column|
+          record.delete(column) if object[column] == record[column]
+        end
+        record
+      end
+
       alias_method :load, :load_record
 
       def load_records(what, condition, keys = nil)

data/lib/dynflow/rails/configuration.rb

@@ -127,8 +127,12 @@ module Dynflow
           db_pool_size = calculate_db_pool_size(world)
           ::ActiveRecord::Base.connection_pool.disconnect!
 
-          config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0].configuration_hash.dup
-          config = ::Dynflow::Utils::IndifferentHash.new(config)
+          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
@@ -159,8 +163,12 @@ module Dynflow
       protected
 
       def default_sequel_adapter_options(world)
-        db_config            = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0].configuration_hash.dup
-        db_config            = ::Dynflow::Utils::IndifferentHash.new(db_config)
+        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.6'
+  VERSION = '1.6.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.8
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-12-06 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.4
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: DYNamic workFLOW engine