inst-jobs 0.15.18 → 0.15.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5fa07aabb776db7b07347664cd263fae34426050ea23b72e2f35ef6a665f46
-  data.tar.gz: cfb860844d1a2c3654a8047f8c32331fab957f6fd1d5ac77f641f2704849d738
+  metadata.gz: 988fd063fdecd8a94025cf8b9d1db853e3397ab3842942928cbdc99e241d0d80
+  data.tar.gz: c20258789ad05909efe3125e70a34bceb2a124398e43dbdf7d4b3c3d6dadf8ab
 SHA512:
-  metadata.gz: 9dd503fd8af0128fc999a78f96b199f759ea1c9df121f816ee72dd288d2e6bc6480b69bdece15f8f32c167e9785d18d9fb4b262abfd8459e08c12771d3dbe606
-  data.tar.gz: cb4f63db74b2cd05fde625c43e100c07cd66ded4f3b0998d97bb19786befde179180b85b1dd45d193254bdd010aba9e2ddaf67b549d0e8cdc0657853b99146ed
+  metadata.gz: e5f688d3413484f51c93270aea753178915ed38cdd3081dba5816621b070a99cea9c5bd518757db43ced1607a651241f8cd62f5160f5ea53cf113a7df3cab8c7
+  data.tar.gz: fb563b85cc6b7caaef52e63342f00ce06ad0d30c75a3adaa47b7f8e81565a77610e4c3fc7aea7b3af1c703ea9e5f5e80c8801cf7ec4dc0cd10569cae57ebfcde

data/lib/delayed/backend/active_record.rb

@@ -27,42 +27,54 @@ module Delayed
 
             # modified from ActiveRecord::Persistence.create and ActiveRecord::Persistence#_insert_record
             job = new(attributes, &block)
-            # a before_save callback that we're skipping
-            job.initialize_defaults
+            job.single_step_create
+          end
+        end
 
-            current_time = current_time_from_proper_timezone
+        def single_step_create
+          connection = self.class.connection
+          return save if connection.prepared_statements || Rails.version < '5.2'
 
-            job.send(:all_timestamp_attributes_in_model).each do |column|
-              if !job.attribute_present?(column)
-                job._write_attribute(column, current_time)
-              end
-            end
+          # a before_save callback that we're skipping
+          initialize_defaults
 
-            if Rails.version >= '6'
-              attribute_names = job.send(:attribute_names_for_partial_writes)
-              attribute_names = job.send(:attributes_for_create, attribute_names)
-              values = job.send(:attributes_with_values, attribute_names)
-            else
-              attribute_names = job.partial_writes? ? job.send(:keys_for_partial_write) : self.attribute_names
-              values = job.send(:attributes_with_values_for_create, attribute_names)
+          current_time = current_time_from_proper_timezone
+
+          all_timestamp_attributes_in_model.each do |column|
+            if !attribute_present?(column)
+              _write_attribute(column, current_time)
             end
-            im = arel_table.compile_insert(_substitute_values(values))
-            sql, _binds = connection.send(:to_sql_and_binds, im, [])
-
-            # https://www.postgresql.org/docs/9.5/libpq-exec.html
-            sql = "#{sql} RETURNING id"
-            # > Multiple queries sent in a single PQexec call are processed in a single transaction,
-            # unless there are explicit BEGIN/COMMIT commands included in the query string to divide
-            # it into multiple transactions.
-            sql = "SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(#{connection.quote(values['strand'])})); #{sql}" if values["strand"]
-            result = connection.execute(sql, "#{self} Create")
-            job.id = result.values.first.first
-            result.clear
-            job.instance_variable_set(:@new_record, false)
-            job.changes_applied
-
-            job
           end
+
+          if Rails.version >= '6'
+            attribute_names = attribute_names_for_partial_writes
+            attribute_names = attributes_for_create(attribute_names)
+            values = attributes_with_values(attribute_names)
+          else
+            attribute_names = partial_writes? ? keys_for_partial_write : self.attribute_names
+            values = attributes_with_values_for_create(attribute_names)
+          end
+          im = self.class.arel_table.compile_insert(self.class.send(:_substitute_values, values))
+          sql, _binds = connection.send(:to_sql_and_binds, im, [])
+
+          # https://www.postgresql.org/docs/9.5/libpq-exec.html
+          sql = "#{sql} RETURNING id"
+          # > Multiple queries sent in a single PQexec call are processed in a single transaction,
+          # unless there are explicit BEGIN/COMMIT commands included in the query string to divide
+          # it into multiple transactions.
+          sql = "SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(#{connection.quote(values['strand'])})); #{sql}" if values["strand"]
+          result = connection.execute(sql, "#{self} Create")
+          self.id = result.values.first.first
+          result.clear
+          @new_record = false
+          changes_applied
+
+          self
+        end
+
+        def destroy
+          # skip transaction and callbacks
+          destroy_row
         end
 
         # be aware that some strand functionality is controlled by triggers on
@@ -464,7 +476,7 @@ module Delayed
           raise "job already exists" unless new_record?
           self.locked_at = Delayed::Job.db_time_now
           self.locked_by = worker
-          save!
+          single_step_create
         end
 
         def fail!

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.15.18"
+  VERSION = "0.15.19"
 end

data/spec/gemfiles/51.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (0.15.15)
+    inst-jobs (0.15.18)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
       after_transaction_commit (>= 1.0, < 3)
@@ -65,9 +65,9 @@ GEM
     database_cleaner (1.6.1)
     diff-lcs (1.3)
     erubi (1.7.1)
-    et-orbi (1.2.2)
+    et-orbi (1.2.4)
       tzinfo
-    fugit (1.3.3)
+    fugit (1.3.4)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     globalid (0.4.1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.15.18
+  version: 0.15.19
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord