Merge pull request #437 from Kobzol/fix-query

Fix merge queue PR query

Author: Kobzol

.sqlx/query-92d160378de8ed75192f25e393d1eceee06cd95b22cc6efe813e5d1c9812ee14.json renamed to .sqlx/query-5c3c81357e7329a9db4b2bf05c2615433b4a61c43f26f2ae39e68d02d609bf90.json

@@ -134,8 +134,12 @@ async fn process_repository(repo: &RepositoryState, ctx: &BorsContext) -> anyhow
         let pr_num = pr.number;
 
         match pr.queue_status() {
-            QueueStatus::NotApproved => unreachable!(),
-            QueueStatus::Stalled(..) => unreachable!(),
+            QueueStatus::NotApproved => unreachable!(
+                "PR {pr:?} is not approved. It should not have been returned by `get_merge_queue_prs`, this is a bug."
+            ),
+            QueueStatus::Stalled(..) => unreachable!(
+                "PR {pr:?} is stalled. It should not have been returned by `get_merge_queue_prs`, this is a bug."
+            ),
             QueueStatus::Pending(..) => {
                 // Build in progress - stop queue. We can only have one PR being built
                 // at a time.
@@ -1115,4 +1119,21 @@ auto_build_failed = ["+foo", "+bar", "-baz"]
         })
         .await;
     }
+
+    #[sqlx::test]
+    async fn run_empty_queue(pool: sqlx::PgPool) {
+        run_test(pool, async |tester: &mut BorsTester| {
+            // This PR should not be in the queue
+            let pr = tester.open_pr(default_repo_name(), |_| {}).await?;
+            // Make sure that bors knows about the DB
+            tester
+                .post_comment(Comment::new(pr.id(), "@bors info"))
+                .await?;
+            tester.expect_comments(pr.id(), 1).await;
+
+            tester.process_merge_queue().await;
+            Ok(())
+        })
+        .await;
+    }
 }

src/bors/merge_queue.rs

@@ -1007,13 +1007,14 @@ pub(crate) async fn get_merge_queue_prs(
               AND pr.status = 'open'
               AND pr.approved_by IS NOT NULL
               AND pr.mergeable_state = 'mergeable'
-              AND
+              AND (
                 -- We ALWAYS need to return pending and successful PRs, regardless of tree state
                 auto_build.status IN ('pending', 'success') OR (
                     -- For PRs without a build status, we check if they pass the tree state
                     -- priority check, if the tree is closed
                     auto_build.status IS NULL AND ($2::int IS NULL OR pr.priority >= $2)
                 )
+              )
             "#,
             repo as &GithubRepoName,
             tree_priority