Use same table join code for both read and list functions #3663
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| use crate::schema::person; | ||
|
|
||
| diesel::alias!(person as person1: Person1, person as person2: Person2); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ use crate::{ | |
| diesel::Connection, | ||
| diesel_migrations::MigrationHarness, | ||
| newtypes::DbUrl, | ||
| traits::JoinView, | ||
| CommentSortType, | ||
| SortType, | ||
| }; | ||
|
|
@@ -25,7 +26,7 @@ use diesel_async::{ | |
| }, | ||
| }; | ||
| use diesel_migrations::EmbeddedMigrations; | ||
| use futures_util::{future::BoxFuture, Future, FutureExt}; | ||
| use lemmy_utils::{ | ||
| error::{LemmyError, LemmyErrorExt, LemmyErrorType}, | ||
| settings::structs::Settings, | ||
|
|
@@ -404,6 +405,94 @@ where | |
| } | ||
| } | ||
|
|
||
| pub type ResultFuture<'a, T> = BoxFuture<'a, Result<T, DieselError>>; | ||
|
|
||
| pub trait ReadFn<'a, T: JoinView, Args>: | ||
| Fn(DbConn<'a>, Args) -> ResultFuture<'a, <T as JoinView>::JoinTuple> | ||
| { | ||
| } | ||
|
|
||
| impl< | ||
| 'a, | ||
| T: JoinView, | ||
| Args, | ||
| F: Fn(DbConn<'a>, Args) -> ResultFuture<'a, <T as JoinView>::JoinTuple>, | ||
| > ReadFn<'a, T, Args> for F | ||
| { | ||
| } | ||
|
|
||
| pub trait ListFn<'a, T: JoinView, Args>: | ||
| Fn(DbConn<'a>, Args) -> ResultFuture<'a, Vec<<T as JoinView>::JoinTuple>> | ||
| { | ||
| } | ||
|
|
||
| impl< | ||
| 'a, | ||
| T: JoinView, | ||
| Args, | ||
| F: Fn(DbConn<'a>, Args) -> ResultFuture<'a, Vec<<T as JoinView>::JoinTuple>>, | ||
| > ListFn<'a, T, Args> for F | ||
| { | ||
| } | ||
|
|
||
| /// Allows read and list functions to capture a shared closure that has an inferred return type, which is useful for join logic | ||
| pub struct Queries<RF, LF> { | ||
| pub read_fn: RF, | ||
| pub list_fn: LF, | ||
| } | ||
|
|
||
| // `()` is used to prevent type inference error | ||
| impl Queries<(), ()> { | ||
|
There was a problem hiding this comment. I really do wish there was a better way to handle this, but oh well. Seems like such a common case, but because our type is so complicated, its near impossible to reverse. We'll still merge, but if you get some time, ask @weiznich on matrix or here if there really is no better alternative for what we need. |
||
| pub fn new<'a, RFut, LFut, RT, LT, RA, LA, RF2, LF2>( | ||
| read_fn: RF2, | ||
| list_fn: LF2, | ||
| ) -> Queries<impl ReadFn<'a, RT, RA>, impl ListFn<'a, LT, LA>> | ||
| where | ||
| RFut: Future<Output = Result<<RT as JoinView>::JoinTuple, DieselError>> + Sized + Send + 'a, | ||
| LFut: | ||
| Future<Output = Result<Vec<<LT as JoinView>::JoinTuple>, DieselError>> + Sized + Send + 'a, | ||
| RT: JoinView, | ||
| LT: JoinView, | ||
| RF2: Fn(DbConn<'a>, RA) -> RFut, | ||
| LF2: Fn(DbConn<'a>, LA) -> LFut, | ||
| { | ||
| Queries { | ||
| read_fn: move |conn, args| read_fn(conn, args).boxed(), | ||
| list_fn: move |conn, args| list_fn(conn, args).boxed(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<RF, LF> Queries<RF, LF> { | ||
| pub async fn read<'a, T, Args>( | ||
| self, | ||
| pool: &'a mut DbPool<'_>, | ||
| args: Args, | ||
| ) -> Result<T, DieselError> | ||
| where | ||
| T: JoinView, | ||
| RF: ReadFn<'a, T, Args>, | ||
| { | ||
| let conn = get_conn(pool).await?; | ||
| let res = (self.read_fn)(conn, args).await?; | ||
| Ok(T::from_tuple(res)) | ||
| } | ||
|
|
||
| pub async fn list<'a, T, Args>( | ||
| self, | ||
| pool: &'a mut DbPool<'_>, | ||
| args: Args, | ||
| ) -> Result<Vec<T>, DieselError> | ||
| where | ||
| T: JoinView, | ||
| LF: ListFn<'a, T, Args>, | ||
| { | ||
| let conn = get_conn(pool).await?; | ||
| let res = (self.list_fn)(conn, args).await?; | ||
| Ok(res.into_iter().map(T::from_tuple).collect()) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| #![allow(clippy::unwrap_used)] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need for a separate file, you should be able to put the cfg attribute directly on the macro. Or otherwise put a
mod {}declaration in lib.rs