Skip to content

bpo-27645: Fix sqlite backup check if database in transaction to be up to 3.8.7 (inclusive) #6131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berkerpeksag merged 1 commit into from
Mar 18, 2018
Merged

bpo-27645: Fix sqlite backup check if database in transaction to be up to 3.8.7 (inclusive) #6131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Lib/sqlite3/test/backup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@ def test_bad_target_closed_connection(self):
self.cx.backup(bck)

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

def test_keyword_only_args(self):
Expand Down
4 changes: 2 additions & 2 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,8 +1481,8 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *args, PyObject *
return NULL;
}

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