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

Fix execute of statements which return rows

Browse Source 
Closes #274
This commit is contained in:
Steven Fackler 2017-06-30 17:33:49 -10:00
parent ed17d5e45d
commit 3809972907
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,28 +901,28 @@ impl Connection {
self.0
.read()
.map_err(Error::Io)
.and_then(|(m, s)| match m {
backend::Message::DataRow(_) => Either::B(Connection(s).finish_execute()),
backend::Message::CommandComplete(body) => {
Either::A(body.tag()
.map(|tag| {
let num = tag.split_whitespace()
.last()
.unwrap()
.parse()
.unwrap_or(0);
(num, Connection(s))
})
.map_err(Error::Io)
.into_future())
.and_then(|(m, s)| {
match m {
backend::Message::DataRow(_) => Connection(s).finish_execute().boxed(),
backend::Message::CommandComplete(body) => {
body.tag()
.map(|tag| {
tag.split_whitespace()
.last()
.unwrap()
.parse()
.unwrap_or(0)
})
.map_err(Error::Io)
.into_future()
.and_then(|n| Connection(s).ready(n))
.boxed()
}
backend::Message::EmptyQueryResponse => Connection(s).ready(0).boxed(),
backend::Message::ErrorResponse(body) => Connection(s).ready_err(body).boxed(),
_ => Err(bad_message()).into_future().boxed(),
}
backend::Message::EmptyQueryResponse => {
Either::A(Ok((0, Connection(s))).into_future())
}
backend::Message::ErrorResponse(body) => Either::B(Connection(s).ready_err(body)),
_ => Either::A(Err(bad_message()).into_future()),
})
.and_then(|(n, s)| s.ready(n))
.boxed()
}

9
tokio-postgres/src/test.rs
View File

@ -132,6 +132,15 @@ fn prepare_execute() {
l.run(done).unwrap();
}
#[test]
fn prepare_execute_rows() {
let mut l = Core::new().unwrap();
let done = Connection::connect("postgres://postgres@localhost", TlsMode::None, &l.handle())
.then(|c| c.unwrap().prepare("SELECT 1"))
.and_then(|(s, c)| c.execute(&s, &[]));
l.run(done).unwrap();
}
#[test]
fn query() {
let mut l = Core::new().unwrap();