Skip to content

Commit 429ca44

Browse files
miss-islingtonpalaviv
authored andcommitted
bpo-27645: Fix version number in 'database in transaction' fallback (GH-6131)
It was actually fixed in SQLite 3.8.8, not 3.8.7. (cherry picked from commit bbf7bb7) Co-authored-by: Aviv Palivoda <[email protected]>
1 parent d7b8103 commit 429ca44

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

‎Lib/sqlite3/test/backup.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@ def test_bad_target_closed_connection(self):
3737
self.cx.backup(bck)
3838

3939
def test_bad_target_in_transaction(self):
40-
if sqlite.sqlite_version_info == (3, 8, 7, 1):
41-
self.skipTest('skip until we debug https://bugs.python.org/issue27645#msg313562')
4240
bck = sqlite.connect(':memory:')
4341
bck.execute('CREATE TABLE bar (key INTEGER)')
4442
bck.executemany('INSERT INTO bar (key) VALUES (?)', [(3,), (4,)])
4543
with self.assertRaises(sqlite.OperationalError) as cm:
4644
self.cx.backup(bck)
47-
if sqlite.sqlite_version_info < (3, 8, 7):
45+
if sqlite.sqlite_version_info < (3, 8, 8):
4846
self.assertEqual(str(cm.exception), 'target is in transaction')
4947

5048
def test_keyword_only_args(self):

‎Modules/_sqlite/connection.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,8 +1481,8 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *args, PyObject *
14811481
return NULL;
14821482
}
14831483

1484-
#if SQLITE_VERSION_NUMBER < 3008007
1485-
/* Since 3.8.7 this is already done, per commit
1484+
#if SQLITE_VERSION_NUMBER < 3008008
1485+
/* Since 3.8.8 this is already done, per commit
14861486
https://www.sqlite.org/src/info/169b5505498c0a7e */
14871487
if (!sqlite3_get_autocommit(((pysqlite_Connection *)target)->db)) {
14881488
PyErr_SetString(pysqlite_OperationalError, "target is in transaction");

0 commit comments

Comments
 (0)