Skip to content
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

gh-93421: Fix sqlite3 cursor .rowcount for UPDATE ... RETURNING queries #93520

Closed
wants to merge 9 commits into from
Closed

gh-93421: Fix sqlite3 cursor .rowcount for UPDATE ... RETURNING queries #93520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5436db7
Try lazy rowcount approach
erlend-aasland Jun 5, 2022
84891c6
Calculate rowcount using sqlite3_total_changes() diff
erlend-aasland Jun 5, 2022
a5fca9d
Add NEWS
erlend-aasland Jun 5, 2022
5819902
Fix return value
erlend-aasland Jun 5, 2022
5165a3a
Add tests
erlend-aasland Jun 5, 2022
1da6390
Remove spurious change
erlend-aasland Jun 5, 2022
0df7652
Merge branch 'main' into sqlite-changes
erlend-aasland Jun 6, 2022
c4f6926
Revert sqlite3_stmt_readonly change
erlend-aasland Jun 6, 2022
20397c5
Use sqlite3_total_changes64 if available
erlend-aasland Jun 6, 2022
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
Next Next commit
Try lazy rowcount approach 
Does not work bca. executemany, but it solves the repro
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jun 5, 2022
commit 5436db7e3d9f1de8cf1e1049a7ff7e7db2061080
28 changes: 17 additions & 11 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ pysqlite_cursor_init_impl(pysqlite_Cursor *self,

self->arraysize = 1;
self->closed = 0;
self->rowcount = -1L;

Py_INCREF(Py_None);
Py_XSETREF(self->row_factory, Py_None);
Expand Down Expand Up @@ -835,10 +834,9 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
stmt_reset(self->statement);
}

/* reset description and rowcount */
/* reset description */
Py_INCREF(Py_None);
Py_SETREF(self->description, Py_None);
self->rowcount = 0L;

if (self->statement) {
(void)stmt_reset(self->statement);
Expand Down Expand Up @@ -944,12 +942,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}
}

if (self->statement->is_dml) {
self->rowcount += (long)sqlite3_changes(self->connection->db);
} else {
self->rowcount= -1L;
}

if (rc == SQLITE_DONE && !multiple) {
stmt_reset(self->statement);
Py_CLEAR(self->statement);
Expand Down Expand Up @@ -980,7 +972,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
self->locked = 0;

if (PyErr_Occurred()) {
self->rowcount = -1L;
return NULL;
} else {
return Py_NewRef((PyObject *)self);
Expand Down Expand Up @@ -1321,13 +1312,27 @@ static PyMethodDef cursor_methods[] = {
{NULL, NULL}
};

static PyObject *
get_rowcount(pysqlite_Cursor *self, void *Py_UNUSED(unused))
{
if (!check_cursor(self)) {
return NULL;
}
int changes = sqlite3_changes(self->connection->db);
return PyLong_FromLong(changes);
}

static PyGetSetDef cursor_getset[] = {
{"rowcount", (getter)get_rowcount, (setter)NULL},
{NULL},
};

static struct PyMemberDef cursor_members[] =
{
{"connection", T_OBJECT, offsetof(pysqlite_Cursor, connection), READONLY},
{"description", T_OBJECT, offsetof(pysqlite_Cursor, description), READONLY},
{"arraysize", T_INT, offsetof(pysqlite_Cursor, arraysize), 0},
{"lastrowid", T_OBJECT, offsetof(pysqlite_Cursor, lastrowid), READONLY},
{"rowcount", T_LONG, offsetof(pysqlite_Cursor, rowcount), READONLY},
{"row_factory", T_OBJECT, offsetof(pysqlite_Cursor, row_factory), 0},
{"__weaklistoffset__", T_PYSSIZET, offsetof(pysqlite_Cursor, in_weakreflist), READONLY},
{NULL}
Expand All @@ -1346,6 +1351,7 @@ static PyType_Slot cursor_slots[] = {
{Py_tp_init, pysqlite_cursor_init},
{Py_tp_traverse, cursor_traverse},
{Py_tp_clear, cursor_clear},
{Py_tp_getset, cursor_getset},
{0, NULL},
};

Expand Down
1 change: 0 additions & 1 deletion Modules/_sqlite/cursor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ typedef struct
PyObject* row_cast_map;
int arraysize;
PyObject* lastrowid;
long rowcount;
PyObject* row_factory;
pysqlite_Statement* statement;
int closed;
Expand Down