itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-30 05:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use from_utf8_unchecked when we know its UTF-8

Browse Source
This commit is contained in:
Ryan Leckey 2019-08-18 20:42:56 -07:00
parent cdf7453f8f
commit 07d663a5d5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pg/types/character.rs
View File

@ -4,6 +4,7 @@ use crate::{
serialize::{IsNull, ToSql},
types::{AsSqlType, HasSqlType, Text},
};
use std::str;
impl HasSqlType<Text> for Pg {
fn metadata() -> PgTypeMetadata {
@ -43,8 +44,15 @@ impl ToSql<Text, Pg> for String {
impl FromSql<Text, Pg> for String {
#[inline]
fn from_sql(buf: Option<&[u8]>) -> Self {
// TODO: Handle optionals
// Using lossy here as it should be impossible to get non UTF8 data here
String::from_utf8_lossy(buf.unwrap()).into()
// TODO: Handle nulls
let s = if cfg!(debug_assertions) {
str::from_utf8(buf.unwrap()).expect("postgres returned non UTF-8 data for TEXT")
} else {
// SAFE: Postgres is required to return UTF-8 data
unsafe { str::from_utf8_unchecked(buf.unwrap()) }
};
s.to_owned()
}
}