ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-23 00:39:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #983 from thomcc/value_ref-as_bytes

Browse Source 
Add a helper function for getting the byte data from a ValueRef, regardless of if its Text or Blob
This commit is contained in:
gwenn 2021-07-03 07:23:30 +02:00 committed by GitHub
commit b3bd775f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/types/serde_json.rs
View File

@ -17,12 +17,8 @@ impl ToSql for Value {
impl FromSql for Value { impl FromSql for Value {
#[inline] #[inline]
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> { fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
match value { let bytes = value.as_bytes()?;
ValueRef::Text(s) => serde_json::from_slice(s), serde_json::from_slice(bytes).map_err(|err| FromSqlError::Other(Box::new(err)))
ValueRef::Blob(b) => serde_json::from_slice(b),
_ => return Err(FromSqlError::InvalidType),
}
.map_err(|err| FromSqlError::Other(Box::new(err)))
} }
} }

10
src/types/value_ref.rs
View File

@ -77,6 +77,16 @@ impl<'a> ValueRef<'a> {
_ => Err(FromSqlError::InvalidType), _ => Err(FromSqlError::InvalidType),
} }
} }
/// Returns the byte slice that makes up this ValueRef if it's either
/// [`ValueRef::Blob`] or [`ValueRef::Text`].
#[inline]
pub fn as_bytes(&self) -> FromSqlResult<&'a [u8]> {
match self {
ValueRef::Text(s) | ValueRef::Blob(s) => Ok(s),
_ => Err(FromSqlError::InvalidType),
}
}
} }
impl From<ValueRef<'_>> for Value { impl From<ValueRef<'_>> for Value {