mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-44092: Don't reset statements/cursors before rollback (GH-26026)

Browse source 
In SQLite versions pre 3.7.11, pending statements would block a rollback.  This is no longer the case, so remove the workaround.
This commit is contained in:
Erlend Egeberg Aasland 2022-01-03 20:02:39 +01:00 • committed by GitHub
parent 9d35dedc5e
commit 9d6a239a34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Modules/_sqlite/connection.c
View file

@ -274,28 +274,6 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
return 0;
}
static void
pysqlite_do_all_statements(pysqlite_Connection *self)
{
// Reset all statements
sqlite3_stmt *stmt = NULL;
while ((stmt = sqlite3_next_stmt(self->db, stmt))) {
if (sqlite3_stmt_busy(stmt)) {
(void)sqlite3_reset(stmt);
}
}
// Reset all cursors
for (int i = 0; i < PyList_Size(self->cursors); i++) {
PyObject *weakref = PyList_GetItem(self->cursors, i);
PyObject *object = PyWeakref_GetObject(weakref);
if (object != Py_None) {
pysqlite_Cursor *cursor = (pysqlite_Cursor *)object;
cursor->reset = 1;
}
}
}
#define VISIT_CALLBACK_CONTEXT(ctx) \
do { \
if (ctx) { \
@ -549,8 +527,6 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
}
if (!sqlite3_get_autocommit(self->db)) {
pysqlite_do_all_statements(self);
int rc;
Py_BEGIN_ALLOW_THREADS