[WIP] using db-pool library to create a pool of databases

Cargo.toml

@@ -145,7 +145,7 @@ lemmy_db_views_vote = { version = "=1.0.0-alpha.5", path = "./crates/db_views/vo
 activitypub_federation = { version = "0.7.0-beta.5", default-features = false, features = [
   "actix-web",
 ] }
-diesel = { version = "2.2.10", features = [
+diesel = { version = "2.2.11", features = [
   "chrono",
   "postgres",
   "serde_json",

crates/api/api_utils/src/context.rs

@@ -10,10 +10,17 @@ use lemmy_utils::{
 };
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
 use std::sync::Arc;
+use lemmy_db_schema::utils::ReusableDbPool;
+
+#[derive(Clone)]
+pub enum ContextPool {
+  Actual(ActualDbPool),
+  Reusable(ReusableDbPool), // TODO it's not cloneable
+}
 
 #[derive(Clone)]
 pub struct LemmyContext {
-  pool: ActualDbPool,
+  pool: ContextPool,
   client: Arc<ClientWithMiddleware>,
   /// Pictrs requests must bypass proxy. Unfortunately no_proxy can only be set on ClientBuilder
   /// and not on RequestBuilder, so we need a separate client here.
@@ -24,7 +31,7 @@ pub struct LemmyContext {
 
 impl LemmyContext {
   pub fn create(
-    pool: ActualDbPool,
+    pool: ContextPool,
     client: ClientWithMiddleware,
     pictrs_client: ClientWithMiddleware,
     secret: Secret,
@@ -39,9 +46,12 @@ impl LemmyContext {
     }
   }
   pub fn pool(&self) -> DbPool<'_> {
-    DbPool::Pool(&self.pool)
+    match &self.pool {
+      ContextPool::Actual(pool) => DbPool::Pool(pool),
+      ContextPool::Reusable(pool) => DbPool::ReusablePool(pool),
+    }
   }
-  pub fn inner_pool(&self) -> &ActualDbPool {
+  pub fn inner_pool(&self) -> &ContextPool {
     &self.pool
   }
   pub fn client(&self) -> &ClientWithMiddleware {
@@ -66,7 +76,7 @@ impl LemmyContext {
   #[allow(clippy::expect_used)]
   pub async fn init_test_federation_config() -> FederationConfig<LemmyContext> {
     // call this to run migrations
-    let pool = build_db_pool_for_tests();
+    let pool = build_db_pool_for_tests().await;
 
     let client = client_builder(&SETTINGS).build().expect("build client");
 
@@ -79,7 +89,7 @@ impl LemmyContext {
     let rate_limit_cell = RateLimit::with_test_config();
 
     let context = LemmyContext::create(
-      pool,
+      ContextPool::Reusable(pool),
       client.clone(),
       client,
       secret,

crates/db_schema/Cargo.toml

@@ -59,6 +59,7 @@ diesel-derive-newtype = { workspace = true, optional = true }
 diesel-async = { workspace = true, features = [
   "deadpool",
   "postgres",
+  "async-connection-wrapper",
 ], optional = true }
 regex = { workspace = true, optional = true }
 diesel_ltree = { workspace = true, optional = true }
@@ -75,6 +76,7 @@ i-love-jesus = { workspace = true, optional = true }
 derive-new.workspace = true
 tuplex = { workspace = true, optional = true }
 moka = { workspace = true, optional = true }
+db-pool = { git = "https://github.com/momentary-lapse/db-pool.git", branch = "edition2021-test", features = ["diesel-async-postgres", "diesel-async-deadpool"] }
 
 
 [dev-dependencies]

crates/db_schema/src/impls/activity.rs

@@ -71,9 +71,8 @@ mod tests {
   use url::Url;
 
   #[tokio::test]
-  #[serial]
   async fn receive_activity_duplicate() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
     let ap_id: DbUrl = Url::parse("http://example.com/activity/531")?.into();
 
@@ -86,9 +85,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn sent_activity_write_read() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
     let ap_id: DbUrl = Url::parse("http://example.com/activity/412")?.into();
     let data = json!({

crates/db_schema/src/impls/actor_language.rs

@@ -427,9 +427,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_convert_update_languages() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     // call with empty vec, returns all languages
@@ -445,10 +444,9 @@ mod tests {
     Ok(())
   }
   #[tokio::test]
-  #[serial]
   async fn test_convert_read_languages() -> LemmyResult<()> {
     use lemmy_db_schema_file::schema::language::dsl::{id, language};
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     // call with all languages, returns empty vec
@@ -466,9 +464,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_site_languages() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let data = TestData::create(pool).await?;
@@ -489,9 +486,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_user_languages() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let data = TestData::create(pool).await?;
@@ -521,9 +517,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_community_languages() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
     let data = TestData::create(pool).await?;
     let test_langs = test_langs1(pool).await?;
@@ -576,9 +571,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_validate_post_language() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
     let data = TestData::create(pool).await?;
     let test_langs = test_langs1(pool).await?;

crates/db_schema/src/impls/captcha_answer.rs

@@ -54,9 +54,8 @@ mod tests {
   use serial_test::serial;
 
   #[tokio::test]
-  #[serial]
   async fn test_captcha_happy_path() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted = CaptchaAnswer::insert(
@@ -81,9 +80,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_captcha_repeat_answer_fails() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted = CaptchaAnswer::insert(

crates/db_schema/src/impls/comment.rs

@@ -394,9 +394,8 @@ mod tests {
   use url::Url;
 
   #[tokio::test]
-  #[serial]
   async fn test_crud() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;
@@ -507,9 +506,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_aggregates() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;

crates/db_schema/src/impls/community.rs

@@ -703,9 +703,8 @@ mod tests {
   use serial_test::serial;
 
   #[tokio::test]
-  #[serial]
   async fn test_crud() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;
@@ -864,9 +863,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_aggregates() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;

crates/db_schema/src/impls/federation_allowlist.rs

@@ -35,9 +35,8 @@ mod tests {
   use serial_test::serial;
 
   #[tokio::test]
-  #[serial]
   async fn test_allowlist_insert_and_clear() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
     let instances = vec![
       Instance::read_or_create(pool, "tld1.xyz".to_string()).await?,

crates/db_schema/src/impls/language.rs

@@ -52,9 +52,8 @@ mod tests {
   use serial_test::serial;
 
   #[tokio::test]
-  #[serial]
   async fn test_languages() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let all = Language::read_all(pool).await?;

crates/db_schema/src/impls/local_site.rs

@@ -85,9 +85,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_aggregates() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let (data, inserted_person, inserted_community) = prepare_site_with_community(pool).await?;
@@ -155,9 +154,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_soft_delete() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let (data, inserted_person, inserted_community) = prepare_site_with_community(pool).await?;

crates/db_schema/src/impls/local_user.rs

@@ -400,9 +400,8 @@ mod tests {
   use serial_test::serial;
 
   #[tokio::test]
-  #[serial]
   async fn test_admin_higher_check() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;
@@ -439,9 +438,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_email_taken() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let darwin_email = "[email protected]";

crates/db_schema/src/impls/mod_log/moderator.rs

@@ -411,9 +411,8 @@ mod tests {
   use serial_test::serial;
 
   #[tokio::test]
-  #[serial]
   async fn test_crud() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;

crates/db_schema/src/impls/multi_community.rs

@@ -361,9 +361,8 @@ mod tests {
   }
 
   #[tokio::test]
-  #[serial]
   async fn test_multi_community_apub() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
     let data = setup(pool).await?;
 

crates/db_schema/src/impls/password_reset_request.rs

@@ -61,9 +61,8 @@ mod tests {
   use serial_test::serial;
 
   #[tokio::test]
-  #[serial]
   async fn test_password_reset() -> LemmyResult<()> {
-    let pool = &build_db_pool_for_tests();
+    let pool = &build_db_pool_for_tests().await;
     let pool = &mut pool.into();
 
     // Setup