Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
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
PrevPrevious commit
NextNext commit
Use 64-bit API if available
  • Loading branch information
@erlend-aasland
erlend-aasland committedJun 6, 2022
commitb66adaf0c378146e819cece19f85a3f18e1380a6
16 changes: 13 additions & 3 deletionsModules/_sqlite/cursor.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -776,6 +776,16 @@ 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 DownExpand Up@@ -945,12 +955,12 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}

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

if (rc == SQLITE_DONE && !multiple) {
if (self->statement->is_dml) {
self->rowcount =(long)sqlite3_changes(self->connection->db);
self->rowcount =changes(self->connection->db);
}
stmt_reset(self->statement);
Py_CLEAR(self->statement);
Expand DownExpand Up@@ -1127,7 +1137,7 @@ 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);
self->rowcount =changes(self->connection->db);
}
(void)stmt_reset(self->statement);
}
Expand Down
2 changes: 1 addition & 1 deletionModules/_sqlite/cursor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ typedef struct
PyObject* row_cast_map;
int arraysize;
PyObject* lastrowid;
long rowcount;
sqlite3_int64 rowcount;
PyObject* row_factory;
pysqlite_Statement* statement;
int closed;
Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp