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

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

diff --git a/crates/db_schema/src/impls/language.rs b/crates/db_schema/src/impls/language.rs
index 78898bcac01275aefb4a9e0ed7e6cb8d60305dcc..e459d9899186a3cbebaebe7719f95912bc19ecd6 100644 (file)
--- a/crates/db_schema/src/impls/language.rs
+++ b/crates/db_schema/src/impls/language.rs
@@ -6,40 +6,34 @@ use crate::{
   utils::{get_conn, DbPool},
 };
 use diesel::{result::Error, QueryDsl};
-use diesel_async::{AsyncPgConnection, RunQueryDsl};
+use diesel_async::RunQueryDsl;
 
 impl Language {
-  pub async fn read_all(pool: &DbPool) -> Result<Vec<Language>, Error> {
+  pub async fn read_all(pool: &mut DbPool<'_>) -> Result<Vec<Language>, Error> {
     let conn = &mut get_conn(pool).await?;
-    Self::read_all_conn(conn).await
-  }
-
-  pub async fn read_all_conn(conn: &mut AsyncPgConnection) -> Result<Vec<Language>, Error> {
     language.load::<Self>(conn).await
   }
 
-  pub async fn read_from_id(pool: &DbPool, id_: LanguageId) -> Result<Language, Error> {
+  pub async fn read_from_id(pool: &mut DbPool<'_>, id_: LanguageId) -> Result<Language, Error> {
     let conn = &mut get_conn(pool).await?;
     language.filter(id.eq(id_)).first::<Self>(conn).await
   }
 
-  pub async fn read_id_from_code(pool: &DbPool, code_: &str) -> Result<LanguageId, Error> {
-    let conn = &mut get_conn(pool).await?;
-    Ok(
-      language
-        .filter(code.eq(code_))
-        .first::<Self>(conn)
-        .await?
-        .id,
-    )
-  }
-
-  pub async fn read_id_from_code_opt(
-    pool: &DbPool,
+  /// Attempts to find the given language code and return its ID. If not found, returns none.
+  pub async fn read_id_from_code(
+    pool: &mut DbPool<'_>,
     code_: Option<&str>,
   ) -> Result<Option<LanguageId>, Error> {
     if let Some(code_) = code_ {
-      Ok(Some(Language::read_id_from_code(pool, code_).await?))
+      let conn = &mut get_conn(pool).await?;
+      Ok(
+        language
+          .filter(code.eq(code_))
+          .first::<Self>(conn)
+          .await
+          .map(|l| l.id)
+          .ok(),
+      )
     } else {
       Ok(None)
     }
@@ -55,6 +49,7 @@ mod tests {
   #[serial]
   async fn test_languages() {
     let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
 
     let all = Language::read_all(pool).await.unwrap();