Merge branch 'release-v0.6.1' into release

Author: sfackler

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "postgres_array"
-version = "0.6.0"
+version = "0.6.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.6.0/postgres_array"
+documentation = "https://sfackler.github.io/rust-postgres-array/doc/v0.6.1/postgres_array"
 
 [dependencies]
 postgres = "0.11"

README.md

@@ -1,6 +1,6 @@
 # rust-postgres-array
 [![Build Status](https://travis-ci.org/sfackler/rust-postgres-array.svg?branch=master)](https://travis-ci.org/sfackler/rust-postgres-array)
 
-[Documentation](https://sfackler.github.io/rust-postgres-array/doc/v0.6.0/postgres_array)
+[Documentation](https://sfackler.github.io/rust-postgres-array/doc/v0.6.1/postgres_array)
 
 Support for PostgreSQL arrays in [rust-postgres](https://github.com/sfackler/rust-postgres).

src/impls.rs

@@ -8,9 +8,9 @@ use postgres::types::{Type, Kind, ToSql, FromSql, Oid, IsNull, SessionInfo};
 
 use{Array,Dimension};
 
-impl<T>FromSqlforArray<Option<T>>whereT:FromSql{
+impl<T>FromSqlforArray<T>whereT:FromSql{
 fnfrom_sql<R:Read>(ty:&Type,raw:&mutR,info:&SessionInfo)
- -> postgres::Result<Array<Option<T>>>{
+ -> postgres::Result<Array<T>>{
 let element_type = match ty.kind(){
 &Kind::Array(ref ty) => ty,
  _ => panic!("unexpected type{:?}", ty),
@@ -37,10 +37,10 @@ impl<T> FromSql for Array<Option<T>> where T: FromSql{
 for _ in0..nele {
 let len = try!(raw.read_i32::<BigEndian>());
 if len < 0{
- elements.push(None);
+ elements.push(try!(FromSql::from_sql_null(&element_type, info)));
 }else{
 letmut limit = raw.take(len asu64);
- elements.push(Some(try!(FromSql::from_sql(&element_type,&mut limit, info))));
+ elements.push(try!(FromSql::from_sql(&element_type,&mut limit, info)));
 if limit.limit() != 0{
 let err:Box<error::Error+Sync+Send> =
 "from_sql call did not consume all data".into();
@@ -226,6 +226,6 @@ mod test{
 fntest_empty_array(){
 let conn = Connection::connect("postgres://postgres@localhost",SslMode::None).unwrap();
 let stmt = conn.prepare("SELECT '{}'::INT4[]").unwrap();
- stmt.query(&[]).unwrap().iter().next().unwrap().get::<_,Array<Option<i32>>>(0);
+ stmt.query(&[]).unwrap().iter().next().unwrap().get::<_,Array<i32>>(0);
 }
 }

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.6.0")]
+#![doc(html_root_url="https://sfackler.github.io/rust-postgres-array/doc/v0.6.1")]
 
 #[macro_use(to_sql_checked)]
 externcrate postgres;