mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Fixed #25308 -- Made MigrationQuestioner respect MIGRATION_MODULES setting.

This commit is contained in:
Jeremy Satterfield 2015-08-20 12:45:30 -05:00 committed by Tim Graham
parent 91ec1841f5
commit 1175027641
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/migrations/questioner.py
View File

@ -9,7 +9,7 @@ from django.db.models.fields import NOT_PROVIDED
from django.utils import datetime_safe, six, timezone
from django.utils.six.moves import input
from .loader import MIGRATIONS_MODULE_NAME
from .loader import MigrationLoader
class MigrationQuestioner(object):
@ -37,7 +37,7 @@ class MigrationQuestioner(object):
app_config = apps.get_app_config(app_label)
except LookupError: # It's a fake app.
return self.defaults.get("ask_initial", False)
migrations_import_path = "%s.%s" % (app_config.name, MIGRATIONS_MODULE_NAME)
migrations_import_path = MigrationLoader.migrations_module(app_config.label)
try:
migrations_module = importlib.import_module(migrations_import_path)
except ImportError:

10
tests/migrations/test_commands.py
View File

@ -610,6 +610,16 @@ class MakeMigrationsTests(MigrationTestBase):
call_command("makemigrations", "migrations", stdout=out)
self.assertIn("No changes detected in app 'migrations'", out.getvalue())
def test_makemigrations_no_apps_initial(self):
"""
makemigrations should detect initial is needed on empty migration
modules if no app provided.
"""
out = six.StringIO()
with self.temporary_migration_module(module="migrations.test_migrations_empty"):
call_command("makemigrations", stdout=out)
self.assertIn("0001_initial.py", out.getvalue())
def test_makemigrations_migrations_announce(self):
"""
Makes sure that makemigrations announces the migration at the default verbosity level.