Merge pull request #82 from swrobel/pagination-order

Fix pagination issue where the same job appears on multiple pages
statianzo · Oct 2, 2020 · d663559 · d663559
2 parents 3f7b7b7 + 6db364b
commit d663559
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Unreleased
+#### Fixed:
+- Fixed inconsistent pagination when several jobs have the same `run_at`
+
 ### 0.9.3 - 2020-06-17
 #### Added:
 - Set expired_at=NULL when rescheduling job

diff --git a/lib/que/web/sql.rb b/lib/que/web/sql.rb
@@ -70,7 +70,7 @@ def delete_jobs_query(scope)
         job_class ILIKE ($3)
         OR que_jobs.args #>> '{0, job_class}' ILIKE ($3)
       )
-    ORDER BY run_at
+    ORDER BY run_at, id
     LIMIT $1::int
     OFFSET $2::int
   SQL
@@ -88,7 +88,7 @@ def delete_jobs_query(scope)
         job_class ILIKE ($3)
         OR que_jobs.args #>> '{0, job_class}' ILIKE ($3)
       )
-    ORDER BY run_at
+    ORDER BY run_at, id
     LIMIT $1::int
     OFFSET $2::int
   SQL