Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork33.7k
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
9 commits Select commitHold shift + click to select a range
bb4062a Update rowcount after SQLITE_DONE
erlend-aaslandce12c96 Harden executemany check
erlend-aasland9e44c0c Merge branch 'main' into sqlite-changes-alt
erlend-aaslandb66adaf Use 64-bit API if available
erlend-aasland731dfc5 Adjust NEWS
erlend-aaslandef10d9e Merge branch 'main' into sqlite-changes-alt
erlend-aasland02bd83f Revert 64-bit API support
erlend-aaslandb75b725 Refactor
erlend-aasland0ebf8a8 Doh, reset _after_ fetching changes
erlend-aaslandFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletionsMisc/NEWS.d/next/Library/2022-06-05-22-22-42.gh-issue-93421.43UO_8.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Update :data:`sqlite3.Cursor.rowcount` when a DML statement has run to | ||
| completion. This fixes the row count for SQL queries like | ||
| ``UPDATE ... RETURNING``. Patch by Erlend E. Aasland. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -835,10 +835,9 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation | ||
| stmt_reset(self->statement); | ||
| } | ||
| /* reset description */ | ||
| Py_INCREF(Py_None); | ||
| Py_SETREF(self->description, Py_None); | ||
| if (self->statement) { | ||
| (void)stmt_reset(self->statement); | ||
| @@ -867,6 +866,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation | ||
| stmt_reset(self->statement); | ||
| stmt_mark_dirty(self->statement); | ||
| self->rowcount = self->statement->is_dml ? 0L : -1L; | ||
erlend-aasland marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| /* We start a transaction implicitly before a DML statement. | ||
| SELECT is the only exception. See #9924. */ | ||
| @@ -944,18 +944,18 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation | ||
| } | ||
| } | ||
| if (rc == SQLITE_DONE && !multiple) { | ||
| if (self->statement->is_dml) { | ||
| self->rowcount = (long)sqlite3_changes(self->connection->db); | ||
| } | ||
| stmt_reset(self->statement); | ||
| Py_CLEAR(self->statement); | ||
| } | ||
| if (multiple) { | ||
| if (self->statement->is_dml && rc == SQLITE_DONE) { | ||
| self->rowcount += (long)sqlite3_changes(self->connection->db); | ||
| } | ||
| stmt_reset(self->statement); | ||
| } | ||
| Py_XDECREF(parameters); | ||
| @@ -1125,6 +1125,9 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self) | ||
| } | ||
| int rc = stmt_step(stmt); | ||
| if (rc == SQLITE_DONE) { | ||
| if (self->statement->is_dml) { | ||
| self->rowcount = (long)sqlite3_changes(self->connection->db); | ||
| } | ||
| (void)stmt_reset(self->statement); | ||
| } | ||
| else if (rc != SQLITE_ROW) { | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.