bpo-45041: Restore sqlite3 executescript behaviour for SELECT queries (GH-28509)

Erlend Egeberg Aasland · web-flow · commit 3f2c433da560 · 2021-10-07T10:16:45.000+01:00
* bpo-45041: Restore sqlite3 executescript behaviour for select queries * Add regression test
diff --git a/Lib/sqlite3/test/test_regression.py b/Lib/sqlite3/test/test_regression.py
@@ -475,6 +475,17 @@ def dup(v):
             con.execute("drop table t")
             con.commit()
 
+    def test_executescript_step_through_select(self):
+        with managed_connect(":memory:", in_mem=True) as con:
+            values = [(v,) for v in range(5)]
+            with con:
+                con.execute("create table t(t)")
+                con.executemany("insert into t values(?)", values)
+            steps = []
+            con.create_function("step", 1, lambda x: steps.append((x,)))
+            con.executescript("select step(t) from t")
+            self.assertEqual(steps, values)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -760,7 +760,7 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
                                 &tail);
         if (rc == SQLITE_OK) {
             do {
-                (void)sqlite3_step(stmt);
+                rc = sqlite3_step(stmt);
             } while (rc == SQLITE_ROW);
             rc = sqlite3_finalize(stmt);
         }

Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,`
`760`	`760`	`&tail);`
`761`	`761`	`if (rc == SQLITE_OK) {`
`762`	`762`	`do {`
`763`		`- (void)sqlite3_step(stmt);`
	`763`	`+ rc = sqlite3_step(stmt);`
`764`	`764`	`} while (rc == SQLITE_ROW);`
`765`	`765`	`rc = sqlite3_finalize(stmt);`
`766`	`766`	`}`