Update for r2d2 changes

Author: sfackler

src/lib.rs

@@ -1,8 +1,23 @@
 extern crate r2d2;
 extern crate postgres;
 
+use std::fmt;
 use postgres::{PostgresConnection, PostgresConnectParams, IntoConnectParams, SslMode};
-use postgres::error::PostgresConnectError;
+use postgres::error::{PostgresConnectError, PostgresError};
+
+pub enum Error {
+    ConnectError(PostgresConnectError),
+    OtherError(PostgresError),
+}
+
+impl fmt::Show for Error {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            ConnectError(ref e) => write!(fmt, "{}", e),
+            OtherError(ref e) => write!(fmt, "{}", e),
+        }
+    }
+}
 
 pub struct PostgresPoolManager {
     params: Result<PostgresConnectParams, PostgresConnectError>,
@@ -18,16 +33,18 @@ impl PostgresPoolManager {
     }
 }
 
-impl r2d2::PoolManager<PostgresConnection, PostgresConnectError> for PostgresPoolManager {
-    fn connect(&self) -> Result<PostgresConnection, PostgresConnectError> {
+impl r2d2::PoolManager<PostgresConnection, Error> for PostgresPoolManager {
+    fn connect(&self) -> Result<PostgresConnection, Error> {
         match self.params {
-            Ok(ref p) => PostgresConnection::connect(p.clone(), &self.ssl_mode),
-            Err(ref e) => Err(e.clone())
+            Ok(ref p) => {
+                PostgresConnection::connect(p.clone(), &self.ssl_mode).map_err(ConnectError)
+            }
+            Err(ref e) => Err(ConnectError(e.clone()))
         }
     }
 
-    fn is_valid(&self, conn: &mut PostgresConnection) -> bool {
-        conn.batch_execute("SELECT 1").is_ok()
+    fn is_valid(&self, conn: &mut PostgresConnection) -> Result<(), Error> {
+        conn.batch_execute("SELECT 1").map_err(OtherError)
     }
 
     fn has_broken(&self, conn: &mut PostgresConnection) -> bool {

tests/test.rs

@@ -8,15 +8,15 @@ use std::comm;
 
 use postgres::NoSsl;
 use postgres::error::{SocketError, InvalidUrl};
-use r2d2_postgres::PostgresPoolManager;
+use r2d2_postgres::{PostgresPoolManager, ConnectError};
 
 #[test]
 fn test_bad_url_deferred() {
     let manager = PostgresPoolManager::new("not a url", NoSsl);
     let config = Default::default();
     let handler = r2d2::NoopErrorHandler;
     match r2d2::Pool::new(config, manager, handler) {
-        Err(r2d2::ConnectionError(InvalidUrl(_))) => {}
+        Err(r2d2::ConnectionError(ConnectError(InvalidUrl(_)))) => {}
         Err(err) => fail!("Unexpected error {}", err),
         _ => fail!("Unexpected success"),
     }
@@ -28,7 +28,7 @@ fn test_bad_host_error() {
     let config = Default::default();
     let handler = r2d2::NoopErrorHandler;
     match r2d2::Pool::new(config, manager, handler) {
-        Err(r2d2::ConnectionError(SocketError(_))) => {}
+        Err(r2d2::ConnectionError(ConnectError(SocketError(_)))) => {}
         Err(err) => fail!("Unexpected error {}", err),
         _ => fail!("Unexpected success")
     }