From 4c0b4720b0d5b025bc0ce4149eb501b9dde8c03f Mon Sep 17 00:00:00 2001 From: Koen De Wit Date: Thu, 27 Aug 2020 15:07:37 +0200 Subject: [PATCH] Fixed #31954 -- Fixed migration optimization for MTI model creation with parent model with mixed case app label. --- django/db/migrations/operations/utils.py | 3 ++- tests/migrations/test_autodetector.py | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/django/db/migrations/operations/utils.py b/django/db/migrations/operations/utils.py index 6e2bacd549..facfd9fc60 100644 --- a/django/db/migrations/operations/utils.py +++ b/django/db/migrations/operations/utils.py @@ -19,7 +19,8 @@ def resolve_relation(model, app_label=None, model_name=None): ) return app_label, model_name if '.' in model: - return tuple(model.lower().split('.', 1)) + app_label, model_name = model.split('.', 1) + return app_label, model_name.lower() if app_label is None: raise TypeError( 'app_label must be provided to resolve unscoped model ' diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py index 339f742057..d67c73ed1d 100644 --- a/tests/migrations/test_autodetector.py +++ b/tests/migrations/test_autodetector.py @@ -2322,6 +2322,26 @@ class AutodetectorTests(TestCase): self.assertOperationAttributes(changes, 'testapp', 0, 0, name="Author") self.assertOperationAttributes(changes, 'testapp', 0, 1, name="Aardvark") + def test_bases_first_mixed_case_app_label(self): + app_label = 'MiXedCaseApp' + changes = self.get_changes([], [ + ModelState(app_label, 'owner', [ + ('id', models.AutoField(primary_key=True)), + ]), + ModelState(app_label, 'place', [ + ('id', models.AutoField(primary_key=True)), + ('owner', models.ForeignKey('MiXedCaseApp.owner', models.CASCADE)), + ]), + ModelState(app_label, 'restaurant', [], bases=('MiXedCaseApp.place',)), + ]) + self.assertNumberMigrations(changes, app_label, 1) + self.assertOperationTypes(changes, app_label, 0, [ + 'CreateModel', 'CreateModel', 'CreateModel', + ]) + self.assertOperationAttributes(changes, app_label, 0, 0, name='owner') + self.assertOperationAttributes(changes, app_label, 0, 1, name='place') + self.assertOperationAttributes(changes, app_label, 0, 2, name='restaurant') + def test_multiple_bases(self): """#23956 - Inheriting models doesn't move *_ptr fields into AddField operations.""" A = ModelState("app", "A", [("a_id", models.AutoField(primary_key=True))])