test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Avoided transactional truncates on amateur databases. 

Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308.

Backport of 6877a9d4 from master
This commit is contained in:
Aymeric Augustin 2014-03-22 14:36:01 +01:00 committed by Tim Graham
parent 2a97db33a7
commit 0ac986fd8c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/core/management/commands/flush.py
View File

@ -27,8 +27,8 @@ class Command(NoArgsCommand):
'fixture reloaded. Does not achieve a "fresh install" state.')
def handle_noargs(self, **options):
db = options.get('database')
connection = connections[db]
database = options.get('database')
connection = connections[database]
verbosity = int(options.get('verbosity'))
interactive = options.get('interactive')
# The following are stealth options used by Django's internals.
@ -62,7 +62,8 @@ Are you sure you want to do this?
if confirm == 'yes':
try:
with transaction.atomic(using=db):
with transaction.atomic(using=database,
savepoint=connection.features.can_rollback_ddl):
with connection.cursor() as cursor:
for sql in sql_list:
cursor.execute(sql)
@ -77,7 +78,7 @@ Are you sure you want to do this?
six.reraise(CommandError, CommandError(new_msg), sys.exc_info()[2])
if not inhibit_post_migrate:
self.emit_post_migrate(verbosity, interactive, db)
self.emit_post_migrate(verbosity, interactive, database)
# Reinstall the initial_data fixture.
if options.get('load_initial_data'):