Skip to content
Merged
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
2 changes: 0 additions & 2 deletions Lib/test/test_sqlite3/test_dbapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -1735,8 +1735,6 @@ def test_closed_call(self):
con()

class ClosedCurTests(unittest.TestCase):
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_closed(self):
con = sqlite.connect(":memory:")
cur = con.cursor()
Expand Down
16 changes: 9 additions & 7 deletions crates/stdlib/src/sqlite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1771,6 +1771,8 @@ mod _sqlite {
script: PyUtf8StrRef,
vm: &VirtualMachine,
) -> PyResult<PyRef<Self>> {
let _ = zelf.clone().inner(vm)?;

let db = zelf.connection.db_lock(vm)?;

db.sql_limit(script.byte_len(), vm)?;
Expand Down Expand Up @@ -1829,19 +1831,19 @@ mod _sqlite {
fn close(&self, vm: &VirtualMachine) -> PyResult<()> {
// Check if __init__ was called
let mut guard = self.inner.lock();
if guard.is_none() {

let Some(inner) = guard.as_mut() else {
return Err(new_programming_error(
vm,
"Base Cursor.__init__ not called.".to_owned(),
));
}
};

if let Some(inner) = guard.as_mut() {
if let Some(stmt) = &inner.statement {
stmt.lock().reset();
}
inner.closed = true;
if let Some(stmt) = &inner.statement {
stmt.lock().reset();
}
inner.closed = true;

Ok(())
}

Expand Down
Loading