Fix the empty array case

sfackler · sfackler · commit 39b76df20b5e · 2014-12-25T13:26:25.000-05:00
Closes sfackler#1
diff --git a/src/impls/mod.rs b/src/impls/mod.rs
@@ -82,7 +82,11 @@ impl<T> RawFromSql for ArrayBase<Option<T>> where T: RawFromSql {
                 lower_bound: try!(raw.read_be_i32()) as int,
             });
         }
-        let nele = dim_info.iter().map(|info| info.len as uint).product();
+        let nele = if dim_info.len() == 0 {
+            0
+        } else {
+            dim_info.iter().map(|info| info.len as uint).product()
+        };
 
         let mut elements = Vec::with_capacity(nele);
         for _ in range(0, nele) {
@@ -160,6 +164,7 @@ mod test {
     use std::fmt;
 
     use postgres::{Connection, SslMode, FromSql, ToSql};
+    use ArrayBase;
 
     fn test_type<T: PartialEq+FromSql+ToSql, S: fmt::Show>(sql_type: &str, checks: &[(T, S)]) {
         let conn = Connection::connect("postgres://postgres@localhost", &SslMode::None).unwrap();
@@ -176,7 +181,6 @@ mod test {
 
     macro_rules! test_array_params {
         ($name:expr, $v1:expr, $s1:expr, $v2:expr, $s2:expr, $v3:expr, $s3:expr) => ({
-            use ArrayBase;
 
             let tests = &[(Some(ArrayBase::from_vec(vec!(Some($v1), Some($v2), None), 1)),
                           format!("'{{{},{},NULL}}'", $s1, $s2).into_string()),
@@ -256,4 +260,11 @@ mod test {
     fn test_float8array_params() {
         test_array_params!("FLOAT8", 0f64, "0", 1.5f64, "1.5", 0.009f64, ".009");
     }
+
+    #[test]
+    fn test_empty_array() {
+        let conn = Connection::connect("postgres://postgres@localhost", &SslMode::None).unwrap();
+        let stmt = conn.prepare("SELECT '{}'::INT4[]").unwrap();
+        stmt.query(&[]).unwrap().next().unwrap().get::<_, ArrayBase<Option<i32>>>(0);
+    }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -96,8 +96,8 @@ impl<T> ArrayBase<T> {
     /// not match the number of elements specified.
     pub fn from_raw(data: Vec<T>, info: Vec<DimensionInfo>)
             -> ArrayBase<T> {
-        assert!(!info.is_empty(), "Cannot create a 0x0 array");
-        assert!(data.len() == info.iter().fold(1, |acc, i| acc * i.len),
+        assert!((data.is_empty() && info.is_empty()) ||
+                data.len() == info.iter().fold(1, |acc, i| acc * i.len),
                 "Size mismatch");
         ArrayBase {
             info: info,
