Commit 5cc8180a authored by Tim Graham's avatar Tim Graham
Browse files

[1.7.x] Fixed #23699 -- Prevented flush from loading initial data for apps with migrations.

Backport of dd1ea707 from master.
parent e317d7fc
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -84,9 +84,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")

+3 −0
Original line number Diff line number Diff line
@@ -18,3 +18,6 @@ Bugfixes
* Warn for duplicate models when a module is reloaded. Previously a
RuntimeError was raised every time two models clashed in the app registry.
(:ticket:`23621`).

* Prevented :djadmin:`flush` from loading initial data for migrated apps
  (:ticket:`23699`).
+0 −0

Empty file added.

+9 −0
Original line number Diff line number Diff line
[
    {
        "pk": "10",
        "model": "fixtures_migration.book",
        "fields": {
            "name": "Achieving self-awareness of Python programs"
        }
    }
]
+16 −0
Original line number Diff line number Diff line
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

    operations = [
        migrations.CreateModel(
            "Book",
            [
                ("name", models.CharField(max_length=100)),
            ],
        ),
    ]
Loading