Merge branch 'release-v0.5.1' into release

Author: sfackler

Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "postgres_array"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "Array support for rust-postgres"
 repository = "https://github.com/sfackler/rust-postgres-array"
-documentation = "https://sfackler.github.io/rust-postgres-array/doc/v0.5.0/postgres_array"
+documentation = "https://sfackler.github.io/rust-postgres-array/doc/v0.5.1/postgres_array"
 
 [dependencies]
-postgres = "0.9"
+postgres = ">= 0.9, < 0.11"
 byteorder = "0.3"
 
 [dev-dependencies]

README.md

@@ -3,4 +3,4 @@
 
 Support for PostgreSQL arrays in [rust-postgres](https://github.com/sfackler/rust-postgres).
 
-Documentation is available at https://sfackler.github.io/rust-postgres-array/doc/v0.5.0/postgres_array.
+Documentation is available at https://sfackler.github.io/rust-postgres-array/doc/v0.5.1/postgres_array.

src/array.rs

@@ -1,16 +1,50 @@
 use std::ops::{Index,IndexMut};
 use std::slice;
 use std::vec;
+use std::fmt;
 
 useDimension;
 
 /// A multi-dimensional array.
-#[derive(Debug,PartialEq,Eq,Clone)]
+#[derive(PartialEq,Eq,Clone)]
 pubstructArray<T>{
 dims:Vec<Dimension>,
 data:Vec<T>,
 }
 
+impl<T: fmt::Debug> fmt::DebugforArray<T>{
+fnfmt(&self,fmt:&mut fmt::Formatter) -> fmt::Result{
+ifself.dims.iter().any(|dim| dim.lower_bound != 1){
+for dim in&self.dims{
+ try!(write!(fmt,"[{}:{}]", dim.lower_bound,
+ dim.lower_bound + dim.len asisize - 1));
+}
+ try!(write!(fmt,"="));
+}
+fmt_helper(0,&self.dims,&mutself.data.iter(), fmt)
+}
+}
+
+fnfmt_helper<'a,T,I>(depth:usize,
+dims:&[Dimension],
+mutdata:&mutI,
+fmt:&mut fmt::Formatter)
+ -> fmt::Result
+whereI:Iterator<Item=&'aT>,T:'a+fmt::Debug{
+if depth == dims.len(){
+returnwrite!(fmt,"{:?}", data.next().unwrap());
+}
+
+ try!(write!(fmt,"{{"));
+for i in0..dims[depth].len{
+if i != 0{
+ try!(write!(fmt,","));
+}
+ try!(fmt_helper(depth + 1, dims, data, fmt));
+}
+write!(fmt,"}}")
+}
+
 impl<T>Array<T>{
 /// Creates a new `Array` from its underlying components.
 ///

src/impls.rs

@@ -2,7 +2,7 @@ use std::io::prelude::*;
 use std::error;
 use byteorder::{ReadBytesExt,WriteBytesExt,BigEndian};
 
-use postgres;
+use postgres::{self,Result};
 use postgres::error::Error;
 use postgres::types::{Type,Kind,ToSql,FromSql,Oid,IsNull,SessionInfo};
 
@@ -68,21 +68,29 @@ impl<T> ToSql for Array<T> where T: ToSql{
  _ => panic!("unexpected type{:?}", ty),
 };
 
- try!(w.write_u32::<BigEndian>(self.dimensions().len()asu32));
+ try!(w.write_i32::<BigEndian>(try!(downcast(self.dimensions().len()))));
  try!(w.write_i32::<BigEndian>(1));
  try!(w.write_u32::<BigEndian>(element_type.oid()));
 
 for info inself.dimensions(){
- try!(w.write_u32::<BigEndian>(info.lenasu32));
- try!(w.write_i32::<BigEndian>(info.lower_boundasi32));
+ try!(w.write_i32::<BigEndian>(try!(downcast(info.len))));
+
+let bound = if info.lower_bound > i32::max_value()asisize
+ || info.lower_bound < i32::min_value()asisize{
+let err:Box<error::Error+Sync+Send> = "value too large to transmit".into();
+returnErr(Error::Conversion(err));
+}else{
+ info.lower_boundasi32
+};
+ try!(w.write_i32::<BigEndian>(bound));
 }
 
 letmut inner_buf = vec![];
 for v inself{
 match try!(v.to_sql(element_type,&mut inner_buf, info)){
 IsNull::Yes => try!(w.write_i32::<BigEndian>(-1)),
 IsNull::No => {
- try!(w.write_i32::<BigEndian>(inner_buf.len()asi32));
+ try!(w.write_i32::<BigEndian>(try!(downcast(inner_buf.len()))));
  try!(w.write_all(&inner_buf));
 }
 }
@@ -102,6 +110,15 @@ impl<T> ToSql for Array<T> where T: ToSql{
 to_sql_checked!();
 }
 
+fndowncast(len:usize) -> Result<i32>{
+if len > i32::max_value()asusize{
+let err:Box<error::Error+Sync+Send> = "value too large to transmit".into();
+Err(Error::Conversion(err))
+}else{
+Ok(len asi32)
+}
+}
+
 #[cfg(test)]
 mod test {
 use std::fmt;

src/lib.rs

@@ -1,5 +1,5 @@
 //! Multi-dimensional arrays with per-dimension specifiable lower bounds
-#![doc(html_root_url="https://sfackler.github.io/rust-postgres-array/doc/v0.5.0")]
+#![doc(html_root_url="https://sfackler.github.io/rust-postgres-array/doc/v0.5.1")]
 
 #[macro_use(to_sql_checked)]
 externcrate postgres;
@@ -118,4 +118,19 @@ mod tests{
  a[(0,0)] = 3;
 assert_eq!(3, a[(0,0)]);
 }
+
+#[test]
+fntest_debug(){
+let a = Array::from_vec(vec![0i32,1,2,3,4],1);
+assert_eq!("{0,1,2,3,4}",&format!("{:?}", a));
+
+let a = Array::from_vec(vec![0i32,1,2,3,4], -3);
+assert_eq!("[-3:1]={0,1,2,3,4}",&format!("{:?}", a));
+
+letmut a = Array::from_vec(vec![1i32,2,3],3);
+ a.wrap(-2);
+ a.push(Array::from_vec(vec![4,5,6],3));
+ a.wrap(1);
+assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}",&format!("{:?}", a));
+}
 }