Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions libsql/src/local/rows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,14 @@ impl Rows {
err_msg = errors::error_from_handle(self.stmt.conn.raw);
}
match err {
libsql_sys::ffi::SQLITE_OK => Ok(None),
libsql_sys::ffi::SQLITE_DONE => Ok(None),
libsql_sys::ffi::SQLITE_OK => {
self.stmt.reset();
Ok(None)
}
libsql_sys::ffi::SQLITE_DONE => {
self.stmt.reset();
Ok(None)
}
libsql_sys::ffi::SQLITE_ROW => Ok(Some(Row {
stmt: self.stmt.clone(),
})),
Expand Down Expand Up @@ -82,6 +88,7 @@ impl AsRef<Statement> for Rows {
}
}


pub struct RowsFuture {
pub(crate) conn: Connection,
pub(crate) sql: String,
Expand Down
2 changes: 2 additions & 0 deletions libsql/src/local/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ impl Statement {
pub fn run(&self, params: &Params) -> Result<()> {
self.bind(params);
let err = self.inner.step();
self.inner.reset();
match err {
crate::ffi::SQLITE_DONE => Ok(()),
crate::ffi::SQLITE_ROW => Ok(()),
Expand Down Expand Up @@ -124,6 +125,7 @@ impl Statement {
pub fn execute(&self, params: &Params) -> Result<u64> {
self.bind(params);
let err = self.inner.step();
self.inner.reset();
match err {
crate::ffi::SQLITE_DONE => Ok(self.conn.changes()),
crate::ffi::SQLITE_ROW => Err(Error::ExecuteReturnedRows),
Expand Down
33 changes: 33 additions & 0 deletions libsql/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -854,3 +854,36 @@ fn assert_sqlite_error<T>(res: Result<T>, code: i32) {
}
}
}

#[tokio::test]
async fn test_prepared_statement_reset() {
// Test for issue #2135
let db = Database::open(":memory:").unwrap();
let conn = db.connect().unwrap();

conn.execute("CREATE TABLE domain (name TEXT)", ())
.await
.unwrap();

let stmt = conn
.prepare("INSERT INTO domain VALUES (?1)")
.await
.unwrap();

let domains = ["example.com", "example.org", "example.net"];
for domain in domains {
stmt.execute([domain]).await.unwrap();
}

let mut rows = conn
.query("SELECT name FROM domain ORDER BY name", ())
.await
.unwrap();
let mut results = Vec::new();
while let Some(row) = rows.next().await.unwrap() {
let name: String = row.get(0).unwrap();
results.push(name);
}

assert_eq!(results, vec!["example.com", "example.net", "example.org"]);
}
Loading