ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-23 00:39:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add range-checked FromSql impls for i8, i16, u8, u16, u32.

Browse Source
This commit is contained in:
John Gallagher 2017-01-22 19:40:48 -05:00
parent 1974ee573c
commit 846a59695c
1 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/types/from_sql.rs
View File

@ -53,17 +53,28 @@ pub trait FromSql: Sized {
fn column_result(value: ValueRef) -> FromSqlResult<Self>; fn column_result(value: ValueRef) -> FromSqlResult<Self>;
} }
impl FromSql for i32 { macro_rules! from_sql_integral(
fn column_result(value: ValueRef) -> FromSqlResult<Self> { ($t:ident) => (
i64::column_result(value).and_then(|i| { impl FromSql for $t {
if i < i32::min_value() as i64 || i > i32::max_value() as i64 { fn column_result(value: ValueRef) -> FromSqlResult<Self> {
Err(FromSqlError::OutOfRange(i)) i64::column_result(value).and_then(|i| {
} else { if i < $t::min_value() as i64 || i > $t::max_value() as i64 {
Ok(i as i32) Err(FromSqlError::OutOfRange(i))
} else {
Ok(i as $t)
}
})
} }
}) }
} )
} );
from_sql_integral!(i8);
from_sql_integral!(i16);
from_sql_integral!(i32);
from_sql_integral!(u8);
from_sql_integral!(u16);
from_sql_integral!(u32);
impl FromSql for i64 { impl FromSql for i64 {
fn column_result(value: ValueRef) -> FromSqlResult<Self> { fn column_result(value: ValueRef) -> FromSqlResult<Self> {
@ -120,6 +131,7 @@ impl FromSql for Value {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use {Connection, Error}; use {Connection, Error};
use super::FromSql;
fn checked_memory_handle() -> Connection { fn checked_memory_handle() -> Connection {
Connection::open_in_memory().unwrap() Connection::open_in_memory().unwrap()
@ -129,23 +141,31 @@ mod test {
fn test_integral_ranges() { fn test_integral_ranges() {
let db = checked_memory_handle(); let db = checked_memory_handle();
fn assert_out_of_range_error(err: Error, value: i64) { fn check_ranges<T>(db: &Connection, out_of_range: &[i64], in_range: &[i64])
match err { where T: Into<i64> + FromSql + ::std::fmt::Debug
Error::IntegralValueOutOfRange(_, bad) => assert_eq!(bad, value), {
_ => panic!("unexpected error {}", err), for n in out_of_range {
let err = db.query_row("SELECT ?", &[n], |r| r.get_checked::<_, T>(0))
.unwrap()
.unwrap_err();
match err {
Error::IntegralValueOutOfRange(_, value) => assert_eq!(*n, value),
_ => panic!("unexpected error: {}", err),
}
}
for n in in_range {
assert_eq!(*n,
db.query_row("SELECT ?", &[n], |r| r.get::<_, T>(0)).unwrap().into());
} }
} }
// i32 check_ranges::<i8>(&db, &[-129, 128], &[-128, 0, 1, 127]);
for bad in &[-2147483649, 2147483648] { check_ranges::<i16>(&db, &[-32769, 32768], &[-32768, -1, 0, 1, 32767]);
let err = db.query_row("SELECT ?", &[bad], |r| r.get_checked::<_, i32>(0)) check_ranges::<i32>(&db,
.unwrap() &[-2147483649, 2147483648],
.unwrap_err(); &[-2147483648, -1, 0, 1, 2147483647]);
assert_out_of_range_error(err, *bad); check_ranges::<u8>(&db, &[-2, -1, 256], &[0, 1, 255]);
} check_ranges::<u16>(&db, &[-2, -1, 65536], &[0, 1, 65535]);
for good in &[-2147483648, 2147483647] { check_ranges::<u32>(&db, &[-2, -1, 4294967296], &[0, 1, 4294967295]);
assert_eq!(*good,
db.query_row("SELECT ?", &[good], |r| r.get::<_, i32>(0)).unwrap());
}
} }
} }