diff options
| author | Tim Graham <timograham@gmail.com> | 2016-08-18 18:17:01 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-08-23 20:48:29 -0400 |
| commit | 46f604244aee6da9f67f886353a83a0f55b33e99 (patch) | |
| tree | 3ac39b7a0755136468865c8db639d11da503b4eb | |
| parent | 6be255a22a32a58a96b8d1c67485e92b49817b9f (diff) | |
[1.10.x] Fixed #27089 -- Added database alias to InconsistentMigrationHistory message.
Backport of ad25fe73506d80ffcaac135ad0a8d09552b70d70 from master
| -rw-r--r-- | django/db/migrations/loader.py | 4 | ||||
| -rw-r--r-- | docs/releases/1.10.1.txt | 3 | ||||
| -rw-r--r-- | tests/migrations/test_loader.py | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py index e5a7f031f9..262378d1dc 100644 --- a/django/db/migrations/loader.py +++ b/django/db/migrations/loader.py @@ -292,8 +292,10 @@ class MigrationLoader(object): if all(m in applied for m in self.replacements[parent].replaces): continue raise InconsistentMigrationHistory( - "Migration {}.{} is applied before its dependency {}.{}".format( + "Migration {}.{} is applied before its dependency " + "{}.{} on database '{}'.".format( migration[0], migration[1], parent[0], parent[1], + connection.alias, ) ) diff --git a/docs/releases/1.10.1.txt b/docs/releases/1.10.1.txt index 88edfa80cf..3e73483e37 100644 --- a/docs/releases/1.10.1.txt +++ b/docs/releases/1.10.1.txt @@ -65,3 +65,6 @@ Bugfixes * Reverted a few admin checks that checked ``field.many_to_many`` back to ``isinstance(field, models.ManyToManyField)`` since it turned out the checks weren't suitable to be generalized like that (:ticket:`26998`). + +* Added the database alias to the ``InconsistentMigrationHistory`` message + raised by ``makemigrations`` and ``migrate`` (:ticket:`27089`). diff --git a/tests/migrations/test_loader.py b/tests/migrations/test_loader.py index b46f35f7ed..b8c2cd8142 100644 --- a/tests/migrations/test_loader.py +++ b/tests/migrations/test_loader.py @@ -378,7 +378,10 @@ class LoaderTests(TestCase): loader.check_consistent_history(connection) recorder = MigrationRecorder(connection) recorder.record_applied('migrations', '0002_second') - msg = "Migration migrations.0002_second is applied before its dependency migrations.0001_initial" + msg = ( + "Migration migrations.0002_second is applied before its dependency " + "migrations.0001_initial on database 'default'." + ) with self.assertRaisesMessage(InconsistentMigrationHistory, msg): loader.check_consistent_history(connection) |