mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 03:20:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-46249: Move set lastrowid out of the sqlite3 query loop (GH-30489)

Browse source
This commit is contained in:
Erlend Egeberg Aasland 2022-01-22 10:40:22 +01:00 • committed by GitHub
parent 82c53229e1
commit 38afeb1a33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/_sqlite/cursor.c
View file

@ -465,7 +465,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
int rc; int rc;
int numcols; int numcols;
PyObject* column_name; PyObject* column_name;
sqlite_int64 lastrowid;
if (!check_cursor(self)) { if (!check_cursor(self)) {
goto error; goto error;
@ -630,16 +629,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
self->rowcount= -1L; self->rowcount= -1L;
} }
if (!multiple) {
Py_BEGIN_ALLOW_THREADS
lastrowid = sqlite3_last_insert_rowid(self->connection->db);
Py_END_ALLOW_THREADS
Py_SETREF(self->lastrowid, PyLong_FromLongLong(lastrowid));
if (self->lastrowid == NULL) {
goto error;
}
}
if (rc == SQLITE_DONE && !multiple) { if (rc == SQLITE_DONE && !multiple) {
pysqlite_statement_reset(self->statement); pysqlite_statement_reset(self->statement);
Py_CLEAR(self->statement); Py_CLEAR(self->statement);
@ -651,6 +640,17 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
Py_XDECREF(parameters); Py_XDECREF(parameters);
} }
if (!multiple) {
sqlite_int64 lastrowid;
Py_BEGIN_ALLOW_THREADS
lastrowid = sqlite3_last_insert_rowid(self->connection->db);
Py_END_ALLOW_THREADS
Py_SETREF(self->lastrowid, PyLong_FromLongLong(lastrowid));
// Fall through on error.
}
error: error:
Py_XDECREF(parameters); Py_XDECREF(parameters);
Py_XDECREF(parameters_iter); Py_XDECREF(parameters_iter);