Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / db_schema / src / impls / tagline.rs

diff --git a/crates/db_schema/src/impls/tagline.rs b/crates/db_schema/src/impls/tagline.rs
index ec985a3c8397629a1b142f69daa045bc741e0d7c..be4860e17fd95c105c05a757c81b723d228e26fa 100644 (file)
--- a/crates/db_schema/src/impls/tagline.rs
+++ b/crates/db_schema/src/impls/tagline.rs
@@ -9,7 +9,7 @@ use diesel_async::{AsyncPgConnection, RunQueryDsl};
 
 impl Tagline {
   pub async fn replace(
-    pool: &DbPool,
+    pool: &mut DbPool<'_>,
     for_local_site_id: LocalSiteId,
     list_content: Option<Vec<String>>,
   ) -> Result<Vec<Self>, Error> {
@@ -32,12 +32,12 @@ impl Tagline {
                 .get_result::<Self>(conn)
                 .await?;
             }
-            Self::get_all_conn(conn, for_local_site_id).await
+            Self::get_all(&mut conn.into(), for_local_site_id).await
           }) as _
         })
         .await
     } else {
-      Self::get_all_conn(conn, for_local_site_id).await
+      Self::get_all(&mut conn.into(), for_local_site_id).await
     }
   }
 
@@ -45,17 +45,14 @@ impl Tagline {
     diesel::delete(tagline).execute(conn).await
   }
 
-  async fn get_all_conn(
-    conn: &mut AsyncPgConnection,
+  pub async fn get_all(
+    pool: &mut DbPool<'_>,
     for_local_site_id: LocalSiteId,
   ) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
     tagline
       .filter(local_site_id.eq(for_local_site_id))
       .get_results::<Self>(conn)
       .await
   }
-  pub async fn get_all(pool: &DbPool, for_local_site_id: LocalSiteId) -> Result<Vec<Self>, Error> {
-    let conn = &mut get_conn(pool).await?;
-    Self::get_all_conn(conn, for_local_site_id).await
-  }
 }