LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-22 20:31:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add GetConn trait

Browse source
This commit is contained in:
dull b 2023-07-05 02:05:10 +00:00
parent fb147b778b
commit ab4e94aea5
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
crates/db_schema/src/utils.rs
View file

@ -6,6 +6,7 @@ use crate::{
SortType, SortType,
}; };
use activitypub_federation::{fetch::object_id::ObjectId, traits::Object}; use activitypub_federation::{fetch::object_id::ObjectId, traits::Object};
use async_trait::async_trait;
use chrono::NaiveDateTime; use chrono::NaiveDateTime;
use deadpool::Runtime; use deadpool::Runtime;
use diesel::{ use diesel::{
@ -48,8 +49,33 @@ const POOL_TIMEOUT: Option<Duration> = Some(Duration::from_secs(5));
pub type DbPool = Pool<AsyncPgConnection>; pub type DbPool = Pool<AsyncPgConnection>;
pub async fn get_conn(pool: &DbPool) -> Result<PooledConnection<AsyncPgConnection>, DieselError> { #[async_trait]
pool.get().await.map_err(|e| QueryBuilderError(e.into())) pub trait GetConn {
type Conn: std::ops::Deref<Target = AsyncPgConnection>;
async fn get_conn(self) -> Result<Self::Conn, DieselError>;
}
#[async_trait]
impl<'a> GetConn for &'a DbPool {
type Conn = PooledConnection<AsyncPgConnection>;
async fn get_conn(self) -> Result<Self::Conn, DieselError> {
self.get().await.map_err(|e| QueryBuilderError(e.into()))
}
}
#[async_trait]
impl<'a> GetConn for &'a mut AsyncPgConnection {
type Conn = Self;
async fn get_conn(self) -> Result<Self::Conn, DieselError> {
Ok(self)
}
}
pub async fn get_conn<T: GetConn>(getter: T) -> Result<T::Conn, DieselError> {
getter.get_conn().await
} }
pub fn get_database_url_from_env() -> Result<String, VarError> { pub fn get_database_url_from_env() -> Result<String, VarError> {