Skip to content

Commit d68323e

Browse files
sfacklersfackler
committed
More protocol updates
1 parent 248af3b commit d68323e

File tree

3 files changed

+29
-24
lines changed

3 files changed

+29
-24
lines changed

‎src/lib.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ impl InnerConnection {
408408

409409
try!(self.stream.write_message2(|buf| frontend::parse(stmt_name, query, None, buf)));
410410
try!(self.stream.write_message2(|buf| frontend::describe(b'S', stmt_name, buf)));
411-
try!(self.stream.write_message(&frontend::Sync));
411+
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
412412
try!(self.stream.flush());
413413

414414
match try!(self.read_message()) {
@@ -468,7 +468,8 @@ impl InnerConnection {
468468
try!(self.stream.write_message2(|buf| {
469469
frontend::copy_fail("COPY queries cannot be directly executed", buf)
470470
}));
471-
try!(self.stream.write_message(&frontend::Sync));
471+
try!(self.stream
472+
.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
472473
try!(self.stream.flush());
473474
}
474475
backend::Message::CopyOutResponse { .. } => {
@@ -531,7 +532,7 @@ impl InnerConnection {
531532
}
532533

533534
try!(self.stream.write_message2(|buf| frontend::execute(portal_name, row_limit, buf)));
534-
try!(self.stream.write_message(&frontend::Sync));
535+
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
535536
try!(self.stream.flush());
536537

537538
match try!(self.read_message()) {
@@ -587,7 +588,7 @@ impl InnerConnection {
587588

588589
fn close_statement(&mut self, name: &str, type_: u8) -> Result<()> {
589590
try!(self.stream.write_message2(|buf| frontend::close(type_, name, buf)));
590-
try!(self.stream.write_message(&frontend::Sync));
591+
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
591592
try!(self.stream.flush());
592593
let resp = match try!(self.read_message()) {
593594
backend::Message::CloseComplete => Ok(()),
@@ -813,7 +814,8 @@ impl InnerConnection {
813814
try!(self.stream.write_message2(|buf| {
814815
frontend::copy_fail("COPY queries cannot be directly executed", buf)
815816
}));
816-
try!(self.stream.write_message(&frontend::Sync));
817+
try!(self.stream
818+
.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
817819
try!(self.stream.flush());
818820
}
819821
backend::Message::ErrorResponse { fields } => {
@@ -828,7 +830,7 @@ impl InnerConnection {
828830

829831
fn finish_inner(&mut self) -> Result<()> {
830832
check_desync!(self);
831-
try!(self.stream.write_message(&frontend::Terminate));
833+
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::terminate(buf))));
832834
try!(self.stream.flush());
833835
Ok(())
834836
}

‎src/rows.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use std::ascii::AsciiExt;
66
use std::borrow::Cow;
77
use std::collections::VecDeque;
88
use std::fmt;
9+
use std::io;
910
use std::ops::Deref;
1011
use std::slice;
1112

@@ -237,7 +238,9 @@ impl<'a> Row<'a> {
237238
}
238239
let conn = self.stmt.conn().conn.borrow();
239240
let value = match self.data[idx] {
240-
Some(ref data) => FromSql::from_sql(ty, &mut &**data, &SessionInfo::new(&conn.parameters)),
241+
Some(ref data) => {
242+
FromSql::from_sql(ty, &mut &**data, &SessionInfo::new(&conn.parameters))
243+
}
241244
None => FromSql::from_sql_null(ty, &SessionInfo::new(&conn.parameters)),
242245
};
243246
Some(value.map_err(Error::Conversion))
@@ -352,7 +355,7 @@ impl<'trans, 'stmt> LazyRows<'trans, 'stmt> {
352355
let mut conn = self.stmt.conn().conn.borrow_mut();
353356

354357
try!(conn.stream.write_message2(|buf| frontend::execute(&self.name, self.row_limit, buf)));
355-
try!(conn.stream.write_message(&frontend::Sync));
358+
try!(conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
356359
try!(conn.stream.flush());
357360
conn.read_rows(&mut self.data).map(|more_rows| self.more_rows = more_rows)
358361
}

‎src/stmt.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ impl<'conn> Statement<'conn> {
149149
try!(conn.stream.write_message2(|buf| {
150150
frontend::copy_fail("COPY queries cannot be directly executed", buf)
151151
}));
152-
try!(conn.stream.write_message(&frontend::Sync));
152+
try!(conn.stream
153+
.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
153154
try!(conn.stream.flush());
154155
}
155156
backend::Message::CopyOutResponse { .. } => {
@@ -300,10 +301,12 @@ impl<'conn> Statement<'conn> {
300301
}
301302
Err(err) => {
302303
try!(info.conn.stream.write_message2(|buf| frontend::copy_fail("", buf)));
303-
try!(info.conn.stream.write_message2(|buf| {
304-
Ok::<(), io::Error>(frontend::copy_done(buf))
305-
}));
306-
try!(info.conn.stream.write_message(&frontend::Sync));
304+
try!(info.conn
305+
.stream
306+
.write_message2(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
307+
try!(info.conn
308+
.stream
309+
.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
307310
try!(info.conn.stream.flush());
308311
match try!(info.conn.read_message()) {
309312
backend::Message::ErrorResponse { .. } => {
@@ -320,10 +323,8 @@ impl<'conn> Statement<'conn> {
320323
}
321324
}
322325

323-
try!(info.conn.stream.write_message2(|buf| {
324-
Ok::<(), io::Error>(frontend::copy_done(buf))
325-
}));
326-
try!(info.conn.stream.write_message(&frontend::Sync));
326+
try!(info.conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
327+
try!(info.conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
327328
try!(info.conn.stream.flush());
328329

329330
let num = match try!(info.conn.read_message()) {
@@ -374,10 +375,9 @@ impl<'conn> Statement<'conn> {
374375
}
375376
backend::Message::CopyInResponse { .. } => {
376377
try!(conn.stream.write_message2(|buf| frontend::copy_fail("", buf)));
377-
try!(conn.stream.write_message2(|buf| {
378-
Ok::<(), io::Error>(frontend::copy_done(buf))
379-
}));
380-
try!(conn.stream.write_message(&frontend::Sync));
378+
try!(conn.stream
379+
.write_message2(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
380+
try!(conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
381381
try!(conn.stream.flush());
382382
match try!(conn.read_message()) {
383383
backend::Message::ErrorResponse { .. } => {
@@ -425,7 +425,7 @@ impl<'conn> Statement<'conn> {
425425
Err(e) => {
426426
loop {
427427
if let backend::Message::ReadyForQuery { .. } =
428-
try!(info.conn.read_message()) {
428+
try!(info.conn.read_message()) {
429429
return Err(Error::Io(e));
430430
}
431431
}
@@ -441,15 +441,15 @@ impl<'conn> Statement<'conn> {
441441
backend::Message::ErrorResponse { fields } => {
442442
loop {
443443
if let backend::Message::ReadyForQuery { .. } =
444-
try!(info.conn.read_message()) {
444+
try!(info.conn.read_message()) {
445445
return DbError::new(fields);
446446
}
447447
}
448448
}
449449
_ => {
450450
loop {
451451
if let backend::Message::ReadyForQuery { .. } =
452-
try!(info.conn.read_message()) {
452+
try!(info.conn.read_message()) {
453453
return Err(Error::Io(bad_response()));
454454
}
455455
}

0 commit comments

Comments
 (0)