dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Translate DB errors

Browse Source
This commit is contained in:
Steven Fackler 2016-12-20 16:15:00 -08:00
parent 5d5caac57b
commit 9227a0c316
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
postgres-tokio/src/lib.rs
View File

@ -20,7 +20,7 @@ pub use postgres_shared::error;
#[doc(inline)] #[doc(inline)]
pub use postgres_shared::params; pub use postgres_shared::params;
use error::ConnectError; use error::{ConnectError, DbError};
use params::{ConnectParams, IntoConnectParams}; use params::{ConnectParams, IntoConnectParams};
use stream::PostgresStream; use stream::PostgresStream;
@ -190,6 +190,9 @@ impl Connection {
} }
} }
} }
backend::Message::ErrorResponse(body) => {
DbError::new_connect(&mut body.fields())
}
_ => Err(bad_message()), _ => Err(bad_message()),
}; };
@ -212,6 +215,9 @@ impl Connection {
.and_then(|(m, s)| { .and_then(|(m, s)| {
match m { match m {
backend::Message::AuthenticationOk => Ok(Connection(s)), backend::Message::AuthenticationOk => Ok(Connection(s)),
backend::Message::ErrorResponse(body) => {
DbError::new_connect(&mut body.fields())
}
_ => Err(bad_message()), _ => Err(bad_message()),
} }
}) })
@ -229,6 +235,9 @@ impl Connection {
Either::A(Connection(s).finish_startup()) Either::A(Connection(s).finish_startup())
} }
backend::Message::ReadyForQuery(_) => Either::B(Ok(Connection(s)).into_future()), backend::Message::ReadyForQuery(_) => Either::B(Ok(Connection(s)).into_future()),
backend::Message::ErrorResponse(body) => {
Either::B(DbError::new_connect(&mut body.fields()).into_future())
}
_ => Either::B(Err(bad_message()).into_future()), _ => Either::B(Err(bad_message()).into_future()),
} }
}) })