mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Fixed #24848 -- Fixed ValueError for faulty migrations module.

Browse Source 
Added apps to unmigrated apps if the migrations module is a file
or a folder missing __init__.py.

Thanks to Ernest0x for the bug report.

Backport of d73176a842 from master
This commit is contained in:
Marten Kenbeek
2015-05-24 21:17:39 +02:00
committed by Tim Graham
parent 122e688a9c
commit 1ac4c7d415
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/loader.py
View File

@@ -77,9 +77,11 @@ class MigrationLoader(object):
else: else:
# PY3 will happily import empty dirs as namespaces. # PY3 will happily import empty dirs as namespaces.
if not hasattr(module, '__file__'): if not hasattr(module, '__file__'):
self.unmigrated_apps.add(app_config.label)
continue continue
# Module is not a package (e.g. migrations.py). # Module is not a package (e.g. migrations.py).
if not hasattr(module, '__path__'): if not hasattr(module, '__path__'):
self.unmigrated_apps.add(app_config.label)
continue continue
# Force a reload if it's already loaded (tests need this) # Force a reload if it's already loaded (tests need this)
if was_loaded: if was_loaded:

3
docs/releases/1.8.3.txt
View File

@@ -11,3 +11,6 @@ Bugfixes
* Fixed ``BaseRangeField.prepare_value()`` to use each ``base_field``’s * Fixed ``BaseRangeField.prepare_value()`` to use each ``base_field``’s
``prepare_value()`` method (:ticket:`24841`). ``prepare_value()`` method (:ticket:`24841`).
* Fixed crash during :djadmin:`makemigrations` if a migrations module either
is missing ``__init__.py`` or is a file (:ticket:`24848`).

12
tests/migrations/test_loader.py
View File

@@ -164,12 +164,20 @@ class LoaderTests(TestCase):
def test_load_module_file(self): def test_load_module_file(self):
with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.file"}): with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.file"}):
MigrationLoader(connection) loader = MigrationLoader(connection)
self.assertIn(
"migrations", loader.unmigrated_apps,
"App with migrations module file not in unmigrated apps."
)
@skipIf(six.PY2, "PY2 doesn't load empty dirs.") @skipIf(six.PY2, "PY2 doesn't load empty dirs.")
def test_load_empty_dir(self): def test_load_empty_dir(self):
with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.namespace"}): with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.namespace"}):
MigrationLoader(connection) loader = MigrationLoader(connection)
self.assertIn(
"migrations", loader.unmigrated_apps,
"App missing __init__.py in migrations module not in unmigrated apps."
)
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"}) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"})
def test_loading_squashed(self): def test_loading_squashed(self):