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

[1.8.x] Fixed #25618 -- Added a helpful error message when Django & south migrations exist in the same directory.

This commit is contained in:
Tim Graham 2015-10-27 14:20:06 -04:00
parent 69e6045ceb
commit 65bff161ff
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,12 @@ class MigrationLoader(object):
break break
self.disk_migrations[app_config.label, migration_name] = migration_module.Migration(migration_name, app_config.label) self.disk_migrations[app_config.label, migration_name] = migration_module.Migration(migration_name, app_config.label)
if south_style_migrations: if south_style_migrations:
if app_config.label in self.migrated_apps:
raise BadMigrationError(
"Migrated app %r contains South migrations. Make sure "
"all numbered South migrations are deleted prior to "
"creating Django migrations." % app_config.label
)
self.unmigrated_apps.add(app_config.label) self.unmigrated_apps.add(app_config.label)
def get_migration(self, app_label, name_prefix): def get_migration(self, app_label, name_prefix):

3
docs/releases/1.8.6.txt
View File

@ -41,3 +41,6 @@ Bugfixes
* Fixed crash with ``contrib.postgres.forms.SplitArrayField`` and * Fixed crash with ``contrib.postgres.forms.SplitArrayField`` and
``IntegerField`` on invalid value (:ticket:`25597`). ``IntegerField`` on invalid value (:ticket:`25597`).
* Added a helpful error message when Django and South migrations exist in the
same directory (:ticket:`25618`).