Skip to content

Fix sqlite autocommit cursor transaction control #8419

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
youknowone merged 1 commit into from
Aug 1, 2026
Merged

Fix sqlite autocommit cursor transaction control #8419

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
2 changes: 0 additions & 2 deletions Lib/test/test_sqlite3/test_transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,6 @@ def test_autocommit_compat_ctx_mgr(self):
self.assertTrue(cx.in_transaction)
self.assertFalse(cx.in_transaction)

@unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs
def test_autocommit_enabled_executescript(self):
expected = ["BEGIN", "SELECT 1"]
with memory_database(autocommit=True) as cx:
Expand All @@ -498,7 +497,6 @@ def test_autocommit_enabled_executescript(self):
cx.executescript("SELECT 1")
self.assertTrue(cx.in_transaction)

@unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs
def test_autocommit_disabled_executescript(self):
expected = ["SELECT 1"]
with memory_database(autocommit=False) as cx:
Expand Down
12 changes: 7 additions & 5 deletions crates/stdlib/src/_sqlite3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,11 +1761,11 @@ mod _sqlite3 {

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

// Start implicit transaction for DML statements unless in autocommit mode
// Only legacy transaction control starts implicit DML transactions.
if stmt.is_dml
&& db.is_autocommit()
&& zelf.connection.isolation_level.deref().is_some()
&& *zelf.connection.autocommit.lock() != AutocommitMode::Enabled
&& *zelf.connection.autocommit.lock() == AutocommitMode::Legacy
{
db.begin_transaction(
zelf.connection
Expand Down Expand Up @@ -1855,11 +1855,11 @@ mod _sqlite3 {

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

// Start implicit transaction for DML statements unless in autocommit mode
// Only legacy transaction control starts implicit DML transactions.
if stmt.is_dml
&& db.is_autocommit()
&& zelf.connection.isolation_level.deref().is_some()
&& *zelf.connection.autocommit.lock() != AutocommitMode::Enabled
&& *zelf.connection.autocommit.lock() == AutocommitMode::Legacy
{
db.begin_transaction(
zelf.connection
Expand Down Expand Up @@ -1909,7 +1909,9 @@ mod _sqlite3 {

db.sql_limit(script.byte_len(), vm)?;

db.implicit_commit(vm)?;
if *zelf.connection.autocommit.lock() == AutocommitMode::Legacy {
db.implicit_commit(vm)?;
}

let script = script.to_cstring(vm)?;
let mut ptr = script.as_ptr();
Expand Down
Loading