innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.7.x] Wrapped migrations in a transaction only on DBs with transactional DDL. 

Backport of e74d2183 from master
This commit is contained in:
Aymeric Augustin 2014-04-23 21:34:57 +02:00
parent 0424c84d54
commit 9bf890f6f9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/backends/schema.py
View File

@ -71,14 +71,16 @@ class BaseDatabaseSchemaEditor(object):
def __enter__(self): def __enter__(self):
self.deferred_sql = [] self.deferred_sql = []
atomic(self.connection.alias, self.connection.features.can_rollback_ddl).__enter__() if self.connection.features.can_rollback_ddl:
atomic(self.connection.alias).__enter__()
return self return self
def __exit__(self, exc_type, exc_value, traceback): def __exit__(self, exc_type, exc_value, traceback):
if exc_type is None: if exc_type is None:
for sql in self.deferred_sql: for sql in self.deferred_sql:
self.execute(sql) self.execute(sql)
atomic(self.connection.alias, self.connection.features.can_rollback_ddl).__exit__(exc_type, exc_value, traceback) if self.connection.features.can_rollback_ddl:
atomic(self.connection.alias).__exit__(exc_type, exc_value, traceback)
# Core utility functions # Core utility functions