[1.6.x] Fixed #21235 -- Disabled savepoints for old versions of SQLite.

Thanks Ramiro for the report.

Backport of 91547772 from master.
This commit is contained in:
Aymeric Augustin 2013-10-07 10:47:50 +02:00
parent 5252885494
commit b42f0665a8
1 changed files with 7 additions and 3 deletions

View File

@ -367,12 +367,16 @@ class DatabaseWrapper(BaseDatabaseWrapper):
BaseDatabaseWrapper.close(self) BaseDatabaseWrapper.close(self)
def _savepoint_allowed(self): def _savepoint_allowed(self):
# Two conditions are required here:
# - A sufficiently recent version of SQLite to support savepoints,
# - Being in a transaction, which can only happen inside 'atomic'.
# When 'isolation_level' is not None, sqlite3 commits before each # When 'isolation_level' is not None, sqlite3 commits before each
# savepoint; it's a bug. When it is None, savepoints don't make sense # savepoint; it's a bug. When it is None, savepoints don't make sense
# because autocommit is enabled. The only exception is inside atomic # because autocommit is enabled. The only exception is inside 'atomic'
# blocks. To work around that bug, on SQLite, atomic starts a # blocks. To work around that bug, on SQLite, 'atomic' starts a
# transaction explicitly rather than simply disable autocommit. # transaction explicitly rather than simply disable autocommit.
return self.in_atomic_block return self.features.uses_savepoints and self.in_atomic_block
def _set_autocommit(self, autocommit): def _set_autocommit(self, autocommit):
if autocommit: if autocommit: