Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Encode/Decode impl for Cow<'_, str> #1343

Merged
merged 4 commits into from
Nov 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions sqlx-core/src/mssql/types/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::mssql::io::MssqlBufMutExt;
use crate::mssql::protocol::type_info::{Collation, CollationFlags, DataType, TypeInfo};
use crate::mssql::{Mssql, MssqlTypeInfo, MssqlValueRef};
use crate::types::Type;
use std::borrow::Cow;

impl Type<Mssql> for str {
fn type_info() -> MssqlTypeInfo {
Expand Down Expand Up @@ -81,3 +82,33 @@ impl Decode<'_, Mssql> for String {
.into_owned())
}
}

impl Encode<'_, Mssql> for Cow<'_, str> {
fn produces(&self) -> Option<MssqlTypeInfo> {
match self {
Cow::Borrowed(str) => <&str as Encode<Mssql>>::produces(str),
Cow::Owned(str) => <&str as Encode<Mssql>>::produces(&(str.as_ref())),
}
}

fn encode_by_ref(&self, buf: &mut Vec<u8>) -> IsNull {
match self {
Cow::Borrowed(str) => <&str as Encode<Mssql>>::encode_by_ref(str, buf),
Cow::Owned(str) => <&str as Encode<Mssql>>::encode_by_ref(&(str.as_ref()), buf),
}
}
}

impl<'r> Decode<'r, Mssql> for Cow<'r, str> {
fn decode(value: MssqlValueRef<'r>) -> Result<Self, BoxDynError> {
Ok(Cow::Owned(
value
.type_info
.0
.encoding()?
.decode_without_bom_handling(value.as_bytes()?)
.0
.into_owned(),
))
}
}
16 changes: 16 additions & 0 deletions sqlx-core/src/mysql/types/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::mysql::io::MySqlBufMutExt;
use crate::mysql::protocol::text::{ColumnFlags, ColumnType};
use crate::mysql::{MySql, MySqlTypeInfo, MySqlValueRef};
use crate::types::Type;
use std::borrow::Cow;

const COLLATE_UTF8_GENERAL_CI: u16 = 33;
const COLLATE_UTF8_UNICODE_CI: u16 = 192;
Expand Down Expand Up @@ -80,3 +81,18 @@ impl Decode<'_, MySql> for String {
<&str as Decode<MySql>>::decode(value).map(ToOwned::to_owned)
}
}

impl Encode<'_, MySql> for Cow<'_, str> {
fn encode_by_ref(&self, buf: &mut Vec<u8>) -> IsNull {
match self {
Cow::Borrowed(str) => <&str as Encode<MySql>>::encode(*str, buf),
Cow::Owned(str) => <&str as Encode<MySql>>::encode(&**str, buf),
}
}
}

impl<'r> Decode<'r, MySql> for Cow<'r, str> {
fn decode(value: MySqlValueRef<'r>) -> Result<Self, BoxDynError> {
value.as_str().map(Cow::Borrowed)
}
}
26 changes: 26 additions & 0 deletions sqlx-core/src/postgres/types/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use crate::error::BoxDynError;
use crate::postgres::types::array_compatible;
use crate::postgres::{PgArgumentBuffer, PgTypeInfo, PgValueRef, Postgres};
use crate::types::Type;
use std::borrow::Cow;

impl Type<Postgres> for str {
fn type_info() -> PgTypeInfo {
Expand All @@ -22,6 +23,16 @@ impl Type<Postgres> for str {
}
}

impl Type<Postgres> for Cow<'_, str> {
fn type_info() -> PgTypeInfo {
<&str as Type<Postgres>>::type_info()
}

fn compatible(ty: &PgTypeInfo) -> bool {
<&str as Type<Postgres>>::compatible(ty)
}
}

impl Type<Postgres> for [&'_ str] {
fn type_info() -> PgTypeInfo {
PgTypeInfo::TEXT_ARRAY
Expand Down Expand Up @@ -50,6 +61,15 @@ impl Encode<'_, Postgres> for &'_ str {
}
}

impl Encode<'_, Postgres> for Cow<'_, str> {
fn encode_by_ref(&self, buf: &mut PgArgumentBuffer) -> IsNull {
match self {
Cow::Borrowed(str) => <&str as Encode<Postgres>>::encode(*str, buf),
Cow::Owned(str) => <&str as Encode<Postgres>>::encode(&**str, buf),
}
}
}

impl Encode<'_, Postgres> for String {
fn encode_by_ref(&self, buf: &mut PgArgumentBuffer) -> IsNull {
<&str as Encode<Postgres>>::encode(&**self, buf)
Expand All @@ -62,6 +82,12 @@ impl<'r> Decode<'r, Postgres> for &'r str {
}
}

impl<'r> Decode<'r, Postgres> for Cow<'r, str> {
fn decode(value: PgValueRef<'r>) -> Result<Self, BoxDynError> {
Ok(Cow::Borrowed(value.as_str()?))
}
}

impl Type<Postgres> for String {
fn type_info() -> PgTypeInfo {
<&str as Type<Postgres>>::type_info()
Expand Down
20 changes: 20 additions & 0 deletions sqlx-core/src/sqlite/types/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,23 @@ impl<'r> Decode<'r, Sqlite> for String {
value.text().map(ToOwned::to_owned)
}
}

impl<'q> Encode<'q, Sqlite> for Cow<'q, str> {
fn encode(self, args: &mut Vec<SqliteArgumentValue<'q>>) -> IsNull {
args.push(SqliteArgumentValue::Text(self));

IsNull::No
}

fn encode_by_ref(&self, args: &mut Vec<SqliteArgumentValue<'q>>) -> IsNull {
args.push(SqliteArgumentValue::Text(self.clone()));

IsNull::No
}
}

impl<'r> Decode<'r, Sqlite> for Cow<'r, str> {
fn decode(value: SqliteValueRef<'r>) -> Result<Self, BoxDynError> {
value.text().map(Cow::Borrowed)
}
}