provide queue name in dequeue update (#69)

maxcountryman · Nov 17, 2024 · e045d18 · e045d18
1 parent ab36387
commit e045d18
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/...fbe76e5070e0f613ca500fc3a38df8f323a6.json → ...2c590e19fba33ccfde199808971b62e9557a.json b/...fbe76e5070e0f613ca500fc3a38df8f323a6.json → ...2c590e19fba33ccfde199808971b62e9557a.json
diff --git a/src/queue.rs b/src/queue.rs
@@ -676,8 +676,8 @@ impl<T: Task> Queue<T> {
                           and (retry_policy).max_attempts > (
                               select count(*)
                               from underway.task_attempt
-                              where task_id = id
-                                and task_queue_name = $1
+                              where task_queue_name = $1
+                                and task_id = id
                           )
                       )
                   )
@@ -694,15 +694,16 @@ impl<T: Task> Queue<T> {
                 last_attempt_at = now(),
                 last_heartbeat_at = now()
             from available_task
-            where t.id = available_task.id
+            where t.task_queue_name = $1
+              and t.id = available_task.id
             returning
                 t.id as "id: TaskId",
-                task_queue_name as "queue_name",
-                input,
-                timeout,
-                heartbeat,
-                retry_policy as "retry_policy: RetryPolicy",
-                concurrency_key
+                t.task_queue_name as "queue_name",
+                t.input,
+                t.timeout,
+                t.heartbeat,
+                t.retry_policy as "retry_policy: RetryPolicy",
+                t.concurrency_key
             "#,
             self.name,
             TaskState::Pending as TaskState,