1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-88239: Use sqlite3_stmt_busy() to determine if statements are in use (#25984)

Browse Source
This commit is contained in:
Erlend Egeberg Aasland 2022-06-27 09:58:56 +02:00 committed by GitHub
parent 71868a0066
commit f5c85aa3ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/_sqlite/cursor.c
View File

@ -130,14 +130,10 @@ stmt_reset(pysqlite_Statement *self)
{ {
int rc = SQLITE_OK; int rc = SQLITE_OK;
if (self->in_use && self->st) { if (self->st != NULL) {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rc = sqlite3_reset(self->st); rc = sqlite3_reset(self->st);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (rc == SQLITE_OK) {
self->in_use = 0;
}
} }
return rc; return rc;
@ -770,12 +766,6 @@ bind_parameters(pysqlite_state *state, pysqlite_Statement *self,
} }
} }
static inline void
stmt_mark_dirty(pysqlite_Statement *self)
{
self->in_use = 1;
}
PyObject * PyObject *
_pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument) _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument)
{ {
@ -852,7 +842,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
goto error; goto error;
} }
if (self->statement->in_use) { if (sqlite3_stmt_busy(self->statement->st)) {
Py_SETREF(self->statement, Py_SETREF(self->statement,
pysqlite_statement_create(self->connection, operation)); pysqlite_statement_create(self->connection, operation));
if (self->statement == NULL) { if (self->statement == NULL) {
@ -860,8 +850,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
} }
} }
stmt_reset(self->statement); (void)stmt_reset(self->statement);
stmt_mark_dirty(self->statement);
self->rowcount = self->statement->is_dml ? 0L : -1L; self->rowcount = self->statement->is_dml ? 0L : -1L;
/* We start a transaction implicitly before a DML statement. /* We start a transaction implicitly before a DML statement.
@ -882,8 +871,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
break; break;
} }
stmt_mark_dirty(self->statement);
bind_parameters(state, self->statement, parameters); bind_parameters(state, self->statement, parameters);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
goto error; goto error;

1
Modules/_sqlite/statement.c
View File

@ -88,7 +88,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
} }
self->st = stmt; self->st = stmt;
self->in_use = 0;
self->is_dml = is_dml; self->is_dml = is_dml;
PyObject_GC_Track(self); PyObject_GC_Track(self);

1
Modules/_sqlite/statement.h
View File

@ -33,7 +33,6 @@ typedef struct
{ {
PyObject_HEAD PyObject_HEAD
sqlite3_stmt* st; sqlite3_stmt* st;
int in_use;
int is_dml; int is_dml;
} pysqlite_Statement; } pysqlite_Statement;