good_job 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aead87131c66c247222ce6733d9fe579b6d61fa0cc166b23ae75c6011e2b52db
-  data.tar.gz: 4158e3be14f1b93f46bb2eeefbeee246b4a2d98347519166b507811d343234ab
+  metadata.gz: 660e78528305c41b14c2926d9747037a091b57f952acd14246af99180991b434
+  data.tar.gz: 8bc407843b2d17fbeceb36507eb2e06177460f1bc4b8b4133560e1c4daa6ce3e
 SHA512:
-  metadata.gz: f7c522339ad17886675ac8c97104087a1d132767fe9e90c5a7f62005fced53abc40f29488e431b18e1a3a1ce528202245448617123eabaef1bda478576a9bfde
-  data.tar.gz: ce6fdd69c377f1e834b41640c5307e3bd030ac95d247b7037eab3fc5e806e6fb3030e57cc2de9d1f18a9e1f22e314e6b7e4a5aee709e2551b74b3d47f1e84388
+  metadata.gz: 8847a962731fec2c13683d3948e3ae51c0730bbcdd81853dfa3d6c2168bb05105ae2cf4c8f073a9c133d3f634473bdfaf58fefc08b07a0bbb8f51686e4b62ff0
+  data.tar.gz: c89b843399fe9bdc0d492c89ce1f481da62201689cc0f15ada8d73135308be1ee23295e54bae1fa586d1c9a50e2ca62a072784a4ac0fb9a5be3ee83ed374b1d7

data/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## [v4.1.1](https://github.com/bensheldon/good_job/tree/v4.1.1) (2024-07-31)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.99.2...v4.1.1)
+
+**Implemented enhancements:**
+
+- Convert Concurrency extension to use transaction-level \(xact\) advisory locks [\#1439](https://github.com/bensheldon/good_job/pull/1439) ([bensheldon](https://github.com/bensheldon))
+
+**Fixed bugs:**
+
+- Fix N+1 on dashboard batches index page [\#1442](https://github.com/bensheldon/good_job/pull/1442) ([bensheldon](https://github.com/bensheldon))
+- Remove duplicate word on batches show page [\#1441](https://github.com/bensheldon/good_job/pull/1441) ([Earlopain](https://github.com/Earlopain))
+- Ensure remaining inline jobs are unlocked when one job raises in Adapter\#enqueue\_all [\#1438](https://github.com/bensheldon/good_job/pull/1438) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Using Good Job to track all ActiveJob executions, even those with `perform_now` [\#1448](https://github.com/bensheldon/good_job/issues/1448)
+- RuntimeError when running good\_job executable after updating v3 -\> v4 [\#1445](https://github.com/bensheldon/good_job/issues/1445)
+- 2.99 -\> 3.0.2 migration not applying cleanly from a fresh DB [\#1435](https://github.com/bensheldon/good_job/issues/1435)
+- \[Enhance\] Enhance performance via counter cache [\#1375](https://github.com/bensheldon/good_job/issues/1375)
+- Change how svg images are inserted into partials [\#1364](https://github.com/bensheldon/good_job/issues/1364)
+
+**Merged pull requests:**
+
+- Improve some Spanish transcriptions [\#1452](https://github.com/bensheldon/good_job/pull/1452) ([sebastian-cloudnonic](https://github.com/sebastian-cloudnonic))
+- All running jobs now have `performed_at` set so use that in status query; fix flaky test that took advisory lock in `before` block [\#1444](https://github.com/bensheldon/good_job/pull/1444) ([bensheldon](https://github.com/bensheldon))
+- Handle empty asset format in Frontends controller [\#1443](https://github.com/bensheldon/good_job/pull/1443) ([bensheldon](https://github.com/bensheldon))
+- Update development dependencies, Ruby 3.3.4 [\#1437](https://github.com/bensheldon/good_job/pull/1437) ([bensheldon](https://github.com/bensheldon))
+- Refactor inline adapter to enable deferred execution after enqueue to allow batch-callbacks to use transaction-based advisory lock [\#1433](https://github.com/bensheldon/good_job/pull/1433) ([bensheldon](https://github.com/bensheldon))
+- German translation pass [\#1432](https://github.com/bensheldon/good_job/pull/1432) ([Earlopain](https://github.com/Earlopain))
+- Add Brakeman to linters [\#1431](https://github.com/bensheldon/good_job/pull/1431) ([bensheldon](https://github.com/bensheldon))
+- Remove references to and ignore `good_jobs.retried_good_job_id` column [\#1430](https://github.com/bensheldon/good_job/pull/1430) ([bensheldon](https://github.com/bensheldon))
+- Refactor Concurrency extension for Rails 6.1+ compatibility [\#1429](https://github.com/bensheldon/good_job/pull/1429) ([bensheldon](https://github.com/bensheldon))
+- Use svg `use` for svg icons [\#1428](https://github.com/bensheldon/good_job/pull/1428) ([Earlopain](https://github.com/Earlopain))
+- Replace references to "Discrete" executions with simply Executions; deprecate `GoodJob::DiscreteExecution` [\#1427](https://github.com/bensheldon/good_job/pull/1427) ([bensheldon](https://github.com/bensheldon))
+- Refactor Adapter to reference jobs, not executions [\#1426](https://github.com/bensheldon/good_job/pull/1426) ([bensheldon](https://github.com/bensheldon))
+
+## [v1.99.2](https://github.com/bensheldon/good_job/tree/v1.99.2) (2024-07-18)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.1.0...v1.99.2)
+
 ## [v4.1.0](https://github.com/bensheldon/good_job/tree/v4.1.0) (2024-07-16)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.99.1...v4.1.0)

data/app/charts/good_job/performance_index_chart.rb

@@ -3,7 +3,7 @@
 module GoodJob
   class PerformanceIndexChart < BaseChart
     def data
-      table_name = GoodJob::DiscreteExecution.table_name
+      table_name = GoodJob::Execution.table_name
 
       sum_query = Arel.sql(GoodJob::Job.pg_or_jdbc_query(<<~SQL.squish))
         SELECT *

data/app/charts/good_job/performance_show_chart.rb

@@ -18,7 +18,7 @@ module GoodJob
     end
 
     def data
-      table_name = GoodJob::DiscreteExecution.table_name
+      table_name = GoodJob::Execution.table_name
 
       interval_entries = BUCKET_INTERVALS.map { "interval '#{_1}'" }.join(",")
       sum_query = Arel.sql(GoodJob::Job.pg_or_jdbc_query(<<~SQL.squish))

data/app/controllers/good_job/application_controller.rb

@@ -7,7 +7,7 @@ module GoodJob
     around_action :use_good_job_locale
 
     content_security_policy do |policy|
-      policy.default_src(:none) if policy.default_src(*policy.default_src).blank?
+      policy.default_src(:self) if policy.default_src(*policy.default_src).blank?
       policy.connect_src(:self) if policy.connect_src(*policy.connect_src).blank?
       policy.base_uri(:none) if policy.base_uri(*policy.base_uri).blank?
       policy.font_src(:self) if policy.font_src(*policy.font_src).blank?

data/app/controllers/good_job/frontends_controller.rb

@@ -2,6 +2,7 @@
 
 module GoodJob
   class FrontendsController < ActionController::Base # rubocop:disable Rails/ApplicationController
+    protect_from_forgery with: :exception
     skip_after_action :verify_same_origin_request, raise: false
 
     STATIC_ASSETS = {
@@ -15,6 +16,9 @@ module GoodJob
         es_module_shims: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "es_module_shims.js"),
         rails_ujs: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "rails_ujs.js"),
       },
+      svg: {
+        icons: GoodJob::Engine.root.join("app", "frontend", "good_job", "icons.svg"),
+      },
     }.freeze
 
     MODULE_OVERRIDES = {
@@ -34,13 +38,13 @@ module GoodJob
     end
 
     def static
-      render file: STATIC_ASSETS.dig(params[:format].to_sym, params[:name].to_sym) || raise(ActionController::RoutingError, 'Not Found')
+      render file: STATIC_ASSETS.dig(params[:format]&.to_sym, params[:id]&.to_sym) || raise(ActionController::RoutingError, 'Not Found')
     end
 
     def module
       raise(ActionController::RoutingError, 'Not Found') if params[:format] != "js"
 
-      render file: self.class.js_modules[params[:name].to_sym] || raise(ActionController::RoutingError, 'Not Found')
+      render file: self.class.js_modules[params[:id]&.to_sym] || raise(ActionController::RoutingError, 'Not Found')
     end
   end
 end

data/app/controllers/good_job/performance_controller.rb

@@ -3,7 +3,7 @@
 module GoodJob
   class PerformanceController < ApplicationController
     def index
-      @performances = GoodJob::DiscreteExecution
+      @performances = GoodJob::Execution
                       .where.not(job_class: nil)
                       .group(:job_class)
                       .select("

data/app/frontend/good_job/icons.svg

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <!-- https://icons.getbootstrap.com/icons/arrow-clockwise/ -->
+  <symbol id="arrow_clockwise" viewBox="0 0 16 16">
+    <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z" />
+    <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/check-circle/ -->
+  <symbol id="check" viewBox="0 0 16 16">
+    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+    <path d="M10.97 4.97a.235.235 0 0 0-.02.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-1.071-1.05z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/circle-half/ -->
+  <symbol id="circle_half" viewBox="0 0 16 16">
+    <path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/clock/ -->
+  <symbol id="clock" viewBox="0 0 16 16">
+    <path d="M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71V3.5z" />
+    <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/dash-circle/ -->
+  <symbol id="dash_circle" viewBox="0 0 16 16">
+    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+    <path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/three-dots/ -->
+  <symbol id="dots" viewBox="0 0 16 16">
+    <path d="M3 9.5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/eject/ -->
+  <symbol id="eject" viewBox="0 0 16 16">
+    <path d="M7.27 1.047a1 1 0 0 1 1.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H1.656C.78 9.5.326 8.455.926 7.816L7.27 1.047zM14.346 8.5 8 1.731 1.654 8.5h12.692zM.5 11.5a1 1 0 0 1 1-1h13a1 1 0 0 1 1 1v1a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1v-1zm14 0h-13v1h13v-1z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/exclamation-circle/ -->
+  <symbol id="exclamation" viewBox="0 0 16 16">
+    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+    <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/globe/ -->
+  <symbol id="globe" viewBox="0 0 16 16">
+    <path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m7.5-6.923c-.67.204-1.335.82-1.887 1.855A8 8 0 0 0 5.145 4H7.5zM4.09 4a9.3 9.3 0 0 1 .64-1.539 7 7 0 0 1 .597-.933A7.03 7.03 0 0 0 2.255 4zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a7 7 0 0 0-.656 2.5zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5zM8.5 5v2.5h2.99a12.5 12.5 0 0 0-.337-2.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5zM5.145 12q.208.58.468 1.068c.552 1.035 1.218 1.65 1.887 1.855V12zm.182 2.472a7 7 0 0 1-.597-.933A9.3 9.3 0 0 1 4.09 12H2.255a7 7 0 0 0 3.072 2.472M3.82 11a13.7 13.7 0 0 1-.312-2.5h-2.49c.062.89.291 1.733.656 2.5zm6.853 3.472A7 7 0 0 0 13.745 12H11.91a9.3 9.3 0 0 1-.64 1.539 7 7 0 0 1-.597.933M8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855q.26-.487.468-1.068zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.7 13.7 0 0 1-.312 2.5m2.802-3.5a7 7 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7 7 0 0 0-3.072-2.472c.218.284.418.598.597.933M10.855 4a8 8 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/info-circle/ -->
+  <symbol id="info" viewBox="0 0 16 16">
+    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+    <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/moon-stars-fill/ -->
+  <symbol id="moon_stars_fill" viewBox="0 0 16 16">
+    <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z" />
+    <path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/pause-btn/ -->
+  <symbol id="pause" viewBox="0 0 16 16">
+    <path d="M6 3.5a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-1 0V4a.5.5 0 0 1 .5-.5zm4 0a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-1 0V4a.5.5 0 0 1 .5-.5z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/play/ -->
+  <symbol id="play" viewBox="0 0 16 16">
+    <path d="M10.804 8 5 4.633v6.734L10.804 8zm.792-.696a.802.802 0 0 1 0 1.392l-6.363 3.692C4.713 12.69 4 12.345 4 11.692V4.308c0-.653.713-.998 1.233-.696l6.363 3.692z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/skip-forward/ -->
+  <symbol id="skip_forward" viewBox="0 0 16 16">
+    <path d="M15.5 3.5a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-1 0V8.752l-6.267 3.636c-.52.302-1.233-.043-1.233-.696v-2.94l-6.267 3.636C.713 12.69 0 12.345 0 11.692V4.308c0-.653.713-.998 1.233-.696L7.5 7.248v-2.94c0-.653.713-.998 1.233-.696L15 7.248V4a.5.5 0 0 1 .5-.5zM1 4.633v6.734L6.804 8 1 4.633zm7.5 0v6.734L14.304 8 8.5 4.633z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/stop/ -->
+  <symbol id="stop" viewBox="0 0 16 16">
+    <path d="M3.5 5A1.5 1.5 0 0 1 5 3.5h6A1.5 1.5 0 0 1 12.5 5v6a1.5 1.5 0 0 1-1.5 1.5H5A1.5 1.5 0 0 1 3.5 11V5zM5 4.5a.5.5 0 0 0-.5.5v6a.5.5 0 0 0 .5.5h6a.5.5 0 0 0 .5-.5V5a.5.5 0 0 0-.5-.5H5z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/sun-fill/ -->
+  <symbol id="sun_fill" viewBox="0 0 16 16">
+    <path d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
+  </symbol>
+  <!-- https://icons.getbootstrap.com/icons/trash/ -->
+  <symbol id="trash" viewBox="0 0 16 16">
+    <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z" />
+    <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z" />
+  </symbol>
+</svg>

data/app/frontend/good_job/style.css

@@ -46,3 +46,8 @@
 .w-fit-content {
   width: fit-content
 }
+
+.svg-icon {
+  height: 1rem;
+  width: 1rem;
+}

data/app/helpers/good_job/icons_helper.rb

@@ -31,11 +31,14 @@ module GoodJob
       content_tag :span, icon, **options
     end
 
-    def render_icon(name, **options)
-      # workaround to render svg icons without all of the log messages
-      partial = lookup_context.find_template("good_job/shared/icons/#{name}", [], true)
-      options[:class] = Array(options[:class]).join(" ")
-      partial.render(self, { class: options[:class] })
+    def render_icon(name, class: nil, **options)
+      tag.svg(viewBox: "0 0 16 16", class: "svg-icon #{binding.local_variable_get(:class)}", **options) do
+        tag.use(fill: "currentColor", href: "#{icons_path}##{name}")
+      end
+    end
+
+    def icons_path
+      @_icons_path ||= frontend_static_path(:icons, format: :svg, locale: nil)
     end
   end
 end

data/app/models/concerns/good_job/advisory_lockable.rb

@@ -49,8 +49,8 @@ module GoodJob
 
         lock_condition = "#{function}(('x' || substr(md5(#{connection.quote(table_name)} || '-' || #{connection.quote_table_name(cte_table.name)}.#{connection.quote_column_name(column)}::text), 1, 16))::bit(64)::bigint)"
         query = cte_table.project(cte_table[:id])
-                         .with(composed_cte)
-                         .where(defined?(Arel::Nodes::BoundSqlLiteral) ? Arel::Nodes::BoundSqlLiteral.new(lock_condition, [], {}) : Arel::Nodes::SqlLiteral.new(lock_condition))
+                  .with(composed_cte)
+                  .where(defined?(Arel::Nodes::BoundSqlLiteral) ? Arel::Nodes::BoundSqlLiteral.new(lock_condition, [], {}) : Arel::Nodes::SqlLiteral.new(lock_condition))
 
         limit = original_query.arel.ast.limit
         query.limit = limit.value if limit.present?
@@ -174,8 +174,11 @@ module GoodJob
           if unlock_session
             advisory_unlock_session
           else
-            records.each do |record|
-              record.advisory_unlock(key: record.lockable_column_key(column: column), function: advisory_unlockable_function(function))
+            unlock_function = advisory_unlockable_function(function)
+            if unlock_function
+              records.each do |record|
+                record.advisory_unlock(key: record.lockable_column_key(column: column), function: unlock_function)
+              end
             end
           end
         end
@@ -209,7 +212,8 @@ module GoodJob
         begin
           yield
         ensure
-          advisory_unlock_key(key, function: advisory_unlockable_function(function))
+          unlock_function = advisory_unlockable_function(function)
+          advisory_unlock_key(key, function: unlock_function) if unlock_function
         end
       end
 
@@ -220,6 +224,9 @@ module GoodJob
       # @param function [String, Symbol] Postgres Advisory Lock function name to use
       # @return [Boolean] whether the lock was released.
       def advisory_unlock_key(key, function: advisory_unlockable_function)
+        raise ArgumentError, "Cannot unlock transactional locks" if function.include? "_xact_"
+        raise ArgumentError, "No unlock function provide" if function.blank?
+
         query = <<~SQL.squish
           SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint) AS unlocked
         SQL
@@ -284,6 +291,8 @@ module GoodJob
       # @param function [String, Symbol] name of advisory lock or unlock function
       # @return [Boolean]
       def advisory_unlockable_function(function = advisory_lockable_function)
+        return nil if function.include? "_xact_" # Cannot unlock transactional locks
+
         function.to_s.sub("_lock", "_unlock").sub("_try_", "_")
       end
 
@@ -358,7 +367,8 @@ module GoodJob
       begin
         yield
       ensure
-        advisory_unlock(key: key, function: self.class.advisory_unlockable_function(function))
+        unlock_function = self.class.advisory_unlockable_function(function)
+        advisory_unlock(key: key, function: unlock_function) if unlock_function
       end
     end
 
@@ -403,7 +413,7 @@ module GoodJob
     # @param key [String, Symbol] Key to lock against
     # @param function [String, Symbol] Postgres Advisory Lock function name to use
     # @return [void]
-    def advisory_unlock!(key: lockable_key, function: self.class.advisory_unlockable_function(advisory_lockable_function))
+    def advisory_unlock!(key: lockable_key, function: self.class.advisory_unlockable_function)
       advisory_unlock(key: key, function: function) while advisory_locked?
     end
 

data/app/models/concerns/good_job/reportable.rb

@@ -16,27 +16,23 @@ module GoodJob
     # @return [Symbol]
     def status
       if finished_at.present?
-        if error.present? && retried_good_job_id.present?
-          :retried
-        elsif error.present? && retried_good_job_id.nil?
+        if error.present?
           :discarded
         else
           :succeeded
         end
-      elsif (scheduled_at || created_at) > DateTime.current
-        if serialized_params.fetch('executions', 0) > 1
-          :retried
-        else
-          :scheduled
-        end
-      elsif running?
+      elsif performed_at.present?
         :running
-      else
+      elsif (scheduled_at || created_at) <= DateTime.current
         :queued
+      elsif error.present?
+        :retried
+      else
+        :scheduled
       end
     end
 
-    # The last relevant timestamp for this execution
+    # The last relevant timestamp for this job
     def last_status_at
       finished_at || performed_at || scheduled_at || created_at
     end

data/app/models/good_job/batch.rb

@@ -102,12 +102,17 @@ module GoodJob
       active_jobs = add(active_jobs, &block)
 
       Rails.application.executor.wrap do
-        record.with_advisory_lock(function: "pg_advisory_lock") do
-          record.update!(enqueued_at: Time.current)
-
-          # During inline execution, this could enqueue and execute further jobs
-          record._continue_discard_or_finish(lock: false)
+        buffer = GoodJob::Adapter::InlineBuffer.capture do
+          record.transaction do
+            record.with_advisory_lock(function: "pg_advisory_xact_lock") do
+              record.update!(enqueued_at: Time.current)
+
+              # During inline execution, this could enqueue and execute further jobs
+              record._continue_discard_or_finish(lock: false)
+            end
+          end
         end
+        buffer.call
       end
 
       active_jobs

data/app/models/good_job/batch_record.rb

@@ -53,22 +53,25 @@ module GoodJob
     end
 
     def _continue_discard_or_finish(execution = nil, lock: true)
-      execution_discarded = execution && execution.error.present? && execution.finished_at && execution.retried_good_job_id.nil?
-      take_advisory_lock(lock) do
-        Batch.within_thread(batch_id: nil, batch_callback_id: id) do
-          reload
-          if execution_discarded && !discarded_at
-            update(discarded_at: Time.current)
-            on_discard.constantize.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :discard }) if on_discard.present?
-          end
-
-          if enqueued_at && !finished_at && jobs.where(finished_at: nil).count.zero?
-            update(finished_at: Time.current)
-            on_success.constantize.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :success }) if !discarded_at && on_success.present?
-            on_finish.constantize.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :finish }) if on_finish.present?
+      execution_discarded = execution && execution.finished_at.present? && execution.error.present?
+      buffer = GoodJob::Adapter::InlineBuffer.capture do
+        advisory_lock_maybe(lock) do
+          Batch.within_thread(batch_id: nil, batch_callback_id: id) do
+            reload
+            if execution_discarded && !discarded_at
+              update(discarded_at: Time.current)
+              on_discard.constantize.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :discard }) if on_discard.present?
+            end
+
+            if enqueued_at && !finished_at && jobs.where(finished_at: nil).count.zero?
+              update(finished_at: Time.current)
+              on_success.constantize.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :success }) if !discarded_at && on_success.present?
+              on_finish.constantize.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :finish }) if on_finish.present?
+            end
           end
         end
       end
+      buffer.call
     end
 
     class PropertySerializer
@@ -100,9 +103,9 @@ module GoodJob
 
     private
 
-    def take_advisory_lock(value, &block)
+    def advisory_lock_maybe(value, &block)
       if value
-        with_advisory_lock(function: "pg_advisory_lock", &block)
+        transaction { with_advisory_lock(function: "pg_advisory_xact_lock", &block) }
       else
         yield
       end

data/app/models/good_job/discrete_execution.rb

@@ -1,63 +1,10 @@
 # frozen_string_literal: true
 
-module GoodJob # :nodoc:
-  class DiscreteExecution < BaseRecord
-    include ErrorEvents
-
-    self.table_name = 'good_job_executions'
-    self.implicit_order_column = 'created_at'
-
-    belongs_to :job, class_name: 'GoodJob::Job', foreign_key: 'active_job_id', primary_key: 'active_job_id', inverse_of: :discrete_executions, optional: true
-
-    scope :finished, -> { where.not(finished_at: nil) }
-
-    alias_attribute :performed_at, :created_at
-
-    # TODO: Remove when support for Rails 6.1 is dropped
-    attribute :duration, :interval if ActiveJob.version.canonical_segments.take(2) == [6, 1]
-
-    def number
-      serialized_params.fetch('executions', 0) + 1
-    end
-
-    # Time between when this job was expected to run and when it started running
-    def queue_latency
-      created_at - scheduled_at
-    end
-
-    # Monotonic time between when this job started and finished
-    def runtime_latency
-      duration
-    end
-
-    def last_status_at
-      finished_at || created_at
-    end
-
-    def status
-      if finished_at.present?
-        if error.present? && job.finished_at.present?
-          :discarded
-        elsif error.present?
-          :retried
-        else
-          :succeeded
-        end
-      else
-        :running
-      end
-    end
-
-    def display_serialized_params
-      serialized_params.merge({
-                                _good_job_execution: attributes.except('serialized_params'),
-                              })
-    end
-
-    def filtered_error_backtrace
-      Rails.backtrace_cleaner.clean(error_backtrace || [])
-    end
+module GoodJob
+  # Deprecated, use +Execution+ instead.
+  class DiscreteExecution < Execution
   end
-end
 
-ActiveSupport.run_load_hooks(:good_job_execution, GoodJob::DiscreteExecution)
+  include ActiveSupport::Deprecation::DeprecatedConstantAccessor
+  deprecate_constant :DiscreteExecution, 'Execution', deprecator: GoodJob.deprecator
+end

data/app/models/good_job/execution.rb

@@ -1,8 +1,63 @@
 # frozen_string_literal: true
 
-module GoodJob
-  # Created at the time a Job begins executing.
-  # Behavior from +DiscreteExecution+ will be merged into this class.
-  class Execution < DiscreteExecution
+module GoodJob # :nodoc:
+  class Execution < BaseRecord
+    include ErrorEvents
+
+    self.table_name = 'good_job_executions'
+    self.implicit_order_column = 'created_at'
+
+    belongs_to :job, class_name: 'GoodJob::Job', foreign_key: 'active_job_id', primary_key: 'id', inverse_of: :executions, optional: true
+
+    scope :finished, -> { where.not(finished_at: nil) }
+
+    alias_attribute :performed_at, :created_at
+
+    # TODO: Remove when support for Rails 6.1 is dropped
+    attribute :duration, :interval if ActiveJob.version.canonical_segments.take(2) == [6, 1]
+
+    def number
+      serialized_params.fetch('executions', 0) + 1
+    end
+
+    # Time between when this job was expected to run and when it started running
+    def queue_latency
+      created_at - scheduled_at
+    end
+
+    # Monotonic time between when this job started and finished
+    def runtime_latency
+      duration
+    end
+
+    def last_status_at
+      finished_at || created_at
+    end
+
+    def status
+      if finished_at.present?
+        if error.present? && job.finished_at.present?
+          :discarded
+        elsif error.present?
+          :retried
+        else
+          :succeeded
+        end
+      else
+        :running
+      end
+    end
+
+    def display_serialized_params
+      serialized_params.merge({
+                                _good_job_execution: attributes.except('serialized_params'),
+                              })
+    end
+
+    def filtered_error_backtrace
+      Rails.backtrace_cleaner.clean(error_backtrace || [])
+    end
   end
 end
+
+ActiveSupport.run_load_hooks(:good_job_execution, GoodJob::Execution)

data/app/models/good_job/execution_result.rb

@@ -13,22 +13,22 @@ module GoodJob
     attr_reader :error_event
     # @return [Boolean, nil]
     attr_reader :unexecutable
-    # @return [GoodJob::Execution, nil]
-    attr_reader :retried
+    # @return [GoodJob::Job, nil]
+    attr_reader :retried_job
 
     # @param value [Object, nil]
     # @param handled_error [Exception, nil]
     # @param unhandled_error [Exception, nil]
     # @param error_event [String, nil]
     # @param unexecutable [Boolean, nil]
-    # @param retried [Boolean, nil]
-    def initialize(value:, handled_error: nil, unhandled_error: nil, error_event: nil, unexecutable: nil, retried: nil)
+    # @param retried_job [GoodJob::Job, nil]
+    def initialize(value:, handled_error: nil, unhandled_error: nil, error_event: nil, unexecutable: nil, retried_job: nil)
       @value = value
       @handled_error = handled_error
       @unhandled_error = unhandled_error
       @error_event = error_event
       @unexecutable = unexecutable
-      @retried = retried
+      @retried_job = retried_job
     end
 
     # @return [Boolean]
@@ -38,7 +38,7 @@ module GoodJob
 
     # @return [Boolean]
     def retried?
-      retried.present?
+      retried_job.present?
     end
   end
 end