ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-09-16 04:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change query_row to unwrap the SqliteResult

Browse Source
This commit is contained in:
John Gallagher
2014-10-28 15:14:52 -04:00
parent 68e9d81283
commit 949260046c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib.rs
View File

@@ -85,9 +85,10 @@ impl SqliteConnection {
self.db.borrow_mut().last_insert_rowid()
}
pub fn query_row<T>(&self, sql: &str, params: &[&ToSql],
f: |SqliteResult<SqliteRow>| -> T) -> T {
f(self.prepare(sql).unwrap().query(params).unwrap().next().unwrap())
pub fn query_row<T>(&self, sql: &str, params: &[&ToSql], f: |SqliteRow| -> T) -> T {
let mut stmt = self.prepare(sql).unwrap();
let mut rows = stmt.query(params).unwrap();
f(rows.next().expect("Query did not return a row").unwrap())
}
pub fn prepare<'a>(&'a self, sql: &str) -> SqliteResult<SqliteStatement<'a>> {
@@ -409,7 +410,7 @@ mod test {
assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", &[&1i32]).unwrap(), 1);
assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", &[&2i32]).unwrap(), 1);
assert_eq!(3i32, db.query_row("SELECT SUM(x) FROM foo", [], |r| r.unwrap().get(0)));
assert_eq!(3i32, db.query_row("SELECT SUM(x) FROM foo", [], |r| r.get(0)));
}
#[test]