From 13e38e552f603839bae08788f59ad2152d345129 Mon Sep 17 00:00:00 2001 From: Swati Krishnan Date: Tue, 18 Jul 2023 14:43:10 -0700 Subject: [PATCH 1/8] updating active_record dependency --- Gemfile.lock | 134 +++++++++++++++++------------- delayed_job_active_record.gemspec | 2 +- 2 files changed, 76 insertions(+), 60 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7e31d08d..559656f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,93 +2,109 @@ PATH remote: . specs: delayed_job_active_record (4.1.3) - activerecord (>= 3.0, < 6.1) + activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) GEM remote: https://rubygems.org/ specs: - activemodel (5.2.4.1) - activesupport (= 5.2.4.1) - activerecord (5.2.4.1) - activemodel (= 5.2.4.1) - activesupport (= 5.2.4.1) - arel (>= 9.0) - activesupport (5.2.4.1) + activemodel (6.1.7.4) + activesupport (= 6.1.7.4) + activerecord (6.1.7.4) + activemodel (= 6.1.7.4) + activesupport (= 6.1.7.4) + activesupport (6.1.7.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (9.0.0) - ast (2.4.0) - concurrent-ruby (1.1.6) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + ast (2.4.2) + concurrent-ruby (1.2.2) coveralls (0.7.2) multi_json (~> 1.3) rest-client (= 1.6.7) simplecov (>= 0.7) term-ansicolor (= 1.2.2) thor (= 0.18.1) - delayed_job (4.1.8) - activesupport (>= 3.0, < 6.1) - diff-lcs (1.3) - docile (1.3.2) - i18n (1.8.2) + delayed_job (4.1.11) + activesupport (>= 3.0, < 8.0) + diff-lcs (1.5.0) + docile (1.4.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) - json (2.3.0) - mime-types (3.3.1) + json (2.6.3) + language_server-protocol (3.17.0.3) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) - minitest (5.14.0) - multi_json (1.14.1) + mime-types-data (3.2023.0218.1) + mini_portile2 (2.8.4) + minitest (5.18.1) + multi_json (1.15.0) mysql2 (0.4.10) - parallel (1.19.1) - parser (2.7.0.4) - ast (~> 2.4.0) + parallel (1.23.0) + parser (3.2.2.3) + ast (~> 2.4.1) + racc pg (0.21.0) - rainbow (3.0.0) - rake (13.0.1) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + regexp_parser (2.8.1) rest-client (1.6.7) mime-types (>= 1.16) - rexml (3.2.4) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) - rubocop (0.80.1) - jaro_winkler (~> 1.5.1) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubocop (1.54.2) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) - rexml + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) - rubocop (>= 0.68.1) - ruby-progressbar (1.10.1) - simplecov (0.17.1) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + simplecov (0.22.0) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sqlite3 (1.4.2) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + sqlite3 (1.6.3) + mini_portile2 (~> 2.8.0) term-ansicolor (1.2.2) tins (~> 0.8) thor (0.18.1) - thread_safe (0.3.6) tins (0.13.2) - tzinfo (1.2.6) - thread_safe (~> 0.1) - unicode-display_width (1.6.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.4.2) + zeitwerk (2.6.8) PLATFORMS ruby diff --git a/delayed_job_active_record.gemspec b/delayed_job_active_record.gemspec index ebbcfee7..c203994f 100644 --- a/delayed_job_active_record.gemspec +++ b/delayed_job_active_record.gemspec @@ -1,5 +1,5 @@ Gem::Specification.new do |spec| - spec.add_dependency "activerecord", [">= 3.0", "< 6.1"] + spec.add_dependency "activerecord", [">= 3.0", "< 6.2"] 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" From 288e1fd77501bbae6a7dbb34bf62e9eb7d91d308 Mon Sep 17 00:00:00 2001 From: Chandan Ashok Marathe Date: Tue, 29 Aug 2023 16:48:32 +0530 Subject: [PATCH 2/8] refactoring adding Delayed::Backend::ActiveRecord::AbstractJob extending from ::ActiveRecord::Base --- lib/delayed/backend/active_record/abstract_job.rb | 3 +++ lib/delayed/backend/active_record/archived_job.rb | 2 +- lib/delayed/backend/active_record/ht_delayed_job.rb | 2 +- lib/delayed/backend/active_record/old_job.rb | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 lib/delayed/backend/active_record/abstract_job.rb diff --git a/lib/delayed/backend/active_record/abstract_job.rb b/lib/delayed/backend/active_record/abstract_job.rb new file mode 100644 index 00000000..26de12a4 --- /dev/null +++ b/lib/delayed/backend/active_record/abstract_job.rb @@ -0,0 +1,3 @@ +class Delayed::Backend::ActiveRecord::AbstractJob < ::ActiveRecord::Base + self.abstract_class = true +end diff --git a/lib/delayed/backend/active_record/archived_job.rb b/lib/delayed/backend/active_record/archived_job.rb index 9887ffdb..f0387f42 100644 --- a/lib/delayed/backend/active_record/archived_job.rb +++ b/lib/delayed/backend/active_record/archived_job.rb @@ -1,4 +1,4 @@ -class Delayed::Backend::ActiveRecord::ArchivedJob < ::ActiveRecord::Base +class Delayed::Backend::ActiveRecord::ArchivedJob < Delayed::Backend::ActiveRecord::AbstractJob #attr_accessible :priority, :run_at, :queue, :payload_object, :failed_at, :locked_at, :locked_by, # :delayed_object_type, :delayed_object_id, :method_name, :args, :unique_digest, # :attempts, :handler, :last_error diff --git a/lib/delayed/backend/active_record/ht_delayed_job.rb b/lib/delayed/backend/active_record/ht_delayed_job.rb index 02716c93..9dc32a93 100644 --- a/lib/delayed/backend/active_record/ht_delayed_job.rb +++ b/lib/delayed/backend/active_record/ht_delayed_job.rb @@ -1,7 +1,7 @@ module Delayed module Backend module ActiveRecord - class HtDelayedJob < ::ActiveRecord::Base + class HtDelayedJob < Delayed::Backend::ActiveRecord::AbstractJob include Delayed::Backend::HtExtension #attr_accessible :priority, :run_at, :queue, :payload_object, diff --git a/lib/delayed/backend/active_record/old_job.rb b/lib/delayed/backend/active_record/old_job.rb index b5356de5..640cb384 100644 --- a/lib/delayed/backend/active_record/old_job.rb +++ b/lib/delayed/backend/active_record/old_job.rb @@ -1,3 +1,3 @@ -class Delayed::Backend::ActiveRecord::OldJob < ::ActiveRecord::Base +class Delayed::Backend::ActiveRecord::OldJob < Delayed::Backend::ActiveRecord::AbstractJob self.table_name = 'delayed_jobs' end From b832c6e06785fb8e2f8b5b3394b20aea223e330b Mon Sep 17 00:00:00 2001 From: Chandan Ashok Marathe Date: Tue, 29 Aug 2023 17:20:46 +0530 Subject: [PATCH 3/8] refactor adding the require to load --- lib/delayed_job_active_record.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/delayed_job_active_record.rb b/lib/delayed_job_active_record.rb index cfb888bd..828cd0da 100644 --- a/lib/delayed_job_active_record.rb +++ b/lib/delayed_job_active_record.rb @@ -1,6 +1,7 @@ require 'active_record' require 'delayed_job' require 'delayed/backend/active_record' +require 'delayed/backend/active_record/abstract_job' require 'delayed/backend/active_record/archived_job' require 'delayed/backend/active_record/old_job' require 'delayed/backend/active_record/ht_delayed_job' From 80f7efa0f13ecd067bc2c4fc41b950dc16a6ef45 Mon Sep 17 00:00:00 2001 From: Chandan Ashok Marathe Date: Fri, 1 Sep 2023 12:12:02 +0530 Subject: [PATCH 4/8] refactor BE-0000 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6a063649..bf4af525 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :test do gem "sqlite3" end - gem "coveralls", require: false + # gem "coveralls", require: false gem "rspec", ">= 3" gem "rubocop" gem "rubocop-rspec" From 63bbc2ddf208f9b93de493cb243377f8f95d0bf2 Mon Sep 17 00:00:00 2001 From: Chandan Ashok Marathe Date: Fri, 1 Sep 2023 12:20:52 +0530 Subject: [PATCH 5/8] revert --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index bf4af525..6a063649 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :test do gem "sqlite3" end - # gem "coveralls", require: false + gem "coveralls", require: false gem "rspec", ">= 3" gem "rubocop" gem "rubocop-rspec" From 9356397bf5b3055167a474c375efeeab5ac88474 Mon Sep 17 00:00:00 2001 From: Chandan Ashok Marathe Date: Fri, 1 Sep 2023 12:33:58 +0530 Subject: [PATCH 6/8] BE-0000 --- Gemfile | 6 +++--- Gemfile.lock | 20 -------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 6a063649..adac3ae9 100644 --- a/Gemfile +++ b/Gemfile @@ -5,17 +5,17 @@ gem "rake" group :test do platforms :jruby do gem "activerecord-jdbcmysql-adapter" - gem "activerecord-jdbcpostgresql-adapter" + # gem "activerecord-jdbcpostgresql-adapter" gem "activerecord-jdbcsqlite3-adapter" end platforms :ruby, :mswin, :mingw do gem "mysql2", "~> 0.4.5" - gem "pg", "~> 0.18" + # gem "pg" gem "sqlite3" end - gem "coveralls", require: false + # gem "coveralls", require: false gem "rspec", ">= 3" gem "rubocop" gem "rubocop-rspec" diff --git a/Gemfile.lock b/Gemfile.lock index 559656f5..8b67b24f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,12 +21,6 @@ GEM zeitwerk (~> 2.3) ast (2.4.2) concurrent-ruby (1.2.2) - coveralls (0.7.2) - multi_json (~> 1.3) - rest-client (= 1.6.7) - simplecov (>= 0.7) - term-ansicolor (= 1.2.2) - thor (= 0.18.1) delayed_job (4.1.11) activesupport (>= 3.0, < 8.0) diff-lcs (1.5.0) @@ -35,24 +29,17 @@ GEM concurrent-ruby (~> 1.0) json (2.6.3) language_server-protocol (3.17.0.3) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) mini_portile2 (2.8.4) minitest (5.18.1) - multi_json (1.15.0) mysql2 (0.4.10) parallel (1.23.0) parser (3.2.2.3) ast (~> 2.4.1) racc - pg (0.21.0) racc (1.7.1) rainbow (3.1.1) rake (13.0.6) regexp_parser (2.8.1) - rest-client (1.6.7) - mime-types (>= 1.16) rexml (3.2.5) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -97,10 +84,6 @@ GEM simplecov_json_formatter (0.1.4) sqlite3 (1.6.3) mini_portile2 (~> 2.8.0) - term-ansicolor (1.2.2) - tins (~> 0.8) - thor (0.18.1) - tins (0.13.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) @@ -111,12 +94,9 @@ PLATFORMS DEPENDENCIES activerecord-jdbcmysql-adapter - activerecord-jdbcpostgresql-adapter activerecord-jdbcsqlite3-adapter - coveralls delayed_job_active_record! mysql2 (~> 0.4.5) - pg (~> 0.18) rake rspec (>= 3) rubocop From 1d90bb5fdc4f0857419535bca645374033e59526 Mon Sep 17 00:00:00 2001 From: Mike Collins Date: Fri, 3 Nov 2023 10:21:36 -0700 Subject: [PATCH 7/8] SUNM-30141 Fix uninitialized constant on deadlock --- lib/delayed/backend/ht_extension.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/delayed/backend/ht_extension.rb b/lib/delayed/backend/ht_extension.rb index 45bbdbb8..5ae57402 100644 --- a/lib/delayed/backend/ht_extension.rb +++ b/lib/delayed/backend/ht_extension.rb @@ -94,7 +94,7 @@ def archive begin tries ||= 3 self.destroy - rescue ActiveRecord::Deadlocked + rescue ::ActiveRecord::Deadlocked retry unless (tries -= 1).zero? end end From 47649be316d9e834a956f5873f36e93260062bb7 Mon Sep 17 00:00:00 2001 From: Anthony Anyanwu Date: Wed, 20 Mar 2024 03:38:01 -0700 Subject: [PATCH 8/8] link to git repo --- delayed_job_active_record.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/delayed_job_active_record.gemspec b/delayed_job_active_record.gemspec index c203994f..d3824a77 100644 --- a/delayed_job_active_record.gemspec +++ b/delayed_job_active_record.gemspec @@ -11,4 +11,5 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.summary = "ActiveRecord backend for DelayedJob" spec.version = "4.1.3" + spec.metadata = { "github_repo" => "ssh://github.com/HealthTap/delayed_job_active_record" } end