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

Give Aggregate::finalize ownership of the context it created

Browse Source
This commit is contained in:
John Gallagher 2016-01-07 11:42:39 -05:00
parent ab262a55de
commit e4819b6adc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/functions.rs
View File

@ -342,7 +342,7 @@ pub trait Aggregate<A, T> where T: ToResult {
/// "step" function called once for each row in an aggregate group. /// "step" function called once for each row in an aggregate group.
fn step(&self, &mut Context, &mut A) -> Result<()>; fn step(&self, &mut Context, &mut A) -> Result<()>;
/// Computes and returns the final result. /// Computes and returns the final result.
fn finalize(&self, &A) -> Result<T>; fn finalize(&self, A) -> Result<T>;
} }
@ -549,7 +549,7 @@ impl InnerConnection {
let ac: *mut A = *pac; let ac: *mut A = *pac;
let a = Box::from_raw(mem::transmute(ac)); // to be freed let a = Box::from_raw(mem::transmute(ac)); // to be freed
match (*boxed_aggr).finalize(&a) { match (*boxed_aggr).finalize(*a) {
Ok(r) => r.set_result(ctx), Ok(r) => r.set_result(ctx),
Err(Error::SqliteFailure(err, s)) => { Err(Error::SqliteFailure(err, s)) => {
ffi::sqlite3_result_error_code(ctx, err.extended_code); ffi::sqlite3_result_error_code(ctx, err.extended_code);
@ -783,8 +783,8 @@ mod test {
Ok(()) Ok(())
} }
fn finalize(&self, sum: &i64) -> Result<i64> { fn finalize(&self, sum: i64) -> Result<i64> {
Ok(*sum) Ok(sum)
} }
} }