bpo-44958: Revert GH-27844 (GH-28574)

This reverts commit 050d1035957379d70e8601e6f5636637716a264b, but keeps
the tests.

1 files changed, 12 insertions, 20 deletions

diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index 3016fe5..b20c91d 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -360,31 +360,23 @@ pysqlite_statement_bind_parameters(pysqlite_state *state,
     }
 }
 
-void
-pysqlite_statement_reset(pysqlite_Statement *self)
+int pysqlite_statement_reset(pysqlite_Statement* self)
 {
-    sqlite3_stmt *stmt = self->st;
-    if (stmt == NULL || self->in_use == 0) {
-        return;
-    }
+    int rc;
 
-#if SQLITE_VERSION_NUMBER >= 3020000
-    /* Check if the statement has been run (that is, sqlite3_step() has been
-     * called at least once). Third parameter is non-zero in order to reset the
-     * run count. */
-    if (sqlite3_stmt_status(stmt, SQLITE_STMTSTATUS_RUN, 1) == 0) {
-        return;
-    }
-#endif
+    rc = SQLITE_OK;
 
-    int rc;
-    Py_BEGIN_ALLOW_THREADS
-    rc = sqlite3_reset(stmt);
-    Py_END_ALLOW_THREADS
+    if (self->in_use && self->st) {
+        Py_BEGIN_ALLOW_THREADS
+        rc = sqlite3_reset(self->st);
+        Py_END_ALLOW_THREADS
 
-    if (rc == SQLITE_OK) {
-        self->in_use = 0;
+        if (rc == SQLITE_OK) {
+            self->in_use = 0;
+        }
     }
+
+    return rc;
 }
 
 void pysqlite_statement_mark_dirty(pysqlite_Statement* self)