Skip to content

libsql/core: Implement Drop for Statement #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
psarna merged 1 commit into from
Jul 9, 2023
Merged

libsql/core: Implement Drop for Statement #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions crates/core/src/rows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use crate::{errors, Error, Params, Result, Statement};
use crate::statement::StatementInner;

use std::cell::RefCell;
use std::rc::Rc;

/// Query result rows.
pub struct Rows {
pub(crate) raw: *mut libsql_sys::ffi::sqlite3,
pub(crate) raw_stmt: *mut libsql_sys::ffi::sqlite3_stmt,
pub(crate) stmt: Rc<StatementInner>,
pub(crate) err: RefCell<Option<i32>>,
}

Expand All @@ -15,21 +16,21 @@ impl Rows {
pub fn next(&self) -> Result<Option<Row>> {
let err = match self.err.take() {
Some(err) => err,
None => unsafe { libsql_sys::ffi::sqlite3_step(self.raw_stmt) },
None => unsafe { libsql_sys::ffi::sqlite3_step(self.stmt.raw_stmt) },
};
match err as u32 {
libsql_sys::ffi::SQLITE_OK => Ok(None),
libsql_sys::ffi::SQLITE_DONE => Ok(None),
libsql_sys::ffi::SQLITE_ROW => Ok(Some(Row { raw: self.raw_stmt })),
libsql_sys::ffi::SQLITE_ROW => Ok(Some(Row { raw: self.stmt.raw_stmt })),
_ => Err(Error::QueryFailed(format!(
"Failed to fetch next row: {}",
errors::sqlite_error_message(self.raw)
errors::sqlite_error_message(self.stmt.raw)
))),
}
}

pub fn column_count(&self) -> i32 {
unsafe { libsql_sys::ffi::sqlite3_column_count(self.raw_stmt) }
unsafe { libsql_sys::ffi::sqlite3_column_count(self.stmt.raw_stmt) }
}
}

Expand Down
36 changes: 24 additions & 12 deletions crates/core/src/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
use crate::{errors, Error, Params, Result, Rows, Value};

use std::rc::Rc;
use std::cell::RefCell;

/// A prepared statement.
pub struct Statement {
raw: *mut libsql_sys::ffi::sqlite3,
raw_stmt: *mut libsql_sys::ffi::sqlite3_stmt,
inner: Rc<StatementInner>,
}

pub(crate) struct StatementInner {
pub(crate) raw: *mut libsql_sys::ffi::sqlite3,
pub(crate) raw_stmt: *mut libsql_sys::ffi::sqlite3_stmt,
}

impl Drop for StatementInner {
fn drop(&mut self) {
if !self.raw_stmt.is_null() {
unsafe { libsql_sys::ffi::sqlite3_finalize(self.raw_stmt); }
}
}
}

impl Statement {
Expand All @@ -21,7 +34,7 @@ impl Statement {
)
};
match err as u32 {
libsql_sys::ffi::SQLITE_OK => Ok(Statement { raw, raw_stmt }),
libsql_sys::ffi::SQLITE_OK => Ok(Statement { inner: Rc::new(StatementInner { raw, raw_stmt }) }),
_ => Err(Error::QueryFailed(format!(
"Failed to prepare statement: `{}`: {}",
sql,
Expand All @@ -38,18 +51,18 @@ impl Statement {
let i = i as i32 + 1;
match param {
Value::Null => unsafe {
libsql_sys::ffi::sqlite3_bind_null(self.raw_stmt, i);
libsql_sys::ffi::sqlite3_bind_null(self.inner.raw_stmt, i);
},
Value::Integer(value) => unsafe {
libsql_sys::ffi::sqlite3_bind_int64(self.raw_stmt, i, *value);
libsql_sys::ffi::sqlite3_bind_int64(self.inner.raw_stmt, i, *value);
},
Value::Float(value) => unsafe {
libsql_sys::ffi::sqlite3_bind_double(self.raw_stmt, i, *value);
libsql_sys::ffi::sqlite3_bind_double(self.inner.raw_stmt, i, *value);
},
Value::Text(value) => unsafe {
let value = value.as_bytes();
libsql_sys::ffi::sqlite3_bind_text(
self.raw_stmt,
self.inner.raw_stmt,
i,
value.as_ptr() as *const i8,
value.len() as i32,
Expand All @@ -58,7 +71,7 @@ impl Statement {
},
Value::Blob(value) => unsafe {
libsql_sys::ffi::sqlite3_bind_blob(
self.raw_stmt,
self.inner.raw_stmt,
i,
value.as_ptr() as *const std::ffi::c_void,
value.len() as i32,
Expand All @@ -73,20 +86,19 @@ impl Statement {

pub fn execute(&self, params: &Params) -> Option<Rows> {
self.bind(params);
let err = unsafe { libsql_sys::ffi::sqlite3_step(self.raw_stmt) };
let err = unsafe { libsql_sys::ffi::sqlite3_step(self.inner.raw_stmt) };
match err as u32 {
libsql_sys::ffi::SQLITE_OK => None,
libsql_sys::ffi::SQLITE_DONE => None,
_ => Some(Rows {
raw: self.raw,
raw_stmt: self.raw_stmt,
stmt: self.inner.clone(),
err: RefCell::new(Some(err)),
}),
}
}

/// Reset the prepared statement to initial state for reuse.
pub fn reset(&self) {
unsafe { libsql_sys::ffi::sqlite3_reset(self.raw_stmt) };
unsafe { libsql_sys::ffi::sqlite3_reset(self.inner.raw_stmt) };
}
}