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

Some cleanup

Browse Source
This commit is contained in:
Steven Fackler 2014-05-18 11:37:52 -07:00
parent 7cbbccf79a
commit 04ba539ca6
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib.rs
View File

@ -936,20 +936,14 @@ impl<'conn> Drop for PostgresTransaction<'conn> {
impl<'conn> PostgresTransaction<'conn> {
fn finish_inner(&mut self) -> PostgresResult<()> {
if task::failing() || !self.commit.get() {
if self.nested {
try!(self.conn.quick_query("ROLLBACK TO sp"));
} else {
try!(self.conn.quick_query("ROLLBACK"));
}
} else {
if self.nested {
try!(self.conn.quick_query("RELEASE sp"));
} else {
try!(self.conn.quick_query("COMMIT"));
}
}
Ok(())
let rollback = task::failing() || !self.commit.get();
let query = match (rollback, self.nested) {
(true, true) => "ROLLBACK TO sp",
(true, false) => "ROLLBACK",
(false, true) => "RELEASE sp",
(false, false) => "COMMIT",
};
self.conn.quick_query(query).map(|_| ())
}
/// Like `PostgresConnection::prepare`.
@ -1317,7 +1311,6 @@ impl<'stmt> PostgresRows<'stmt> {
///
/// Functionally identical to the `Drop` implementation on `PostgresRows`
/// except that it returns any error to the caller.
#[inline]
pub fn finish(mut self) -> PostgresResult<()> {
self.finished = true;
self.finish_inner()
@ -1452,6 +1445,7 @@ impl RowIndex for int {
}
impl<'a> RowIndex for &'a str {
#[inline]
fn idx(&self, stmt: &PostgresStatement) -> Option<uint> {
for (i, desc) in stmt.result_descriptions().iter().enumerate() {
if desc.name.as_slice() == *self {