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

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

diff --git a/crates/db_schema/src/impls/email_verification.rs b/crates/db_schema/src/impls/email_verification.rs
index 5bd574171f92cff3d7043e7e7b94d634d0663444..59c5b9536aed27d1d25fe7526eb794d3825917a3 100644 (file)
--- a/crates/db_schema/src/impls/email_verification.rs
+++ b/crates/db_schema/src/impls/email_verification.rs
@@ -1,14 +1,25 @@
 use crate::{
   newtypes::LocalUserId,
-  schema::email_verification::dsl::*,
-  source::email_verification::*,
+  schema::email_verification::dsl::{
+    email_verification,
+    local_user_id,
+    published,
+    verification_token,
+  },
+  source::email_verification::{EmailVerification, EmailVerificationForm},
   utils::{get_conn, DbPool},
 };
-use diesel::{dsl::*, insert_into, result::Error, ExpressionMethods, QueryDsl};
+use diesel::{
+  dsl::{now, IntervalDsl},
+  insert_into,
+  result::Error,
+  ExpressionMethods,
+  QueryDsl,
+};
 use diesel_async::RunQueryDsl;
 
 impl EmailVerification {
-  pub async fn create(pool: &DbPool, form: &EmailVerificationForm) -> Result<Self, Error> {
+  pub async fn create(pool: &mut DbPool<'_>, form: &EmailVerificationForm) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
     insert_into(email_verification)
       .values(form)
@@ -16,7 +27,7 @@ impl EmailVerification {
       .await
   }
 
-  pub async fn read_for_token(pool: &DbPool, token: &str) -> Result<Self, Error> {
+  pub async fn read_for_token(pool: &mut DbPool<'_>, token: &str) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
     email_verification
       .filter(verification_token.eq(token))
@@ -25,7 +36,7 @@ impl EmailVerification {
       .await
   }
   pub async fn delete_old_tokens_for_local_user(
-    pool: &DbPool,
+    pool: &mut DbPool<'_>,
     local_user_id_: LocalUserId,
   ) -> Result<usize, Error> {
     let conn = &mut get_conn(pool).await?;