itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-03 07:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: actually use TryMapRow and MapRow in Query

Browse Source
This commit is contained in:
Ryan Leckey 2020-07-02 23:03:14 -07:00
parent 5d6516da68
commit 20229ea2b9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sqlx-core/src/query.rs
View File

@ -79,11 +79,12 @@ where
/// The [`query_as`](crate::query_as::query_as) method will construct a mapped query using /// The [`query_as`](crate::query_as::query_as) method will construct a mapped query using
/// a [`FromRow`](crate::row::FromRow) implementation. /// a [`FromRow`](crate::row::FromRow) implementation.
#[inline] #[inline]
pub fn map<F, O>(self, f: F) -> Map<'q, DB, impl Fn(DB::Row) -> Result<O, Error>, A> pub fn map<F, O>(self, f: F) -> Map<'q, DB, impl TryMapRow<DB, Output = O>, A>
where where
F: Fn(DB::Row) -> O, F: MapRow<DB, Output = O>,
O: Unpin,
{ {
self.try_map(move |row| Ok(f(row))) self.try_map(MapRowAdapter(f))
} }
/// Map each row in the result to another type. /// Map each row in the result to another type.
@ -91,9 +92,9 @@ where
/// The [`query_as`](crate::query_as::query_as) method will construct a mapped query using /// The [`query_as`](crate::query_as::query_as) method will construct a mapped query using
/// a [`FromRow`](crate::row::FromRow) implementation. /// a [`FromRow`](crate::row::FromRow) implementation.
#[inline] #[inline]
pub fn try_map<F, O>(self, f: F) -> Map<'q, DB, F, A> pub fn try_map<F>(self, f: F) -> Map<'q, DB, F, A>
where where
F: Fn(DB::Row) -> Result<O, Error>, F: TryMapRow<DB>,
{ {
Map { Map {
inner: self, inner: self,