Skip to content

gh-93421: Update sqlite3 cursor.rowcount after SQLITE_DONE #93526

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

Merged
erlend-aasland merged 9 commits into from
Jun 8, 2022
Merged

gh-93421: Update sqlite3 cursor.rowcount after SQLITE_DONE #93526

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
bb4062a
Update rowcount after SQLITE_DONE
erlend-aasland Jun 5, 2022
ce12c96
Harden executemany check
erlend-aasland Jun 6, 2022
9e44c0c
Merge branch 'main' into sqlite-changes-alt
erlend-aasland Jun 6, 2022
b66adaf
Use 64-bit API if available
erlend-aasland Jun 6, 2022
731dfc5
Adjust NEWS
erlend-aasland Jun 6, 2022
ef10d9e
Merge branch 'main' into sqlite-changes-alt
erlend-aasland Jun 8, 2022
02bd83f
Revert 64-bit API support
erlend-aasland Jun 8, 2022
b75b725
Refactor
erlend-aasland Jun 8, 2022
0ebf8a8
Doh, reset _after_ fetching changes
erlend-aasland Jun 8, 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
Prev Previous commit
Next Next commit
Revert 64-bit API support
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jun 8, 2022
commit 02bd83f17f242c091c6f2f1555abdf22d556667c
16 changes: 3 additions & 13 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,16 +776,6 @@ stmt_mark_dirty(pysqlite_Statement *self)
self->in_use = 1;
}

static inline sqlite3_int64
changes(sqlite3 *db)
{
#if SQLITE_VERSION_NUMBER >= 3037000
return sqlite3_changes64(db);
#else
return (sqlite3_int64)sqlite3_changes(db);
#endif
}

PyObject *
_pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument)
{
Expand Down Expand Up @@ -955,12 +945,12 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}

if (self->statement->is_dml && rc == SQLITE_DONE && multiple) {
self->rowcount += changes(self->connection->db);
self->rowcount += (long)sqlite3_changes(self->connection->db);
}

if (rc == SQLITE_DONE && !multiple) {
if (self->statement->is_dml) {
self->rowcount = changes(self->connection->db);
self->rowcount = (long)sqlite3_changes(self->connection->db);
}
stmt_reset(self->statement);
Py_CLEAR(self->statement);
Expand Down Expand Up @@ -1137,7 +1127,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
int rc = stmt_step(stmt);
if (rc == SQLITE_DONE) {
if (self->statement->is_dml) {
self->rowcount = changes(self->connection->db);
self->rowcount = (long)sqlite3_changes(self->connection->db);
}
(void)stmt_reset(self->statement);
}
Expand Down
2 changes: 1 addition & 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,7 @@ typedef struct
PyObject* row_cast_map;
int arraysize;
PyObject* lastrowid;
sqlite3_int64 rowcount;
long rowcount;
PyObject* row_factory;
pysqlite_Statement* statement;
int closed;
Expand Down