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

bpo-44958: Revert GH-27844 (GH-28574)

Browse source 
This reverts commit 050d103595, but keeps
the tests.
This commit is contained in:
Erlend Egeberg Aasland 2021-09-26 23:24:19 +02:00 • committed by GitHub
parent f56268a2cd
commit 7b88f63e1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Modules/_sqlite/statement.c
View file

@ -360,31 +360,23 @@ pysqlite_statement_bind_parameters(pysqlite_state *state,
}
}
void
pysqlite_statement_reset(pysqlite_Statement *self)
int pysqlite_statement_reset(pysqlite_Statement* self)
{
sqlite3_stmt *stmt = self->st;
if (stmt == NULL || self->in_use == 0) {
return;
}
#if SQLITE_VERSION_NUMBER >= 3020000
/* Check if the statement has been run (that is, sqlite3_step() has been
* called at least once). Third parameter is non-zero in order to reset the
* run count. */
if (sqlite3_stmt_status(stmt, SQLITE_STMTSTATUS_RUN, 1) == 0) {
return;
}
#endif
int rc;
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_reset(stmt);
Py_END_ALLOW_THREADS
if (rc == SQLITE_OK) {
self->in_use = 0;
rc = SQLITE_OK;
if (self->in_use && self->st) {
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_reset(self->st);
Py_END_ALLOW_THREADS
if (rc == SQLITE_OK) {
self->in_use = 0;
}
}
return rc;
}
void pysqlite_statement_mark_dirty(pysqlite_Statement* self)