Skip to content

Commit f3e5d20

Browse files
committed
Don't panic on unsupported arrays
`assert_eq!` panics, but we should always be returning an error instead.
1 parent 6c5a27f commit f3e5d20

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

diesel/src/pg/types/array.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ impl<T, ST> FromSql<Array<ST>, Pg> for Vec<T> where
4343
let num_elements = try!(bytes.read_i32::<NetworkEndian>());
4444
let lower_bound = try!(bytes.read_i32::<NetworkEndian>());
4545

46-
assert_eq!(num_dimensions, 1, "multi-dimensional arrays are not supported");
47-
assert_eq!(lower_bound, 1, "lower bound must be 1");
46+
if num_dimensions != 1 {
47+
return Err("multi-dimensional arrays are not supported".into());
48+
}
49+
if lower_bound != 1 {
50+
return Err("lower bound must be 1".into())
51+
}
4852

4953
(0..num_elements).map(|_| {
5054
let elem_size = try!(bytes.read_i32::<NetworkEndian>());

0 commit comments

Comments
 (0)