fluencelabs/sqlite-wasm-connector
1
0
Fork 0
mirror of https://github.com/fluencelabs/sqlite-wasm-connector synced 2025-04-09 01:36:03 +00:00
Code Issues Projects Releases Wiki Activity

Make Database::execute accept None

Browse Source
This commit is contained in:
Ivan Ukhov 2015-05-29 08:58:19 -04:00
parent 6bece46d5b
commit d17b371c4d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib.rs
View File

@ -98,7 +98,7 @@ pub struct Database<'d> {
_phantom: PhantomData<&'d raw::sqlite3>, _phantom: PhantomData<&'d raw::sqlite3>,
} }
struct ExecuteCallback<'d>(Box<FnMut(Vec<(String, String)>) -> bool + 'd>); pub type ExecuteCallback<'c> = FnMut(Vec<(String, String)>) -> bool + 'c;
impl<'d> Database<'d> { impl<'d> Database<'d> {
/// Open a database. /// Open a database.
@ -111,13 +111,13 @@ impl<'d> Database<'d> {
} }
/// Execute an SQL statement. /// Execute an SQL statement.
pub fn execute<F>(&mut self, sql: &str, callback: Option<F>) -> Result<()> pub fn execute<'c>(&mut self, sql: &str,
where F: FnMut(Vec<(String, String)>) -> bool { callback: Option<&mut ExecuteCallback<'c>>) -> Result<()> {
unsafe { unsafe {
match callback { match callback {
Some(callback) => { Some(callback) => {
let mut callback = ExecuteCallback(Box::new(callback)); let mut callback = Box::new(callback);
success!(raw::sqlite3_exec(self.db, str_to_c_str!(sql), Some(execute_callback), success!(raw::sqlite3_exec(self.db, str_to_c_str!(sql), Some(execute_callback),
&mut callback as *mut _ as *mut _, 0 as *mut _)); &mut callback as *mut _ as *mut _, 0 as *mut _));
}, },
@ -166,7 +166,7 @@ extern fn execute_callback(callback: *mut c_void, count: c_int, values: *mut *mu
pairs.push((column, value)); pairs.push((column, value));
} }
let ExecuteCallback(ref mut callback) = *(callback as *mut _); let ref mut callback = *(callback as *mut Box<&mut ExecuteCallback>);
if callback(pairs) { 0 } else { 1 } if callback(pairs) { 0 } else { 1 }
} }
} }

6
tests/lib.rs
View File

@ -18,14 +18,14 @@ fn execute() {
let mut database = ok!(sqlite::open(&path)); let mut database = ok!(sqlite::open(&path));
let sql = r#"CREATE TABLE `users` (id INTEGER, name VARCHAR(255), age REAL);"#; let sql = r#"CREATE TABLE `users` (id INTEGER, name VARCHAR(255), age REAL);"#;
ok!(database.execute(sql, Some(|_| -> bool { true }))); ok!(database.execute(sql, None));
let sql = r#"INSERT INTO `users` (id, name, age) VALUES (1, "Alice", 20.99);"#; let sql = r#"INSERT INTO `users` (id, name, age) VALUES (1, "Alice", 20.99);"#;
ok!(database.execute(sql, Some(|_| -> bool { true }))); ok!(database.execute(sql, None));
let mut done = false; let mut done = false;
let sql = r#"SELECT * FROM `users`;"#; let sql = r#"SELECT * FROM `users`;"#;
ok!(database.execute(sql, Some(|pairs: Vec<(String, String)>| -> bool { ok!(database.execute(sql, Some(&mut |pairs: Vec<(String, String)>| -> bool {
assert!(pairs.len() == 3); assert!(pairs.len() == 3);
assert!(pairs[0] == pair!("id", "1")); assert!(pairs[0] == pair!("id", "1"));
assert!(pairs[1] == pair!("name", "Alice")); assert!(pairs[1] == pair!("name", "Alice"));