[Python-checkins] gh-92206: Move pysqlite_step() to Modules/_sqlite/cursor.c (#92207)
JelleZijlstra
webhook-mailer at python.org
Mon May 2 23:45:34 EDT 2022
https://github.com/python/cpython/commit/e846fe3fc189ff54413382611ee36e41c2f0776b
commit: e846fe3fc189ff54413382611ee36e41c2f0776b
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: JelleZijlstra <jelle.zijlstra at gmail.com>
date: 2022-05-02T21:45:04-06:00
summary:
gh-92206: Move pysqlite_step() to Modules/_sqlite/cursor.c (#92207)
files:
M Modules/_sqlite/cursor.c
M Modules/_sqlite/util.c
M Modules/_sqlite/util.h
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index e48a95867298b..861704f95cc83 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -454,6 +454,18 @@ get_statement_from_cache(pysqlite_Cursor *self, PyObject *operation)
return PyObject_Vectorcall(cache, args + 1, nargsf, NULL);
}
+static inline int
+stmt_step(sqlite3_stmt *statement)
+{
+ int rc;
+
+ Py_BEGIN_ALLOW_THREADS
+ rc = sqlite3_step(statement);
+ Py_END_ALLOW_THREADS
+
+ return rc;
+}
+
PyObject *
_pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument)
{
@@ -570,7 +582,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
goto error;
}
- rc = pysqlite_step(self->statement->st);
+ rc = stmt_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 */
@@ -799,7 +811,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
if (row == NULL) {
return NULL;
}
- int rc = pysqlite_step(stmt);
+ int rc = stmt_step(stmt);
if (rc == SQLITE_DONE) {
(void)pysqlite_statement_reset(self->statement);
}
diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c
index 113b581bfac73..37b2dd6cb29f4 100644
--- a/Modules/_sqlite/util.c
+++ b/Modules/_sqlite/util.c
@@ -24,18 +24,6 @@
#include "module.h"
#include "connection.h"
-int
-pysqlite_step(sqlite3_stmt *statement)
-{
- int rc;
-
- Py_BEGIN_ALLOW_THREADS
- rc = sqlite3_step(statement);
- Py_END_ALLOW_THREADS
-
- return rc;
-}
-
// Returns non-NULL if a new exception should be raised
static PyObject *
get_exception_class(pysqlite_state *state, int errorcode)
diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
index 5eee3fac6f114..a22bcd82d2a05 100644
--- a/Modules/_sqlite/util.h
+++ b/Modules/_sqlite/util.h
@@ -29,8 +29,6 @@
#include "sqlite3.h"
#include "connection.h"
-int pysqlite_step(sqlite3_stmt *statement);
-
/**
* Checks the SQLite error code and sets the appropriate DB-API exception.
* Returns the error code (0 means no error occurred).
More information about the Python-checkins
mailing list