PR Feedback; consistency between queries & add assertions

Author: Jamesbarford

database/src/pool.rs

@@ -431,9 +431,12 @@ mod tests {
             .await
             .unwrap();
 
-        db.mark_benchmark_request_as_completed(request_tag)
-            .await
-            .unwrap();
+        assert_eq!(
+            db.mark_benchmark_request_as_completed(request_tag)
+                .await
+                .unwrap(),
+            true
+        );
     }
 
     #[tokio::test]
@@ -905,10 +908,12 @@ mod tests {
             db.insert_benchmark_request(&benchmark_request)
                 .await
                 .unwrap();
-            assert!(db
-                .mark_benchmark_request_as_completed("sha-1")
-                .await
-                .is_ok());
+            assert_eq!(
+                db.mark_benchmark_request_as_completed("sha-1")
+                    .await
+                    .unwrap(),
+                true
+            );
             Ok(ctx)
         })
         .await;

database/src/pool/postgres.rs

@@ -1917,8 +1917,8 @@ where
                         FROM
                             job_queue
                         WHERE
-                            request_tag = benchmark_request.tag
-                            AND status NOT IN ($3, $4)
+                            job_queue.request_tag = benchmark_request.tag
+                            AND job_queue.status NOT IN ($3, $4)
                     )
                     AND (
                         benchmark_request.parent_sha IS NULL
@@ -1928,7 +1928,7 @@ where
                             FROM
                                 job_queue
                             WHERE
-                                request_tag = benchmark_request.parent_sha
+                                job_queue.request_tag = benchmark_request.parent_sha
                                 AND job_queue.status NOT IN ($3, $4)
                        )
                 )

site/src/job_queue/mod.rs

@@ -384,9 +384,12 @@ mod tests {
             .await
             .unwrap();
 
-        db.mark_benchmark_request_as_completed(request_tag)
-            .await
-            .unwrap();
+        assert_eq!(
+            db.mark_benchmark_request_as_completed(request_tag)
+                .await
+                .unwrap(),
+            true
+        );
     }
 
     async fn mark_as_completed(