delayed 2.1.0 → 2.2.0

data/spec/delayed/job_spec.rb

@@ -13,6 +13,7 @@ describe Delayed::Job do
     Delayed::Worker.max_claims = 1 # disable multithreading because SimpleJob is not threadsafe
     Delayed::Worker.default_priority = 99
     Delayed::Worker.delay_jobs = true
+    Delayed::Worker.deny_stale_enqueues = false
     Delayed::Worker.default_queue_name = 'default_tracking'
     SimpleJob.runs = 0
     described_class.delete_all
@@ -133,6 +134,42 @@ describe Delayed::Job do
         expect(described_class.enqueue(SimpleJob.new)).to be_instance_of(described_class)
       end
     end
+
+    context 'with deny_stale_enqueues = true' do
+      before { Delayed::Worker.deny_stale_enqueues = true }
+
+      it 'raises StaleEnqueueError when run_at is beyond lock_timeout in the past' do
+        stale_time = described_class.db_time_now - described_class.lock_timeout - 1.minute
+        expect {
+          described_class.enqueue SimpleJob.new, run_at: stale_time
+        }.to raise_error(Delayed::StaleEnqueueError, /Cannot enqueue a job in the distant past/)
+      end
+
+      it 'allows run_at within lock_timeout of now' do
+        recent_past = described_class.db_time_now - described_class.lock_timeout + 1.minute
+        job = described_class.enqueue SimpleJob.new, run_at: recent_past
+        expect(job).to be_persisted
+      end
+
+      it 'allows run_at in the future' do
+        future = described_class.db_time_now + 5.minutes
+        job = described_class.enqueue SimpleJob.new, run_at: future
+        expect(job).to be_persisted
+      end
+
+      it 'allows enqueue without run_at' do
+        job = described_class.enqueue SimpleJob.new
+        expect(job).to be_persisted
+      end
+    end
+
+    context 'with deny_stale_enqueues = false (default)' do
+      it 'allows run_at far in the past' do
+        stale_time = described_class.db_time_now - 1.day
+        job = described_class.enqueue SimpleJob.new, run_at: stale_time
+        expect(job).to be_persisted
+      end
+    end
   end
 
   describe 'callbacks' do

data/spec/delayed/monitor_spec.rb

@@ -345,7 +345,7 @@ RSpec.describe Delayed::Monitor do
     end
   end
 
-  describe '#query_for' do
+  describe 'SQL' do
     let(:monitor) { described_class.new }
     let(:queries) { [] }
     let(:now) { '2025-11-10 17:20:13 UTC' }
@@ -360,30 +360,28 @@ RSpec.describe Delayed::Monitor do
           value = value.value if value.is_a?(ActiveModel::Attribute)
           sql = sql.sub(/(\?|\$\d)/, ActiveRecord::Base.connection.quote(value))
         end
-        queries << sql
+        queries << QueryUnderTest.for(sql)
+        queries << "---"
       end
     end
 
-    def queries_for(metric)
-      monitor.query_for(metric)
-      queries.map { |q| QueryUnderTest.for(q) }
+    def query_descriptions
+      described_class::METRICS.each do |metric|
+        queries << "-- QUERIES FOR `#{metric}`:"
+        queries << "---------------------------------"
+        monitor.query_for(metric)
+        queries << "-- (no new queries)" unless queries.last == '---'
+      end
+      queries.dup.map { |query| query.try(:full_description) || query }
     end
 
-    described_class::METRICS.each do |metric|
-      context "('#{metric}')" do
-        it "runs the expected #{current_adapter} query for #{metric}" do
-          expect(queries_for(metric).map(&:formatted).join("\n")).to match_snapshot
-        end
-
-        it "produces the expected #{current_adapter} query plan for #{metric}" do
-          expect(queries_for(metric).map(&:explain).join("\n")).to match_snapshot
-        end
+    it "runs the expected #{current_adapter} queries with the expected plans" do
+      expect(query_descriptions.join("\n")).to match_snapshot
+    end
 
-        context 'when using the legacy index', :with_legacy_table_index do
-          it "[legacy index] produces the expected #{current_adapter} query plan for #{metric}" do
-            expect(queries_for(metric).map(&:explain).join("\n")).to match_snapshot
-          end
-        end
+    context 'when using the legacy index', :with_legacy_table_index do
+      it "[legacy index] runs the expected #{current_adapter} queries with the expected plans" do
+        expect(query_descriptions.join("\n")).to match_snapshot
       end
     end
   end

data/spec/helper.rb

@@ -228,10 +228,7 @@ RSpec::Matchers.define :emit_notification do |expected_event_name|
   diffable
 
   match do |block|
-    if @approximately && current_adapter != 'postgresql'
-      @expected_value = a_value_within([2, @expected_value.abs * 0.05].max).of(@expected_value)
-    end
-
+    @expected_value = a_value_within([2, @expected_value.abs * 0.05].max).of(@expected_value) if @approximately
     @expected = { event_name: expected_event_name, payload: expected_payload, value: @expected_value }
     @actuals = []
     callback = ->(name, _started, _finished, _unique_id, payload) do
@@ -274,6 +271,10 @@ QueryUnderTest = Struct.new(:sql, :connection) do
     new(query.respond_to?(:to_sql) ? query.to_sql : query.to_s, connection)
   end
 
+  def full_description
+    [formatted, explain].join("\n\n")
+  end
+
   def formatted
     fmt = sql.squish
 
@@ -287,6 +288,8 @@ QueryUnderTest = Struct.new(:sql, :connection) do
       .gsub(/ (AND|OR) /) { "\n    #{Regexp.last_match(1).strip} " }
       # normalize and truncate 'AS' names/aliases (changes across Rails versions)
       .gsub(/AS ("|`)?(\w+)("|`)?/) { "AS #{Regexp.last_match(2)[0...63]}" }
+      # newline and indent when aliased columns are listed
+      .gsub(/AS (\w+),/) { "AS #{Regexp.last_match(1)},\n      " }
       # remove quotes around column names in aggregate functions
       .gsub(/(MIN|MAX|COUNT|SUM)\(("|`)(\w+)("|`)\)/) { "#{Regexp.last_match(1)}(#{Regexp.last_match(3)})" }
   end
@@ -311,7 +314,7 @@ QueryUnderTest = Struct.new(:sql, :connection) do
   end
 
   def mysql2_explain
-    seed_rows! # MySQL needs a bit of data to reach for indexes
+    seed_rows! if Delayed::Job.none? # MySQL needs a bit of data to reach for indexes
     connection.execute("ANALYZE TABLE #{Delayed::Job.table_name}")
     connection.execute("SET SESSION max_seeks_for_key = 1")
     connection.execute("EXPLAIN FORMAT=TREE #{sql}").to_a.map(&:first).join("\n")
@@ -325,7 +328,7 @@ QueryUnderTest = Struct.new(:sql, :connection) do
 
   def seed_rows!
     now = Delayed::Job.db_time_now
-    10.times do
+    100.times do
       [true, false].repeated_combination(5).each_with_index do |(erroring, failed, locked, future), i|
         Delayed::Job.create!(
           run_at: now + (future ? i.minutes : -i.minutes),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Nathan Griffith
@@ -19,7 +19,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-05 00:00:00.000000000 Z
+date: 2026-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord