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
9 changes: 0 additions & 9 deletions Lib/test/test_sqlite3/test_dbapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -1775,29 +1775,23 @@ def setUp(self):
self.cur = self.con.cursor()
self.con.close()

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_con_cursor(self):
self.check(self.con.cursor)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_con_commit(self):
self.check(self.con.commit)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_con_rollback(self):
self.check(self.con.rollback)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_cur_execute(self):
self.check(self.cur.execute, "select 4")

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_create_function(self):
def f(x):
return 17
self.check(self.con.create_function, "foo", 1, f)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_create_aggregate(self):
class Agg:
def __init__(self):
Expand All @@ -1808,19 +1802,16 @@ def finalize(self):
return 17
self.check(self.con.create_aggregate, "foo", 1, Agg)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_set_authorizer(self):
def authorizer(*args):
return sqlite.DENY
self.check(self.con.set_authorizer, authorizer)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_set_progress_callback(self):
def progress():
pass
self.check(self.con.set_progress_handler, progress, 100)

@unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection
def test_closed_call(self):
self.check(self.con)

Expand Down
5 changes: 5 additions & 0 deletions crates/stdlib/src/_sqlite3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,11 @@ mod _sqlite3 {
Ok(PyMutexGuard::map(guard, |x| unsafe {
x.as_mut().unwrap_unchecked()
}))
} else if self.initialized.load(Ordering::Acquire) {
Err(new_programming_error(
vm,
"Cannot operate on a closed database.".to_owned(),
))
} else {
Err(new_programming_error(
vm,
Expand Down
Loading