Commit 6d5238f6 authored by Huu Nguyen's avatar Huu Nguyen Committed by Tim Graham
Browse files

[1.7.x] Fixed #22791 -- Invoke interactive questioner only for conflicts in specified apps. 

Thanks bendavis78 for the report and Tim Graham for the review.

Backport of f7a78f9b from master
parent 4b53bfff

django/core/management/commands/makemigrations.py

+9 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ from django.db.migrations.autodetector import MigrationAutodetector 
from django.db.migrations.questioner import MigrationQuestioner, InteractiveMigrationQuestioner

from django.db.migrations.state import ProjectState

from django.db.migrations.writer import MigrationWriter

from django.utils.six import iteritems

from django.utils.six.moves import reduce
@@ -58,6 +59,14 @@ class Command(BaseCommand): 
        # Before anything else, see if there's conflicting apps and drop out

        # hard if there are any and they don't want to merge

        conflicts = loader.detect_conflicts()



        # If app_labels is specified, filter out conflicting migrations for unspecified apps

        if app_labels:

            conflicts = dict(

                (app_label, conflict) for app_label, conflict in iteritems(conflicts)

                if app_label in app_labels

            )



        if conflicts and not self.merge:

            name_str = "; ".join(

                "%s in %s" % (", ".join(names), app)

tests/migrations/migrations_test_apps/unspecified_app_with_conflict/__init__.py

0 → 100644
+0 −0

Empty file added.

tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0001_initial.py

0 → 100644
+30 −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(

            "Author",

            [

                ("id", models.AutoField(primary_key=True)),

                ("name", models.CharField(max_length=255)),

                ("slug", models.SlugField(null=True)),

                ("age", models.IntegerField(default=0)),

                ("silly_field", models.BooleanField(default=False)),

            ],

        ),



        migrations.CreateModel(

            "Tribble",

            [

                ("id", models.AutoField(primary_key=True)),

                ("fluffy", models.BooleanField(default=True)),

            ],

        )



    ]

tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_conflicting_second.py

0 → 100644
+20 −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):



    dependencies = [("unspecified_app_with_conflict", "0001_initial")]



    operations = [



        migrations.CreateModel(

            "Something",

            [

                ("id", models.AutoField(primary_key=True)),

            ],

        )



    ]

tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_second.py

0 → 100644
+26 −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):



    dependencies = [("unspecified_app_with_conflict", "0001_initial")]



    operations = [



        migrations.DeleteModel("Tribble"),



        migrations.RemoveField("Author", "silly_field"),



        migrations.AddField("Author", "rating", models.IntegerField(default=0)),



        migrations.CreateModel(

            "Book",

            [

                ("id", models.AutoField(primary_key=True)),

            ],

        )



    ]