Skip to content

Commit

Permalink
fix: mssql uses unsigned for tinyint instead of signed (#2074)
Browse files Browse the repository at this point in the history
  • Loading branch information
zibebe authored Sep 1, 2022
1 parent 20af5cd commit 9de70d2
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 0 deletions.
1 change: 1 addition & 0 deletions sqlx-core/src/mssql/types/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ mod bool;
mod float;
mod int;
mod str;
mod uint;

impl<'q, T: 'q + Encode<'q, Mssql>> Encode<'q, Mssql> for Option<T> {
fn encode(self, buf: &mut Vec<u8>) -> IsNull {
Expand Down
30 changes: 30 additions & 0 deletions sqlx-core/src/mssql/types/uint.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
use crate::decode::Decode;
use crate::encode::{Encode, IsNull};
use crate::error::BoxDynError;
use crate::mssql::protocol::type_info::{DataType, TypeInfo};
use crate::mssql::{Mssql, MssqlTypeInfo, MssqlValueRef};
use crate::types::Type;

impl Type<Mssql> for u8 {
fn type_info() -> MssqlTypeInfo {
MssqlTypeInfo(TypeInfo::new(DataType::IntN, 1))
}

fn compatible(ty: &MssqlTypeInfo) -> bool {
matches!(ty.0.ty, DataType::TinyInt | DataType::IntN) && ty.0.size == 1
}
}

impl Encode<'_, Mssql> for u8 {
fn encode_by_ref(&self, buf: &mut Vec<u8>) -> IsNull {
buf.extend(&self.to_le_bytes());

IsNull::No
}
}

impl Decode<'_, Mssql> for u8 {
fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
Ok(value.as_bytes()?[0] as u8)
}
}
7 changes: 7 additions & 0 deletions tests/mssql/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ test_type!(null<Option<i32>>(Mssql,
"CAST(NULL as INT)" == None::<i32>
));

test_type!(u8(
Mssql,
"CAST(5 AS TINYINT)" == 5_u8,
"CAST(0 AS TINYINT)" == 0_u8,
"CAST(255 AS TINYINT)" == 255_u8,
));

test_type!(i8(
Mssql,
"CAST(5 AS TINYINT)" == 5_i8,
Expand Down

0 comments on commit 9de70d2

Please sign in to comment.