Mirrors/sqlx
2
0
Fork 0
mirror of https://github.com/launchbadge/sqlx synced 2024-11-10 22:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

postgres: support NAME and UNKNOWN types (compatible to TEXT)

Browse source
This commit is contained in:
Ryan Leckey 2020-03-25 02:28:30 -07:00
parent 6ebd5c8c1e
commit fbd1a0435f
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sqlx-core/src/postgres/protocol/type_id.rs
View file

@ -27,6 +27,8 @@ impl TypeId {
pub(crate) const TEXT: TypeId = TypeId(25);
pub(crate) const VARCHAR: TypeId = TypeId(1043);
pub(crate) const BPCHAR: TypeId = TypeId(1042);
pub(crate) const NAME: TypeId = TypeId(19);
pub(crate) const UNKNOWN: TypeId = TypeId(705);
pub(crate) const DATE: TypeId = TypeId(1082);
pub(crate) const TIME: TypeId = TypeId(1083);
@ -54,6 +56,7 @@ impl TypeId {
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_NAME: TypeId = TypeId(1003);
pub(crate) const ARRAY_NUMERIC: TypeId = TypeId(1700);
@ -92,6 +95,8 @@ impl Display for TypeId {
TypeId::TEXT => f.write_str("TEXT"),
TypeId::VARCHAR => f.write_str("VARCHAR"),
TypeId::BPCHAR => f.write_str("BPCHAR"),
TypeId::UNKNOWN => f.write_str("UNKNOWN"),
TypeId::NAME => f.write_str("NAME"),
TypeId::DATE => f.write_str("DATE"),
TypeId::TIME => f.write_str("TIME"),
@ -117,6 +122,7 @@ impl Display for TypeId {
TypeId::ARRAY_TEXT => f.write_str("TEXT[]"),
TypeId::ARRAY_VARCHAR => f.write_str("VARCHAR[]"),
TypeId::ARRAY_BPCHAR => f.write_str("BPCHAR[]"),
TypeId::ARRAY_NAME => f.write_str("NAME[]"),
TypeId::ARRAY_NUMERIC => f.write_str("NUMERIC[]"),

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

@ -247,22 +247,34 @@ impl TypeInfo for PgTypeInfo {
| (TypeId::ARRAY_CIDR, TypeId::ARRAY_INET)
| (TypeId::ARRAY_INET, TypeId::ARRAY_CIDR) => true,
// text, varchar, and bpchar are compatible
(TypeId::VARCHAR, other) | (TypeId::TEXT, other) | (TypeId::BPCHAR, other)
// the following text-like types are compatible
(TypeId::VARCHAR, other)
| (TypeId::TEXT, other)
| (TypeId::BPCHAR, other)
| (TypeId::NAME, other)
| (TypeId::UNKNOWN, other)
if match other {
TypeId::VARCHAR | TypeId::TEXT | TypeId::BPCHAR => true,
TypeId::VARCHAR
| TypeId::TEXT
| TypeId::BPCHAR
| TypeId::NAME
| TypeId::UNKNOWN => true,
_ => false,
} =>
{
true
}
// text[], varchar[], and bpchar[] are compatible
// the following text-like array types are compatible
(TypeId::ARRAY_VARCHAR, other)
| (TypeId::ARRAY_TEXT, other)
| (TypeId::ARRAY_BPCHAR, other)
| (TypeId::ARRAY_NAME, other)
if match other {
TypeId::ARRAY_VARCHAR | TypeId::ARRAY_TEXT | TypeId::ARRAY_BPCHAR => true,
TypeId::ARRAY_VARCHAR
| TypeId::ARRAY_TEXT
| TypeId::ARRAY_BPCHAR
| TypeId::ARRAY_NAME => true,
_ => false,
} =>
{