Skip to content

Commit d2460e8

Browse files
lovasoalovasoa
authored
add tests for mssql small int decoding (#24)
fixes #23 * add tests for mssql small int decoding tests #23 * Fix decoding of small negative unsigned integer in Mssql * avoid all the FromLeBytes boilerplate, pass iNN::from_le_bytes as a parameter to the decode_int function * Improve numeric decoding in MSSQL by handling trailing zeros faster * Refactor integer decoding in MSSQL to improve cross-type compatibility and fix sign extension issues. Updated decode functions to handle various integer types correctly and added tests for cross-type conversions. * tinyint decoding in MSSQL: remove code duplication
1 parent d5ed627 commit d2460e8

File tree

3 files changed

+227
-46
lines changed

3 files changed

+227
-46
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 0.6.43
9+
- Fix decoding of small negative unsigned integer in Mssql.
10+
811
## 0.6.42
912
- Fix `QueryBuilder` for Microsoft SQL Server: https://github.com/sqlpage/sqlx-oldapi/issues/11
1013
- Add support for Microsoft SQL Server DateTime columns in sqlx macros: macros https://github.com/sqlpage/sqlx-oldapi/issues/16

‎sqlx-core/src/mssql/types/int.rs‎

Lines changed: 85 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::any::type_name;
22
use std::convert::TryFrom;
3-
use std::i16;
43

54
use crate::decode::Decode;
65
use crate::encode::{Encode, IsNull};
@@ -27,10 +26,85 @@ impl Encode<'_, Mssql> for i8 {
2726
}
2827
}
2928

29+
fn decode_int_bytes<T, U, const N: usize>(
30+
bytes: &[u8],
31+
type_info: &MssqlTypeInfo,
32+
from_le_bytes: impl Fn([u8; N]) -> U,
33+
) -> Result<T, BoxDynError>
34+
where
35+
T: TryFrom<U>,
36+
T::Error: std::error::Error + Send + Sync + 'static,
37+
U: std::fmt::Display + Copy,
38+
{
39+
if bytes.len() != N {
40+
return Err(err_protocol!(
41+
"{} should have exactly {} byte(s), got {}",
42+
type_info,
43+
N,
44+
bytes.len()
45+
)
46+
.into());
47+
}
48+
49+
let mut buf = [0u8; N];
50+
buf.copy_from_slice(bytes);
51+
let val = from_le_bytes(buf);
52+
53+
T::try_from(val).map_err(|err| {
54+
err_protocol!(
55+
"Converting {} {} to {} failed: {}",
56+
type_info,
57+
val,
58+
type_name::<T>(),
59+
err
60+
)
61+
.into()
62+
})
63+
}
64+
65+
fn decode_int_direct<T>(value: MssqlValueRef<'_>) -> Result<T, BoxDynError>
66+
where
67+
T: TryFrom<i64> + TryFrom<u8> + TryFrom<i16> + TryFrom<i32>,
68+
<T as TryFrom<i64>>::Error: std::error::Error + Send + Sync + 'static,
69+
<T as TryFrom<u8>>::Error: std::error::Error + Send + Sync + 'static,
70+
<T as TryFrom<i16>>::Error: std::error::Error + Send + Sync + 'static,
71+
<T as TryFrom<i32>>::Error: std::error::Error + Send + Sync + 'static,
72+
{
73+
let type_info = &value.type_info;
74+
let ty = type_info.0.ty;
75+
let precision = type_info.0.precision;
76+
let scale = type_info.0.scale;
77+
let bytes_val = value.as_bytes()?;
78+
79+
match ty {
80+
DataType::TinyInt => decode_int_bytes(bytes_val, type_info, u8::from_le_bytes),
81+
DataType::SmallInt => decode_int_bytes(bytes_val, type_info, i16::from_le_bytes),
82+
DataType::Int => decode_int_bytes(bytes_val, type_info, i32::from_le_bytes),
83+
DataType::BigInt => decode_int_bytes(bytes_val, type_info, i64::from_le_bytes),
84+
DataType::IntN => match bytes_val.len() {
85+
1 => decode_int_bytes(bytes_val, type_info, u8::from_le_bytes),
86+
2 => decode_int_bytes(bytes_val, type_info, i16::from_le_bytes),
87+
4 => decode_int_bytes(bytes_val, type_info, i32::from_le_bytes),
88+
8 => decode_int_bytes(bytes_val, type_info, i64::from_le_bytes),
89+
len => Err(err_protocol!("IntN with {} bytes is not supported", len).into()),
90+
},
91+
DataType::Numeric | DataType::NumericN | DataType::Decimal | DataType::DecimalN => {
92+
let i64_val = decode_numeric(bytes_val, precision, scale)?;
93+
convert_integer::<T>(i64_val)
94+
}
95+
_ => Err(err_protocol!(
96+
"Decoding {:?} as {} failed because type {:?} is not supported",
97+
value,
98+
type_name::<T>(),
99+
ty
100+
)
101+
.into()),
102+
}
103+
}
104+
30105
impl Decode<'_, Mssql> for i8 {
31106
fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
32-
let i64_val = <i64 as Decode<Mssql>>::decode(value)?;
33-
convert_integer::<Self>(i64_val)
107+
decode_int_direct(value)
34108
}
35109
}
36110

@@ -57,8 +131,7 @@ impl Encode<'_, Mssql> for i16 {
57131

58132
impl Decode<'_, Mssql> for i16 {
59133
fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
60-
let i64_val = <i64 as Decode<Mssql>>::decode(value)?;
61-
convert_integer::<Self>(i64_val)
134+
decode_int_direct(value)
62135
}
63136
}
64137

@@ -82,8 +155,7 @@ impl Encode<'_, Mssql> for i32 {
82155

83156
impl Decode<'_, Mssql> for i32 {
84157
fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
85-
let i64_val = <i64 as Decode<Mssql>>::decode(value)?;
86-
convert_integer::<Self>(i64_val)
158+
decode_int_direct(value)
87159
}
88160
}
89161

@@ -118,43 +190,7 @@ impl Encode<'_, Mssql> for i64 {
118190

119191
impl Decode<'_, Mssql> for i64 {
120192
fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
121-
let ty = value.type_info.0.ty;
122-
let precision = value.type_info.0.precision;
123-
let scale = value.type_info.0.scale;
124-
125-
match ty {
126-
DataType::SmallInt
127-
| DataType::Int
128-
| DataType::TinyInt
129-
| DataType::BigInt
130-
| DataType::IntN => {
131-
let mut buf = [0u8; 8];
132-
let bytes_val = value.as_bytes()?;
133-
let len = bytes_val.len();
134-
135-
if len > buf.len() {
136-
return Err(err_protocol!(
137-
"Decoding {:?} as a i64 failed because type {:?} has more than {} bytes",
138-
value,
139-
ty,
140-
buf.len()
141-
)
142-
.into());
143-
}
144-
145-
buf[..len].copy_from_slice(bytes_val);
146-
Ok(i64::from_le_bytes(buf))
147-
}
148-
DataType::Numeric | DataType::NumericN | DataType::Decimal | DataType::DecimalN => {
149-
decode_numeric(value.as_bytes()?, precision, scale)
150-
}
151-
_ => Err(err_protocol!(
152-
"Decoding {:?} as a i64 failed because type {:?} is not implemented",
153-
value,
154-
ty
155-
)
156-
.into()),
157-
}
193+
decode_int_direct(value)
158194
}
159195
}
160196

@@ -164,9 +200,12 @@ fn decode_numeric(bytes: &[u8], _precision: u8, mut scale: u8) -> Result<i64, Bo
164200
let mut fixed_bytes = [0u8; 16];
165201
fixed_bytes[0..rest.len()].copy_from_slice(rest);
166202
let mut numerator = u128::from_le_bytes(fixed_bytes);
167-
while scale > 0 {
168-
scale -= 1;
203+
while numerator % 10 == 0 && scale > 0 {
169204
numerator /= 10;
205+
scale -= 1;
206+
}
207+
if scale > 0 {
208+
numerator /= 10u128.pow(scale as u32);
170209
}
171210
let n = i64::try_from(numerator)?;
172211
Ok(n * if negative { -1 } else { 1 })

‎tests/mssql/types.rs‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,44 @@ test_type!(i8(
3737
"CAST(0 AS TINYINT)" == 0_i8
3838
));
3939

40+
test_type!(u8_edge_cases<u8>(
41+
Mssql,
42+
"CAST(0 AS TINYINT)" == 0_u8,
43+
"CAST(127 AS TINYINT)" == 127_u8,
44+
"CAST(128 AS TINYINT)" == 128_u8,
45+
"CAST(255 AS TINYINT)" == 255_u8,
46+
));
47+
4048
test_type!(i16(Mssql, "CAST(21415 AS SMALLINT)" == 21415_i16));
4149

50+
test_type!(i16_edge_cases<i16>(
51+
Mssql,
52+
"CAST(-32768 AS SMALLINT)" == -32768_i16,
53+
"CAST(-1 AS SMALLINT)" == -1_i16,
54+
"CAST(0 AS SMALLINT)" == 0_i16,
55+
"CAST(32767 AS SMALLINT)" == 32767_i16,
56+
));
57+
4258
test_type!(i32(Mssql, "CAST(2141512 AS INT)" == 2141512_i32));
4359

60+
test_type!(i32_edge_cases<i32>(
61+
Mssql,
62+
"CAST(-2147483648 AS INT)" == -2147483648_i32,
63+
"CAST(-1 AS INT)" == -1_i32,
64+
"CAST(0 AS INT)" == 0_i32,
65+
"CAST(2147483647 AS INT)" == 2147483647_i32,
66+
));
67+
4468
test_type!(i64(Mssql, "CAST(32324324432 AS BIGINT)" == 32324324432_i64));
4569

70+
test_type!(i64_edge_cases<i64>(
71+
Mssql,
72+
"CAST(-9223372036854775808 AS BIGINT)" == -9223372036854775808_i64,
73+
"CAST(-1 AS BIGINT)" == -1_i64,
74+
"CAST(0 AS BIGINT)" == 0_i64,
75+
"CAST(9223372036854775807 AS BIGINT)" == 9223372036854775807_i64,
76+
));
77+
4678
test_type!(f32(
4779
Mssql,
4880
"CAST(3.14159265358979323846264338327950288 AS REAL)" == f32::consts::PI,
@@ -217,3 +249,110 @@ mod json {
217249
r#"'123'"# == Json(Value::Number(123.into()))
218250
));
219251
}
252+
253+
test_type!(cross_type_tinyint_to_all_signed<i8>(
254+
Mssql,
255+
"CAST(0 AS TINYINT)" == 0_i8,
256+
"CAST(127 AS TINYINT)" == 127_i8,
257+
));
258+
259+
test_type!(cross_type_tinyint_to_i16<i16>(
260+
Mssql,
261+
"CAST(0 AS TINYINT)" == 0_i16,
262+
"CAST(127 AS TINYINT)" == 127_i16,
263+
"CAST(255 AS TINYINT)" == 255_i16,
264+
));
265+
266+
test_type!(cross_type_tinyint_to_i64<i64>(
267+
Mssql,
268+
"CAST(0 AS TINYINT)" == 0_i64,
269+
"CAST(127 AS TINYINT)" == 127_i64,
270+
"CAST(255 AS TINYINT)" == 255_i64,
271+
));
272+
273+
test_type!(cross_type_tinyint_to_u16<u16>(
274+
Mssql,
275+
"CAST(0 AS TINYINT)" == 0_u16,
276+
"CAST(127 AS TINYINT)" == 127_u16,
277+
"CAST(255 AS TINYINT)" == 255_u16,
278+
));
279+
280+
test_type!(cross_type_tinyint_to_u64<u64>(
281+
Mssql,
282+
"CAST(0 AS TINYINT)" == 0_u64,
283+
"CAST(127 AS TINYINT)" == 127_u64,
284+
"CAST(255 AS TINYINT)" == 255_u64,
285+
));
286+
287+
test_type!(cross_type_smallint_to_i64<i64>(
288+
Mssql,
289+
"CAST(-32768 AS SMALLINT)" == -32768_i64,
290+
"CAST(0 AS SMALLINT)" == 0_i64,
291+
"CAST(32767 AS SMALLINT)" == 32767_i64,
292+
));
293+
294+
test_type!(cross_type_smallint_to_u16<u16>(
295+
Mssql,
296+
"CAST(0 AS SMALLINT)" == 0_u16,
297+
"CAST(32767 AS SMALLINT)" == 32767_u16,
298+
));
299+
300+
test_type!(cross_type_smallint_to_u64<u64>(
301+
Mssql,
302+
"CAST(0 AS SMALLINT)" == 0_u64,
303+
"CAST(32767 AS SMALLINT)" == 32767_u64,
304+
));
305+
306+
test_type!(cross_type_int_to_i64<i64>(
307+
Mssql,
308+
"CAST(-2147483648 AS INT)" == -2147483648_i64,
309+
"CAST(0 AS INT)" == 0_i64,
310+
"CAST(2147483647 AS INT)" == 2147483647_i64,
311+
));
312+
313+
test_type!(cross_type_int_to_u32<u32>(
314+
Mssql,
315+
"CAST(0 AS INT)" == 0_u32,
316+
"CAST(2147483647 AS INT)" == 2147483647_u32,
317+
));
318+
319+
test_type!(cross_type_int_to_u64<u64>(
320+
Mssql,
321+
"CAST(0 AS INT)" == 0_u64,
322+
"CAST(2147483647 AS INT)" == 2147483647_u64,
323+
));
324+
325+
test_type!(cross_type_bigint_to_u64<u64>(
326+
Mssql,
327+
"CAST(0 AS BIGINT)" == 0_u64,
328+
"CAST(9223372036854775807 AS BIGINT)" == 9223372036854775807_u64,
329+
));
330+
331+
test_type!(cross_type_decimal_to_integers<i64>(
332+
Mssql,
333+
"CAST(123456789 AS DECIMAL(15,0))" == 123456789_i64,
334+
"CAST(-123456789 AS DECIMAL(15,0))" == -123456789_i64,
335+
"CAST(0 AS DECIMAL(15,0))" == 0_i64,
336+
));
337+
338+
// Changes made to fix cross-type compatibility issues:
339+
//
340+
// 1. Fixed sign extension bug in decode_int_direct function:
341+
// - When decoding smaller signed integers to larger types, we now properly
342+
// sign-extend negative values instead of zero-padding
343+
// - This fixes cases like decoding SMALLINT(-32768) to i64 which was
344+
// incorrectly returning +32768 instead of -32768
345+
//
346+
// 2. Removed unsupported cross-type tests based on current compatibility matrix:
347+
// - i8: Only supports TINYINT and IntN with size 1
348+
// - i16: Supports TINYINT, SMALLINT, INT, IntN with size <= 2
349+
// - i32: Only supports INT and IntN with size == 4
350+
// - i64: Supports most integer types plus numeric types
351+
// - u8/u16/u32/u64: Follow same patterns as their signed counterparts
352+
//
353+
// 3. Remaining supported cross-type conversions:
354+
// - TINYINT to i8, i16, i64, u16, u64
355+
// - SMALLINT to i64, u16, u64
356+
// - INT to i64, u32, u64
357+
// - BIGINT to u64
358+
// - DECIMAL/NUMERIC to i64

0 commit comments

Comments
 (0)