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

add support for VARCHAR and BPCHAR in postgres

Browse Source
This commit is contained in:
Ryan Leckey 2020-03-24 12:49:52 -07:00
parent f83e0296cc
commit 63aa3e8f0f
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sqlx-core/src/postgres/protocol/type_id.rs
View File

@ -23,6 +23,8 @@ impl TypeId {
pub(crate) const NUMERIC: TypeId = TypeId(1700); pub(crate) const NUMERIC: TypeId = TypeId(1700);
pub(crate) const TEXT: TypeId = TypeId(25); pub(crate) const TEXT: TypeId = TypeId(25);
pub(crate) const VARCHAR: TypeId = TypeId(1043);
pub(crate) const BPCHAR: TypeId = TypeId(1042);
pub(crate) const DATE: TypeId = TypeId(1082); pub(crate) const DATE: TypeId = TypeId(1082);
pub(crate) const TIME: TypeId = TypeId(1083); pub(crate) const TIME: TypeId = TypeId(1083);
@ -48,6 +50,8 @@ impl TypeId {
pub(crate) const ARRAY_FLOAT8: TypeId = TypeId(1022); pub(crate) const ARRAY_FLOAT8: TypeId = TypeId(1022);
pub(crate) const ARRAY_TEXT: TypeId = TypeId(1009); pub(crate) const ARRAY_TEXT: TypeId = TypeId(1009);
pub(crate) const ARRAY_VARCHAR: TypeId = TypeId(1015);
pub(crate) const ARRAY_BPCHAR: TypeId = TypeId(1014);
pub(crate) const ARRAY_NUMERIC: TypeId = TypeId(1700); pub(crate) const ARRAY_NUMERIC: TypeId = TypeId(1700);

22
sqlx-core/src/postgres/types/mod.rs
View File

@ -247,6 +247,28 @@ impl TypeInfo for PgTypeInfo {
| (TypeId::ARRAY_CIDR, TypeId::ARRAY_INET) | (TypeId::ARRAY_CIDR, TypeId::ARRAY_INET)
| (TypeId::ARRAY_INET, TypeId::ARRAY_CIDR) => true, | (TypeId::ARRAY_INET, TypeId::ARRAY_CIDR) => true,
// text, varchar, and bpchar are compatible
(TypeId::VARCHAR, other) | (TypeId::TEXT, other) | (TypeId::BPCHAR, other)
if match other {
TypeId::VARCHAR | TypeId::TEXT | TypeId::BPCHAR => true,
_ => false,
} =>
{
true
}
// text[], varchar[], and bpchar[] are compatible
(TypeId::ARRAY_VARCHAR, other)
| (TypeId::ARRAY_TEXT, other)
| (TypeId::ARRAY_BPCHAR, other)
if match other {
TypeId::ARRAY_VARCHAR | TypeId::ARRAY_TEXT | TypeId::ARRAY_BPCHAR => true,
_ => false,
} =>
{
true
}
_ => { _ => {
// TODO: 99% of postgres types are direct equality for [compatible]; when we add something that isn't (e.g, JSON/JSONB), fix this here // TODO: 99% of postgres types are direct equality for [compatible]; when we add something that isn't (e.g, JSON/JSONB), fix this here
self.id.0 == other.id.0 self.id.0 == other.id.0

32
tests/postgres-macros.rs
View File

@ -29,6 +29,38 @@ async fn test_no_result() -> anyhow::Result<()> {
Ok(()) Ok(())
} }
#[cfg_attr(feature = "runtime-async-std", async_std::test)]
#[cfg_attr(feature = "runtime-tokio", tokio::test)]
async fn test_text_var_char_char_n() -> anyhow::Result<()> {
let mut conn = connect().await?;
// TEXT
let rec = sqlx::query!("SELECT 'Hello'::text as greeting")
.fetch_one(&mut conn)
.await?;
assert_eq!(rec.greeting, "Hello");
// VARCHAR(N)
let rec = sqlx::query!("SELECT 'Hello'::varchar(5) as greeting")
.fetch_one(&mut conn)
.await?;
assert_eq!(rec.greeting, "Hello");
// CHAR(N)
let rec = sqlx::query!("SELECT 'Hello'::char(5) as greeting")
.fetch_one(&mut conn)
.await?;
assert_eq!(rec.greeting, "Hello");
Ok(())
}
#[cfg_attr(feature = "runtime-async-std", async_std::test)] #[cfg_attr(feature = "runtime-async-std", async_std::test)]
#[cfg_attr(feature = "runtime-tokio", tokio::test)] #[cfg_attr(feature = "runtime-tokio", tokio::test)]
async fn _file() -> anyhow::Result<()> { async fn _file() -> anyhow::Result<()> {