mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bpo-44315: Remove unused connection argument from pysqlite_step() (GH-26535)

Browse source
This commit is contained in:
Erlend Egeberg Aasland 2021-06-04 22:42:20 +02:00 • committed by GitHub
parent 006fd869e4
commit 7459208de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_sqlite/connection.c
View file

@ -432,7 +432,7 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self)
goto error;
}
rc = pysqlite_step(statement, self);
rc = pysqlite_step(statement);
if (rc != SQLITE_DONE) {
_pysqlite_seterror(self->db);
}
@ -482,7 +482,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
goto error;
}
rc = pysqlite_step(statement, self);
rc = pysqlite_step(statement);
if (rc != SQLITE_DONE) {
_pysqlite_seterror(self->db);
}

6
Modules/_sqlite/cursor.c
View file

@ -568,7 +568,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
goto error;
}
rc = pysqlite_step(self->statement->st, self->connection);
rc = pysqlite_step(self->statement->st);
if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
if (PyErr_Occurred()) {
/* there was an error that occurred in a user-defined callback */
@ -773,7 +773,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj)
/* execute statement, and ignore results of SELECT statements */
do {
rc = pysqlite_step(statement, self->connection);
rc = pysqlite_step(statement);
if (PyErr_Occurred()) {
(void)sqlite3_finalize(statement);
goto error;
@ -847,7 +847,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
}
if (self->statement) {
rc = pysqlite_step(self->statement->st, self->connection);
rc = pysqlite_step(self->statement->st);
if (PyErr_Occurred()) {
(void)pysqlite_statement_reset(self->statement);
Py_DECREF(next_row);

3
Modules/_sqlite/util.c
View file

@ -24,7 +24,8 @@
#include "module.h"
#include "connection.h"
int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection)
int
pysqlite_step(sqlite3_stmt *statement)
{
int rc;

2
Modules/_sqlite/util.h
View file

@ -29,7 +29,7 @@
#include "sqlite3.h"
#include "connection.h"
int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection);
int pysqlite_step(sqlite3_stmt *statement);
/**
* Checks the SQLite error code and sets the appropriate DB-API exception.