From dd1ea70779adff294140eddb0229c382e12f32f3 Mon Sep 17 00:00:00 2001 From: Tony Zhu Date: Fri, 24 Oct 2014 15:29:59 -0400 Subject: Fixed #23699 -- Prevented flush from loading initial data for apps with migrations. --- django/core/management/commands/flush.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'django') diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py index 02f558b31d..53e5e389f0 100644 --- a/django/core/management/commands/flush.py +++ b/django/core/management/commands/flush.py @@ -85,9 +85,13 @@ Are you sure you want to do this? # Reinstall the initial_data fixture. if options.get('load_initial_data'): - # Reinstall the initial_data fixture. - call_command('loaddata', 'initial_data', **options) - + # Reinstall the initial_data fixture for apps without migrations. + from django.db.migrations.executor import MigrationExecutor + executor = MigrationExecutor(connection) + app_options = options.copy() + for app_label in executor.loader.unmigrated_apps: + app_options['app_label'] = app_label + call_command('loaddata', 'initial_data', **app_options) else: self.stdout.write("Flush cancelled.\n") -- cgit v1.3