Ticket #15926: 15926.patch

django/core/management/commands/flush.py

@@ -16 +16 @@
         make_option('--database', action='store', dest='database',
             default=DEFAULT_DB_ALIAS, help='Nominates a database to flush. '
                 'Defaults to the "default" database.'),
+        make_option('--no-initial-data', action='store_false', dest='load_initial_data', default=True,
+                            help='Tells Django not to load any initial data after database synchronization.'),
     )
     help = ('Returns the database to the state it was in immediately after '
            'syncdb was executed. This means that all data will be removed '
@@ -79 +81 @@
             # Reinstall the initial_data fixture.
             kwargs = options.copy()
             kwargs['database'] = db
-            call_command('loaddata', 'initial_data', **kwargs)
+            if options.get('load_initial_data', True):
+            # Reinstall the initial_data fixture.
+                from django.core.management import call_command
+                call_command('loaddata', 'initial_data', **options)
 
         else:
             self.stdout.write("Flush cancelled.\n")

django/core/management/commands/syncdb.py

@@ -14 +14 @@
     option_list = NoArgsCommand.option_list + (
         make_option('--noinput', action='store_false', dest='interactive', default=True,
             help='Tells Django to NOT prompt the user for input of any kind.'),
+        make_option('--no-initial-data', action='store_false', dest='load_initial_data', default=True,
+            help='Tells Django not to load any initial data after database synchronization.'),
         make_option('--database', action='store', dest='database',
             default=DEFAULT_DB_ALIAS, help='Nominates a database to synchronize. '
                 'Defaults to the "default" database.'),
@@ -25 +27 @@
         verbosity = int(options.get('verbosity'))
         interactive = options.get('interactive')
         show_traceback = options.get('traceback')
-
-        # Stealth option -- 'load_initial_data' is used by the testing setup
-        # process to disable initial fixture loading.
         load_initial_data = options.get('load_initial_data', True)
 
         self.style = no_style()

docs/ref/django-admin.txt

@@ -245 +245 @@
 The :djadminopt:`--database` option may be used to specify the database
 to flush.
 
+--no-initial-data
+~~~~~~~~~~~~~~~~~
+
+** New in Django development version **
+Use ``--no-initial-data`` to avoid loading the initial_data fixture.
+
 inspectdb
 ---------
 
@@ -1024 +1030 @@
 The :djadminopt:`--database` option can be used to specify the database to
 synchronize.
 
+--no-initial-data
+~~~~~~~~~~~~~~~~~
+
+** New in Django development version **
+Use ``--no-initial-data`` to avoid loading the initial_data fixture.
+
 test <app or test identifier>
 -----------------------------