Update to postgres 0.15

Author: sfackler

Cargo.toml

@@ -17,4 +17,4 @@ syn = "0.11"
 quote = "0.3"
 
 [dev-dependencies]
-postgres = "0.14"
+postgres = "0.15.1"

README.md

@@ -5,7 +5,7 @@
 Syntax extensions to automatically derive `FromSql` and `ToSql` implementations for Postgres enum,
 domain, and composite types.
 
-The generated code requires rust-postgres 0.14 and Rust 1.15.0 or higher.
+The generated code requires rust-postgres 0.14 or 0.15 and Rust 1.15.0 or higher.
 
 # Usage
 

tests/composites.rs

@@ -4,7 +4,6 @@ extern crate postgres_derive;
 extern crate postgres;
 
 use postgres::{Connection, TlsMode};
-use postgres::error::Error;
 use postgres::types::WrongType;
 
 mod util;
@@ -101,10 +100,8 @@ fn wrong_name() {
         price: Some(15.50),
     };
 
-    match conn.execute("SELECT $1::inventory_item", &[&item]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }
 
 #[test]
@@ -132,10 +129,8 @@ fn extra_field() {
         foo: 0,
     };
 
-    match conn.execute("SELECT $1::inventory_item", &[&item]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }
 
 #[test]
@@ -159,10 +154,8 @@ fn missing_field() {
         supplier_id: 100,
     };
 
-    match conn.execute("SELECT $1::inventory_item", &[&item]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }
 
 #[test]
@@ -188,8 +181,6 @@ fn wrong_type() {
         price: 0,
     };
 
-    match conn.execute("SELECT $1::inventory_item", &[&item]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }

tests/domains.rs

@@ -4,7 +4,6 @@ extern crate postgres_derive;
 extern crate postgres;
 
 use postgres::{Connection, TlsMode};
-use postgres::error::Error;
 use postgres::types::WrongType;
 
 mod util;
@@ -46,10 +45,8 @@ fn wrong_name() {
     conn.execute("CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);", &[])
         .unwrap();
 
-    match conn.execute("SELECT $1::session_id", &[&SessionId(vec![])]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::session_id", &[&SessionId(vec![])]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }
 
 #[test]
@@ -62,8 +59,6 @@ fn wrong_type() {
     conn.execute("CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);", &[])
         .unwrap();
 
-    match conn.execute("SELECT $1::session_id", &[&SessionId(0)]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::session_id", &[&SessionId(0)]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }

tests/enums.rs

@@ -4,7 +4,6 @@ extern crate postgres_derive;
 extern crate postgres;
 
 use postgres::{Connection, TlsMode};
-use postgres::error::Error;
 use postgres::types::WrongType;
 
 mod util;
@@ -55,10 +54,8 @@ fn wrong_name() {
     let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
     conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
 
-    match conn.execute("SELECT $1::foo", &[&Foo::Bar]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }
 
 #[test]
@@ -74,10 +71,8 @@ fn extra_variant() {
     let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
     conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
 
-    match conn.execute("SELECT $1::foo", &[&Foo::Bar]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }
 
 #[test]
@@ -91,8 +86,6 @@ fn missing_variant() {
     let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
     conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
 
-    match conn.execute("SELECT $1::foo", &[&Foo::Bar]) {
-        Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
-        v => panic!("unexpected response {:?}", v),
-    }
+    let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
+    assert!(err.as_conversion().unwrap().is::<WrongType>());
 }