delayed_job_active_record 4.1.7 → 4.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b17b594310d702d4a5dddca0001c067751c5c70595405ab74cf5091951e8dbf
-  data.tar.gz: 2ccf2889e6d629cd46850873c8b1038eba50554ba7b76d1151974b750e70f3c1
+  metadata.gz: 9116a5f78649ace5869c7b445d6f7737050854002a61256874572e1a53483193
+  data.tar.gz: b603d4277c480fb9b81b2ac2b6d016f34ad4a303317c7125d7d5bf88c27b280c
 SHA512:
-  metadata.gz: d0c30a1d2e4b220a1a12e61cd8f6745e13093c275c8f323c565cf919e92d65c8b9fa6ba35ca06532f5db3316e2128012c53076099b6940de71d351d8b2c0f6b8
-  data.tar.gz: e6c1f74236b4c93a981bafda8b311d71db3edc25e90856d8bb9d72e8c9fe61df7642c23e72f30eae40fc99eecefc2a5e3e1a11393d9c66e0114ab926ecdace4b
+  metadata.gz: da14da981c5d80de7b6e608cea6d17dc509545efff2ed07277d9ac5ea3b22cba426363643f43685f3806baf66b03eb328ccf60b146987c41cf8fe4d0e5ea8bed
+  data.tar.gz: 899ff2554da143c1c36aa547286c54ffcbbb3dfa887743006d8b4d1f8413aae08cc5335c2341223fdaaa02c3628150f0a6db0cd750816d3f6485ba01ac4e8430

data/README.md

@@ -1,7 +1,7 @@
 **If you're viewing this at https://github.com/collectiveidea/delayed_job_active_record,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(4.1.7).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.7)**
+(4.1.10).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.10)**
 
 # DelayedJob ActiveRecord Backend
 

data/delayed_job_active_record.gemspec

@@ -1,17 +1,22 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
+  spec.name        = "delayed_job_active_record"
+  spec.version     = "4.1.10"
+  spec.summary     = "ActiveRecord backend for DelayedJob"
+  spec.description = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
+
+  spec.licenses = "MIT"
+
+  spec.authors  = ["David Genord II", "Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
+  spec.email    = ["david@collectiveidea.com", "bryckbost@gmail.com", "matt@griffinonline.org", "sferik@gmail.com"]
+  spec.homepage = "http://github.com/collectiveidea/delayed_job_active_record"
+
+  spec.files         = %w[CONTRIBUTING.md LICENSE.md README.md delayed_job_active_record.gemspec] + Dir["lib/**/*.rb"]
+  spec.require_paths = ["lib"]
+
+  spec.metadata = { "rubygems_mfa_required" => "true" }
+
   spec.add_dependency "activerecord", [">= 3.0", "< 8.0"]
   spec.add_dependency "delayed_job",  [">= 3.0", "< 5"]
-  spec.authors        = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
-  spec.description    = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
-  spec.email          = ["bryckbost@gmail.com", "matt@griffinonline.org", "sferik@gmail.com"]
-  spec.files          = %w[CONTRIBUTING.md LICENSE.md README.md delayed_job_active_record.gemspec] + Dir["lib/**/*.rb"]
-  spec.homepage       = "http://github.com/collectiveidea/delayed_job_active_record"
-  spec.licenses       = ["MIT"]
-  spec.metadata       = { "rubygems_mfa_required" => "true" }
-  spec.name           = "delayed_job_active_record"
-  spec.require_paths  = ["lib"]
-  spec.summary        = "ActiveRecord backend for DelayedJob"
-  spec.version        = "4.1.7"
 end

data/lib/delayed/backend/active_record.rb

@@ -62,7 +62,11 @@ module Delayed
         end
 
         def self.before_fork
-          ::ActiveRecord::Base.clear_all_connections!
+          if Gem::Version.new("7.1.0") <= Gem::Version.new(::ActiveRecord::VERSION::STRING)
+            ::ActiveRecord::Base.connection_handler.clear_all_connections!(:all)
+          else
+            ::ActiveRecord::Base.connection_handler.clear_all_connections!
+          end
         end
 
         def self.after_fork
@@ -101,7 +105,7 @@ module Delayed
           case connection.adapter_name
           when "PostgreSQL", "PostGIS"
             reserve_with_scope_using_optimized_postgres(ready_scope, worker, now)
-          when "MySQL", "Mysql2"
+          when "MySQL", "Mysql2", "Trilogy"
             reserve_with_scope_using_optimized_mysql(ready_scope, worker, now)
           when "MSSQL", "Teradata"
             reserve_with_scope_using_optimized_mssql(ready_scope, worker, now)
@@ -129,11 +133,23 @@ module Delayed
           # Note: active_record would attempt to generate UPDATE...LIMIT like
           # SQL for Postgres if we use a .limit() filter, but it would not
           # use 'FOR UPDATE' and we would have many locking conflicts
+          subquery = ready_scope.limit(1).lock(true).select("id").to_sql
+
+          # On PostgreSQL >= 9.5 we leverage SKIP LOCK to avoid multiple workers blocking each other
+          # when attempting to get the next available job
+          # https://www.postgresql.org/docs/9.5/sql-select.html#SQL-FOR-UPDATE-SHARE
+          if connection.send(:postgresql_version) >= 9_05_00 # rubocop:disable Style/NumericLiterals
+            subquery += " SKIP LOCKED"
+          end
+
           quoted_name = connection.quote_table_name(table_name)
-          subquery    = ready_scope.limit(1).lock(true).select("id").to_sql
-          sql         = "UPDATE #{quoted_name} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquery}) RETURNING *"
-          reserved    = find_by_sql([sql, now, worker.name])
-          reserved[0]
+          find_by_sql(
+            [
+              "UPDATE #{quoted_name} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquery}) RETURNING *",
+              now,
+              worker.name
+            ]
+          ).first
         end
 
         def self.reserve_with_scope_using_optimized_mysql(ready_scope, worker, now)
@@ -172,13 +188,21 @@ module Delayed
         def self.db_time_now
           if Time.zone
             Time.zone.now
-          elsif ::ActiveRecord::Base.default_timezone == :utc
+          elsif default_timezone == :utc
             Time.now.utc
           else
             Time.now # rubocop:disable Rails/TimeZone
           end
         end
 
+        def self.default_timezone
+          if ::ActiveRecord.respond_to?(:default_timezone)
+            ::ActiveRecord.default_timezone
+          else
+            ::ActiveRecord::Base.default_timezone
+          end
+        end
+
         def reload(*args)
           reset
           super

data/lib/generators/delayed_job/next_migration_version.rb

@@ -6,7 +6,14 @@ module DelayedJob
     # since ActiveRecord 3.0
     def next_migration_number(dirname)
       next_migration_number = current_migration_number(dirname) + 1
-      if ActiveRecord::Base.timestamped_migrations
+      timestamped_migrations =
+        if ActiveRecord.respond_to?(:timestamped_migrations)
+          ActiveRecord.timestamped_migrations
+        else
+          ActiveRecord::Base.timestamped_migrations
+        end
+
+      if timestamped_migrations
         [Time.now.utc.strftime("%Y%m%d%H%M%S"), format("%.14d", next_migration_number)].max
       else
         format("%.3d", next_migration_number)

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.10
 platform: ruby
 authors:
+- David Genord II
 - Brian Ryckbost
 - Matt Griffin
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -55,6 +56,7 @@ dependencies:
 description: ActiveRecord backend for Delayed::Job, originally authored by Tobias
   Lütke
 email:
+- david@collectiveidea.com
 - bryckbost@gmail.com
 - matt@griffinonline.org
 - sferik@gmail.com
@@ -93,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: ActiveRecord backend for DelayedJob