Unified queue job ordering across all db engine

romanzipp · May 2, 2024 · 0082a50 · 0082a50
1 parent 86cb0e4
commit 0082a50
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Controllers/ShowQueueMonitorController.php b/src/Controllers/ShowQueueMonitorController.php
@@ -54,9 +54,8 @@ public function __invoke(Request $request)
             $jobsQuery->where('data', 'like', "%{$filters['custom_data']}%");
         }
 
+        $connection = DB::connection();
         if (config('queue-monitor.ui.order_queued_first')) {
-            $connection = DB::connection();
-
             if ($connection instanceof DatabaseConnections\MySqlConnection) {
                 $jobsQuery->orderByRaw('-`started_at`');
             }
@@ -68,6 +67,8 @@ public function __invoke(Request $request)
             if ($connection instanceof DatabaseConnections\SQLiteConnection) {
                 $jobsQuery->orderByRaw('started_at DESC NULLS FIRST');
             }
+        } elseif ($connection instanceof DatabaseConnections\PostgresConnection) {
+            $jobsQuery->orderByRaw('started_at DESC NULLS LAST');
         }
 
         $jobsQuery