Rename db_client to db_pool

Kobzol · Kobzol · commit 80c62af92cf6 · 2025-08-29T14:03:12.000+02:00
diff --git a/database/src/pool.rs b/database/src/pool.rs
@@ -461,7 +461,7 @@ mod tests {
             // This is essentially testing the database testing framework is
             // wired up correctly. Though makes sense that there should be
             // an empty vector returned if there are no pstats.
-            let db = ctx.db_client();
+            let db = ctx.db_pool();
             let result = db.connection().await.get_pstats(&[], &[]).await;
             let expected: Vec<Vec<Option<f64>>> = vec![];
 
@@ -474,7 +474,7 @@ mod tests {
     #[tokio::test]
     async fn artifact_storage() {
         run_db_test(|ctx| async {
-            let db = ctx.db_client();
+            let db = ctx.db_pool();
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
 
             let artifact_one = ArtifactId::from(create_commit("abc", time, CommitType::Master));
@@ -518,7 +518,7 @@ mod tests {
     #[tokio::test]
     async fn multiple_requests_same_sha() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client();
+            let db = ctx.db_pool();
             let db = db.connection().await;
             db.insert_benchmark_request(&BenchmarkRequest::create_master(
                 "a-sha-1",
@@ -542,7 +542,7 @@ mod tests {
     #[tokio::test]
     async fn multiple_non_completed_try_requests() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let target = Target::X86_64UnknownLinuxGnu;
             let collector_name = "collector-1";
             let benchmark_set = 1;
@@ -584,7 +584,7 @@ mod tests {
     #[tokio::test]
     async fn multiple_master_requests_same_pr() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client();
+            let db = ctx.db_pool();
             let db = db.connection().await;
 
             db.insert_benchmark_request(&BenchmarkRequest::create_master(
@@ -613,7 +613,7 @@ mod tests {
     #[tokio::test]
     async fn load_pending_benchmark_requests() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
             let target = Target::X86_64UnknownLinuxGnu;
             let collector_name = "collector-1";
@@ -659,7 +659,7 @@ mod tests {
     #[tokio::test]
     async fn attach_shas_to_try_benchmark_request() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client();
+            let db = ctx.db_pool();
             let db = db.connection().await;
 
             let req = BenchmarkRequest::create_try_without_artifacts(42, "", "");
@@ -699,7 +699,7 @@ mod tests {
     #[tokio::test]
     async fn enqueue_benchmark_job() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client();
+            let db = ctx.db_pool();
             let db = db.connection().await;
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
             let benchmark_request =
@@ -730,7 +730,7 @@ mod tests {
     #[tokio::test]
     async fn get_compile_test_cases_with_data() {
         run_db_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
 
             let collection = db.collection_id("test").await;
             let artifact = db
@@ -789,7 +789,7 @@ mod tests {
     #[tokio::test]
     async fn get_collector_config_error_if_not_exist() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
 
             let collector_config_result = db.start_collector("collector-1", "foo").await.unwrap();
 
@@ -803,7 +803,7 @@ mod tests {
     #[tokio::test]
     async fn add_collector_config() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
 
             let mut inserted_config = db
                 .add_collector_config("collector-1", Target::X86_64UnknownLinuxGnu, 1, true)
@@ -828,7 +828,7 @@ mod tests {
     #[tokio::test]
     async fn dequeue_benchmark_job_empty_queue() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
 
             let benchmark_job_result = db
                 .dequeue_benchmark_job(
@@ -849,7 +849,7 @@ mod tests {
     #[tokio::test]
     async fn dequeue_benchmark_job() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
 
             let collector_config = db
@@ -918,7 +918,7 @@ mod tests {
     #[tokio::test]
     async fn mark_request_as_complete_empty() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
 
             let insert_result = db
@@ -943,7 +943,7 @@ mod tests {
     #[tokio::test]
     async fn mark_request_as_complete() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
             let benchmark_set = BenchmarkSet(0u32);
             let tag = "sha-1";
@@ -1020,7 +1020,7 @@ mod tests {
     #[tokio::test]
     async fn get_status_page_data() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let benchmark_set = BenchmarkSet(0u32);
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
             let tag = "sha-1";
@@ -1157,7 +1157,7 @@ mod tests {
     #[tokio::test]
     async fn get_collector_configs() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let target = Target::X86_64UnknownLinuxGnu;
 
             let benchmark_set_one = BenchmarkSet(0u32);
diff --git a/database/src/tests/mod.rs b/database/src/tests/mod.rs
@@ -83,7 +83,7 @@ impl TestContext {
         }
     }
 
-    pub fn db_client(&self) -> &Pool {
+    pub fn db_pool(&self) -> &Pool {
         &self.client
     }
 
diff --git a/site/src/job_queue/mod.rs b/site/src/job_queue/mod.rs
@@ -391,7 +391,7 @@ mod tests {
     #[tokio::test]
     async fn queue_ordering() {
         run_postgres_test(|ctx| async {
-            let db = ctx.db_client().connection().await;
+            let db = ctx.db_pool().connection().await;
             let target = Target::X86_64UnknownLinuxGnu;
             let collector_name = "collector-1";
             let benchmark_set = 1;

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ impl TestContext {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- pub fn db_client(&self) -> &Pool {`
	`86`	`+ pub fn db_pool(&self) -> &Pool {`
`87`	`87`	`&self.client`
`88`	`88`	`}`
`89`	`89`