mirror of
https://github.com/python/cpython.git
synced 2025-08-02 16:13:13 +00:00
Issue #10513: Fix a regression in Connection.commit()
Statements should not be reset after a commit.
Backported from 029050896b
This commit is contained in:
parent
7ea386e56e
commit
cc9afa9b51
3 changed files with 34 additions and 1 deletions
|
@ -322,6 +322,37 @@ class RegressionTests(unittest.TestCase):
|
||||||
self.assertRaises(ValueError, cur.execute, " \0select 2")
|
self.assertRaises(ValueError, cur.execute, " \0select 2")
|
||||||
self.assertRaises(ValueError, cur.execute, "select 2\0")
|
self.assertRaises(ValueError, cur.execute, "select 2\0")
|
||||||
|
|
||||||
|
def CheckCommitCursorReset(self):
|
||||||
|
"""
|
||||||
|
Connection.commit() did reset cursors, which made sqlite3
|
||||||
|
to return rows multiple times when fetched from cursors
|
||||||
|
after commit. See issues 10513 and 23129 for details.
|
||||||
|
"""
|
||||||
|
con = sqlite.connect(":memory:")
|
||||||
|
con.executescript("""
|
||||||
|
create table t(c);
|
||||||
|
create table t2(c);
|
||||||
|
insert into t values(0);
|
||||||
|
insert into t values(1);
|
||||||
|
insert into t values(2);
|
||||||
|
""")
|
||||||
|
|
||||||
|
self.assertEqual(con.isolation_level, "")
|
||||||
|
|
||||||
|
counter = 0
|
||||||
|
for i, row in enumerate(con.execute("select c from t")):
|
||||||
|
with self.subTest(i=i, row=row):
|
||||||
|
con.execute("insert into t2(c) values (?)", (i,))
|
||||||
|
con.commit()
|
||||||
|
if counter == 0:
|
||||||
|
self.assertEqual(row[0], 0)
|
||||||
|
elif counter == 1:
|
||||||
|
self.assertEqual(row[0], 1)
|
||||||
|
elif counter == 2:
|
||||||
|
self.assertEqual(row[0], 2)
|
||||||
|
counter += 1
|
||||||
|
self.assertEqual(counter, 3, "should have returned exactly three rows")
|
||||||
|
|
||||||
|
|
||||||
def suite():
|
def suite():
|
||||||
regression_suite = unittest.makeSuite(RegressionTests, "Check")
|
regression_suite = unittest.makeSuite(RegressionTests, "Check")
|
||||||
|
|
|
@ -50,6 +50,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #10513: Fix a regression in Connection.commit(). Statements should
|
||||||
|
not be reset after a commit.
|
||||||
|
|
||||||
- A new version of typing.py from https://github.com/python/typing:
|
- A new version of typing.py from https://github.com/python/typing:
|
||||||
- Collection (only for 3.6) (Issue #27598)
|
- Collection (only for 3.6) (Issue #27598)
|
||||||
- Add FrozenSet to __all__ (upstream #261)
|
- Add FrozenSet to __all__ (upstream #261)
|
||||||
|
|
|
@ -426,7 +426,6 @@ PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (self->inTransaction) {
|
if (self->inTransaction) {
|
||||||
pysqlite_do_all_statements(self, ACTION_RESET, 0);
|
|
||||||
|
|
||||||
Py_BEGIN_ALLOW_THREADS
|
Py_BEGIN_ALLOW_THREADS
|
||||||
rc = sqlite3_prepare(self->db, "COMMIT", -1, &statement, &tail);
|
rc = sqlite3_prepare(self->db, "COMMIT", -1, &statement, &tail);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue