Skip to content

Commit

Permalink
Fix use of limit for Rails 3
Browse files Browse the repository at this point in the history
  • Loading branch information
betamatt committed Nov 30, 2010
1 parent deb329b commit 6b0e480
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/delayed/backend/active_record.rb
Expand Up @@ -45,7 +45,7 @@ def self.jobs_available_to_worker(worker_name, max_run_time)
def self.reserve(worker, max_run_time = Worker.max_run_time)
affected_rows = 0
::ActiveRecord::Base.silence do
affected_rows = update_all(["locked_at = ?, locked_by = ?", db_time_now, worker.name], jobs_available_to_worker(worker.name, max_run_time).scope(:find)[:conditions], :limit => 1)
affected_rows = jobs_available_to_worker(worker.name, max_run_time).limit(1).update_all(["locked_at = ?, locked_by = ?", db_time_now, worker.name])
end

if affected_rows == 1
Expand All @@ -58,7 +58,7 @@ def self.reserve(worker, max_run_time = Worker.max_run_time)
# Find a few candidate jobs to run (in case some immediately get locked by others).
def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
::ActiveRecord::Base.silence do
jobs_available_to_worker(worker_name, max_run_time).all(:limit => limit)
jobs_available_to_worker(worker_name, max_run_time).limit(limit).all
end
end

Expand Down

0 comments on commit 6b0e480

Please sign in to comment.