ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-10-23 15:01:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reset_asap' of https://github.com/gwenn/rusqlite into gwenn-reset_asap

Browse Source
This commit is contained in:
John Gallagher 2015-09-20 20:30:59 -04:00
commit 43b0c1c98a
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib.rs
View File

@ -613,20 +613,11 @@ impl<'conn> SqliteStatement<'conn> {
/// } /// }
/// ``` /// ```
pub fn execute(&mut self, params: &[&ToSql]) -> SqliteResult<c_int> { pub fn execute(&mut self, params: &[&ToSql]) -> SqliteResult<c_int> {
self.reset_if_needed();
unsafe { unsafe {
assert!(params.len() as c_int == ffi::sqlite3_bind_parameter_count(self.stmt), try!(self.bind_parameters(params));
"incorrect number of parameters to execute(): expected {}, got {}",
ffi::sqlite3_bind_parameter_count(self.stmt),
params.len());
for (i, p) in params.iter().enumerate() {
try!(self.conn.decode_result(p.bind_parameter(self.stmt, (i + 1) as c_int)));
}
self.needs_reset = true;
let r = ffi::sqlite3_step(self.stmt); let r = ffi::sqlite3_step(self.stmt);
ffi::sqlite3_reset(self.stmt);
match r { match r {
ffi::SQLITE_DONE => { ffi::SQLITE_DONE => {
if self.column_count != 0 { if self.column_count != 0 {
@ -669,6 +660,7 @@ impl<'conn> SqliteStatement<'conn> {
try!(self.bind_parameters(params)); try!(self.bind_parameters(params));
} }
self.needs_reset = true;
Ok(SqliteRows::new(self)) Ok(SqliteRows::new(self))
} }
@ -707,8 +699,6 @@ impl<'conn> SqliteStatement<'conn> {
try!(self.conn.decode_result(p.bind_parameter(self.stmt, (i + 1) as c_int))); try!(self.conn.decode_result(p.bind_parameter(self.stmt, (i + 1) as c_int)));
} }
self.needs_reset = true;
Ok(()) Ok(())
} }