Skip to content

Commit d607303

Browse files
committed
Minor cleanup
1 parent 49bed84 commit d607303

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.so
2+
/postgres

src/postgres/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl<'self> PostgresConnection<'self> {
177177
if ret.is_ok() {
178178
self.update("COMMIT", []);
179179
} else {
180-
self.update("ABORT", []);
180+
self.update("ROLLBACK", []);
181181
}
182182

183183
ret
@@ -370,7 +370,7 @@ impl<'self> PostgresRow<'self> {
370370

371371
fn as_c_str_array<T>(array: &[~str], blk: &fn(**c_char) -> T) -> T {
372372
let mut c_array: ~[*c_char] = vec::with_capacity(array.len() + 1);
373-
foreach s in array.iter() {
373+
for s in array.iter() {
374374
// DANGER, WILL ROBINSON
375375
do s.as_c_str |c_s| {
376376
c_array.push(c_s);

src/postgres/test.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extern mod postgres;
22

3-
use postgres::{PostgresConnection, PostgresRow};
3+
use postgres::PostgresConnection;
44

55
macro_rules! chk(
66
($e:expr) => (
@@ -21,10 +21,9 @@ fn test_basic() {
2121

2222
let res = chk!(conn.query("SELECT id from basic WHERE id = 101", []));
2323
assert_eq!(1, res.len());
24-
let rows: ~[PostgresRow] = res.iter().collect();
25-
assert_eq!(1, rows.len());
26-
assert_eq!(1, rows[0].len());
27-
assert_eq!(Some(101), rows[0][0]);
24+
assert_eq!(1, res.get(0).len());
25+
assert_eq!(1, res.get(0).len());
26+
assert_eq!(Some(101), res.get(0)[0]);
2827

2928
Err::<(), ~str>(~"")
3029
};
@@ -40,10 +39,8 @@ fn test_params() {
4039
4140
let res = chk!(conn.query("SELECT id from basic WHERE id = $1", [~"101"]));
4241
assert_eq!(1, res.len());
43-
let rows: ~[PostgresRow] = res.iter().collect();
44-
assert_eq!(1, rows.len());
45-
assert_eq!(1, rows[0].len());
46-
assert_eq!(Some(101), rows[0][0]);
42+
assert_eq!(1, res.get(0).len());
43+
assert_eq!(Some(101), res.get(0)[0]);
4744
4845
Err::<(), ~str>(~"")
4946
};

0 commit comments

Comments
 (0)