Merge pull request #4 from yannleretaille/master

switch to postgres ^0.11, fix errors caused by that, re-add nightly to travis.yml

Author: andelf

.travis.yml

@@ -3,6 +3,7 @@ sudo: required
 rust:
   - beta
   - stable
+  - nightly
 env:
   global:
     - secure: GnJm2lLeA/ZN9oO4/S4VO38Fue0E+hYvRSL4I8Y2tcgTUANPUiR1vRyDNSEjoUlYfOhJOElaQw6a+UxbzXfTrtfHVg0AAbfsI3Y+jOPlyDZZ+hKIQijDCBQ0LtMSt2Ji4g+IM18LlEUE6KpSaP3v0BZsVdvd+b1EKli2G/8HQCCHBdyOmi1xNbRBV8whO6EVZ3L+xnj0e1Zen3RaVVVnAKliQQCOzcKQX7TQ+pDtc0PyuBx2S0Amf5+O2rVVLa0hGTYtf8u+fw9R1N4yMS7xSvIAT+oBaTxnXLdzAb4txeESQLA7TasuA1RBgtTQ2m0d5ESGlz648ChFIK4xOYZp/sKEM0uUXr4f/WO6d2s1uZOYrbkwN8NcHZBq2yY/78QJ4QL4wjLk9XaONSZcDhRB64weQKoLPe93vH2L2lZgmyVZh8KwaFKA9aAQvzi31lEgu3ldAdVX/cXFS7kLLYEYG7fmpSLXKSPcD8nZ9scsOL61PqwSfngsb1QZOK0p5zart7AxskpsToy4A7OHDn+LkQV6uuWk6oD3wwDCRg5qHWUqm/n/Bn8RhT+d/2zxN8D1WygqPiAp61O0dNIx9HMNl+NOBEspzPXx70H7YoyIYIMDpUumwRXytuxI3E5O5H3/IIyTYthtYnxM9VYTfwloJ9SgCyONnbOaWULhYRIWmMg=

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgis"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["ShuYu Wang <[email protected]>"]
 description = "An extension to rust-postgres, adds support for PostGIS."
 homepage = "https://github.com/andelf/rust-postgis"
@@ -11,5 +11,5 @@ keywords = ["PostgreSQL", "PostGIS", "GIS", "GEO"]
 license = "MIT"
 
 [dependencies]
-postgres = "^0.10"
+postgres = "^0.11"
 byteorder = "^0.4"

src/lib.rs

@@ -15,7 +15,7 @@ use std::mem;
 use std::marker::PhantomData;
 use std::iter::FromIterator;
 use std::convert::From;
-use postgres::types::{Type, IsNull, ToSql, FromSql, SessionInfo};
+use postgres::types::{Type, IsNull, ToSql, FromSql, SessionInfo, WrongType};
 use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian, LittleEndian};
 pub mod mars;
 
@@ -384,7 +384,7 @@ macro_rules! impl_traits_for_point {
         impl<S: SRID> FromSql for $ptype<S> {
             accepts_geography!();
             fn from_sql<R: Read>(ty: &Type, raw: &mut R, _ctx: &SessionInfo) -> postgres::Result<$ptype<S>> {
-                <$ptype<S> as ToPoint>::read_ewkb(raw).map_err(|_| postgres::error::Error::WrongType(ty.clone()))
+                <$ptype<S> as ToPoint>::read_ewkb(raw).map_err(|_| {let err: Box<std::error::Error + Sync + Send> = format!("cannot convert {} to ToPoint", ty).into(); postgres::error::Error::Conversion(err)})
             }
         }
 
@@ -490,7 +490,7 @@ macro_rules! define_geometry_container_type {
         impl<P: ToPoint + fmt::Debug> FromSql for $geotype<P> {
             accepts_geography!();
             fn from_sql<R: Read>(ty: &Type, raw: &mut R, _ctx: &SessionInfo) -> postgres::Result<$geotype<P>> {
-                <Self as Geometry>::read_ewkb(raw).map_err(|_| postgres::error::Error::WrongType(ty.clone()))
+                <Self as Geometry>::read_ewkb(raw).map_err(|_| {let err: Box<std::error::Error + Sync + Send> = format!("cannot convert {} to Geometry", ty).into(); postgres::error::Error::Conversion(err)})
             }
         }
         );
@@ -558,7 +558,7 @@ macro_rules! define_geometry_container_type {
         impl<P: ToPoint + fmt::Debug> FromSql for $geotype<P> {
             accepts_geography!();
             fn from_sql<R: Read>(ty: &Type, raw: &mut R, _ctx: &SessionInfo) -> postgres::Result<$geotype<P>> {
-                <Self as Geometry>::read_ewkb(raw).map_err(|_| postgres::error::Error::WrongType(ty.clone()))
+                <Self as Geometry>::read_ewkb(raw).map_err(|_| {let err: Box<std::error::Error + Sync + Send> = format!("cannot convert {} to Geometry", ty).into(); postgres::error::Error::Conversion(err)})
             }
         }
     )
@@ -749,7 +749,7 @@ impl<P: ToPoint + fmt::Debug> ToSql for GeometryCollection<P> {
 impl<P: ToPoint + fmt::Debug> FromSql for GeometryCollection<P> {
     accepts_geography!();
     fn from_sql<R: Read>(ty: &Type, raw: &mut R, _ctx: &SessionInfo) -> postgres::Result<GeometryCollection<P>> {
-        <Self as Geometry>::read_ewkb(raw).map_err(|_| postgres::error::Error::WrongType(ty.clone()))
+        <Self as Geometry>::read_ewkb(raw).map_err(|_| {let err: Box<std::error::Error + Sync + Send> = format!("cannot convert {} to Geometry", ty).into(); postgres::error::Error::Conversion(err)})
     }
 }