Store build kind in the database

Author: Kobzol

migrations/20251215115722_add_kind_to_build.down.sql

@@ -0,0 +1,3 @@
+-- Add down migration script here
+ALTER TABLE build
+    DROP COLUMN kind;

migrations/20251215115722_add_kind_to_build.up.sql

@@ -0,0 +1,10 @@
+-- Add up migration script here
+ALTER TABLE build
+    ADD COLUMN kind TEXT NOT NULL DEFAULT 'try';
+
+UPDATE build
+SET kind =
+        CASE
+            WHEN build.branch LIKE '%auto' THEN 'auto'
+            ELSE 'try'
+            END;

src/database/client.rs

@@ -1,7 +1,7 @@
 use sqlx::PgPool;
 
 use crate::bors::comment::CommentTag;
-use crate::bors::{PullRequestStatus, RollupMode};
+use crate::bors::{BuildKind, PullRequestStatus, RollupMode};
 use crate::database::operations::{get_merge_queue_prs, update_pr_auto_build_id};
 use crate::database::{
     BuildModel, BuildStatus, CommentModel, PullRequestModel, RepoModel, TreeState, WorkflowModel,
@@ -187,8 +187,15 @@ impl PgDbClient {
         parent: CommitSha,
     ) -> anyhow::Result<i32> {
         let mut tx = self.pool.begin().await?;
-        let build_id =
-            create_build(&mut *tx, &pr.repository, &branch, &commit_sha, &parent).await?;
+        let build_id = create_build(
+            &mut *tx,
+            &pr.repository,
+            &branch,
+            BuildKind::Try,
+            &commit_sha,
+            &parent,
+        )
+        .await?;
         update_pr_try_build_id(&mut *tx, pr.id, build_id).await?;
         tx.commit().await?;
         Ok(build_id)
@@ -202,8 +209,15 @@ impl PgDbClient {
         parent: CommitSha,
     ) -> anyhow::Result<i32> {
         let mut tx = self.pool.begin().await?;
-        let build_id =
-            create_build(&mut *tx, &pr.repository, &branch, &commit_sha, &parent).await?;
+        let build_id = create_build(
+            &mut *tx,
+            &pr.repository,
+            &branch,
+            BuildKind::Auto,
+            &commit_sha,
+            &parent,
+        )
+        .await?;
         update_pr_auto_build_id(&mut *tx, pr.id, build_id).await?;
         tx.commit().await?;
         Ok(build_id)

src/database/mod.rs

@@ -4,6 +4,7 @@ use std::{
     str::FromStr,
 };
 
+use crate::bors::BuildKind;
 use crate::bors::comment::CommentTag;
 use crate::{
     bors::{PullRequestStatus, RollupMode},
@@ -340,6 +341,37 @@ pub struct BuildModel {
     pub created_at: DateTime<Utc>,
     /// The ID of the check run associated with the build.
     pub check_run_id: Option<i64>,
+    /// What kind of build this is (`try` or `auto`).
+    pub kind: BuildKind,
+}
+
+impl sqlx::Type<sqlx::Postgres> for BuildKind {
+    fn type_info() -> sqlx::postgres::PgTypeInfo {
+        <String as sqlx::Type<sqlx::Postgres>>::type_info()
+    }
+}
+
+impl sqlx::Encode<'_, sqlx::Postgres> for BuildKind {
+    fn encode_by_ref(
+        &self,
+        buf: &mut sqlx::postgres::PgArgumentBuffer,
+    ) -> Result<sqlx::encode::IsNull, BoxDynError> {
+        let tag = match self {
+            Self::Try => "try",
+            Self::Auto => "auto",
+        };
+        <&str as sqlx::Encode<sqlx::Postgres>>::encode(tag, buf)
+    }
+}
+
+impl sqlx::Decode<'_, sqlx::Postgres> for BuildKind {
+    fn decode(value: sqlx::postgres::PgValueRef<'_>) -> Result<Self, BoxDynError> {
+        match <&str as sqlx::Decode<sqlx::Postgres>>::decode(value)? {
+            "try" => Ok(Self::Try),
+            "auto" => Ok(Self::Auto),
+            kind => Err(format!("Unknown build kind: {kind}").into()),
+        }
+    }
 }
 
 /// Represents a pull request.

src/database/operations.rs

@@ -2,17 +2,6 @@ use chrono::DateTime;
 use chrono::Utc;
 use sqlx::postgres::PgExecutor;
 
-use crate::bors::PullRequestStatus;
-use crate::bors::RollupMode;
-use crate::bors::comment::CommentTag;
-use crate::database::BuildStatus;
-use crate::database::RepoModel;
-use crate::database::WorkflowModel;
-use crate::github::CommitSha;
-use crate::github::GithubRepoName;
-use crate::github::PullRequestNumber;
-use crate::utils::timing::measure_db_query;
-
 use super::ApprovalInfo;
 use super::ApprovalStatus;
 use super::Assignees;
@@ -26,6 +15,17 @@ use super::TreeState;
 use super::UpsertPullRequestParams;
 use super::WorkflowStatus;
 use super::WorkflowType;
+use crate::bors::PullRequestStatus;
+use crate::bors::RollupMode;
+use crate::bors::comment::CommentTag;
+use crate::database::BuildKind;
+use crate::database::BuildStatus;
+use crate::database::RepoModel;
+use crate::database::WorkflowModel;
+use crate::github::CommitSha;
+use crate::github::GithubRepoName;
+use crate::github::PullRequestNumber;
+use crate::utils::timing::measure_db_query;
 use futures::TryStreamExt;
 
 pub(crate) async fn get_pull_request(
@@ -524,18 +524,20 @@ pub(crate) async fn create_build(
     executor: impl PgExecutor<'_>,
     repo: &GithubRepoName,
     branch: &str,
+    kind: BuildKind,
     commit_sha: &CommitSha,
     parent: &CommitSha,
 ) -> anyhow::Result<i32> {
     measure_db_query("create_build", || async {
         let build_id = sqlx::query_scalar!(
             r#"
-INSERT INTO build (repository, branch, commit_sha, parent, status)
-VALUES ($1, $2, $3, $4, $5)
+INSERT INTO build (repository, branch, kind, commit_sha, parent, status)
+VALUES ($1, $2, $3, $4, $5, $6)
 RETURNING id
 "#,
             repo as &GithubRepoName,
             branch,
+            kind as BuildKind,
             commit_sha.0,
             parent.0,
             BuildStatus::Pending as BuildStatus
@@ -561,6 +563,7 @@ SELECT
     id,
     repository as "repository: GithubRepoName",
     branch,
+    kind as "kind: BuildKind",
     commit_sha,
     status as "status: BuildStatus",
     parent,
@@ -594,6 +597,7 @@ SELECT
     id,
     repository as "repository: GithubRepoName",
     branch,
+    kind as "kind: BuildKind",
     commit_sha,
     status as "status: BuildStatus",
     parent,
@@ -758,7 +762,8 @@ SELECT
         build.status,
         build.parent,
         build.created_at,
-        build.check_run_id
+        build.check_run_id,
+        build.kind
     ) AS "build!: BuildModel"
 FROM workflow
     LEFT JOIN build ON workflow.build_id = build.id
@@ -818,7 +823,8 @@ SELECT
         build.status,
         build.parent,
         build.created_at,
-        build.check_run_id
+        build.check_run_id,
+        build.kind
     ) AS "build!: BuildModel"
 FROM workflow
     LEFT JOIN build ON workflow.build_id = build.id

tests/data/migrations/20240517094752_create_build.sql

@@ -1,24 +1,21 @@
-INSERT INTO
-    build (repository, branch, commit_sha, status, parent)
-VALUES
-    (
-        'rust-lang/bors',
+INSERT INTO build (repository, branch, commit_sha, status, parent)
+VALUES ('rust-lang/bors',
         'automation/bors/try',
         'a7ec24743ca724dd4b164b3a76d29d0da9573617',
         'pending',
-        '8f5e9988e7aa74bffcbec51af17f541d8e7d8e3c'
-    ),
-    (
-        'rust-lang/cargo',
+        '8f5e9988e7aa74bffcbec51af17f541d8e7d8e3c'),
+       ('rust-lang/cargo',
         'automation/bors/try-merge',
         'b3f987c12ee248ef21d37b59a40b17e93fac7c8a',
         'success',
-        'c53f32bb8a51fa9fd49d7bd83eb4b15ccfd8a372'
-    ),
-    (
-        'rust-lang/rust',
+        'c53f32bb8a51fa9fd49d7bd83eb4b15ccfd8a372'),
+       ('rust-lang/rust',
         'automation/bors/try',
         '4ee5a1bfc10bc49f30a8f527557ac4a93a2b9d66',
         'failure',
-        '9d4e0ac0fca0d0c268be3e9d24d98e3906f0e89b'
-    );
+        '9d4e0ac0fca0d0c268be3e9d24d98e3906f0e89b'),
+       ('rust-lang/rust',
+        'automation/bors/auto',
+        '3ef2a1bfc10bc49f30a8f527557ac4a93a2b9d68',
+        'success',
+        '9d4e0ac0fca0d0c268be3e9d24d98e3906f0e89b');

tests/data/migrations/20251215115722_add_kind_to_build.sql

@@ -0,0 +1,3 @@
+-- Empty to satisfy migration tests
+-- We don't need to add any new data here, as the kind column has been auto-filled
+-- from the branch column by this migration.