inst-jobs 3.1.13 → 3.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2342458023c7d56e82311cd05089b8a748c266b462289a5ce5ba9c169a89abbe
-  data.tar.gz: b9cf5ced42b4a1d18f3599203c55683218c94d71c9f5671db58c8c49ba502ef6
+  metadata.gz: 16e359eba573f46a29762f1afd4bb55a52fcc9252f25ff61779f7f9b136d8f92
+  data.tar.gz: 2983f7040757c9421ae2464c79599556cd0286678ada618787c9fbe5019eca34
 SHA512:
-  metadata.gz: 5b234730e2acb907a880e564b8e7036ff64e9b3d09c18426779c125e7f7c2dbc83629d1c11157131137b0902a128f1a3cfba968e611a77e82782adabfdca6d96
-  data.tar.gz: d3487c737f65ced442c1219ae929eefd1247bb5753f345d06991634262fa592671ea37c798044b0477f038b2e2958c083bc38b9c5b4d344e9a557ec450cfb400
+  metadata.gz: b8296ac3fe9c675ed42f02ad7a112534d30bf212f57ca288313615eb2fa2954f114cd1a5c0f20ca886a11a6ed8085bed5c21d355f63ddadb52ba3508a341cc47
+  data.tar.gz: 65c2307f632d2dd2360fa0dc97c2c5fa373185c9c1fb78b7c057e970166a25742faa0a294bc8382cee895fc96c3d6302e7af6dbeb2bc44f99bbfff9f792edcd8

data/lib/delayed/backend/active_record.rb

@@ -25,6 +25,8 @@ module Delayed
         include Delayed::Backend::Base
         self.table_name = :delayed_jobs
 
+        attr_accessor :enqueue_result
+
         scope :next_in_strand_order, -> { order(:strand_order_override, :id) }
 
         def self.reconnect!
@@ -106,7 +108,8 @@ module Delayed
           end
 
           # https://www.postgresql.org/docs/9.5/libpq-exec.html
-          sql << " RETURNING id"
+          # https://stackoverflow.com/questions/39058213/differentiate-inserted-and-updated-rows-in-upsert-using-system-columns
+          sql << " RETURNING id, (xmax = 0) AS inserted"
 
           if lock_and_insert
             # > Multiple queries sent in a single PQexec call are processed in a single transaction,
@@ -120,12 +123,22 @@ module Delayed
             end
             result = connection.execute(sql, "#{self.class} Create")
             self.id = result.values.first&.first
+            inserted = result.values.first&.second
             result.clear
           else
             result = connection.exec_query(sql, "#{self.class} Create", binds)
             self.id = connection.send(:last_inserted_id, result)
+            inserted = result.rows.first&.second
           end
 
+          self.enqueue_result = if id.present? && inserted
+                                  :inserted
+                                elsif id.present? && !inserted
+                                  :updated
+                                else
+                                  :dropped
+                                end
+
           # it might not get set if there was an existing record, and we didn't update it
           if id
             @new_record = false

data/lib/delayed/message_sending.rb

@@ -94,7 +94,7 @@ module Delayed
     def __calculate_sender_for_delay
       # enforce public send in dev and test, but not prod (since it uses
       # debug APIs, it's expensive)
-      return sender(1) if ::Rails.env.test? || ::Rails.env.development?
+      sender(1) if ::Rails.env.test? || ::Rails.env.development?
     end
 
     module ClassMethods

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.13"
+  VERSION = "3.1.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.13
+  version: 3.1.14
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,20 +116,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -242,20 +228,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -372,16 +344,16 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement