Commit 58411041 authored by Loic Bistuer's avatar Loic Bistuer Committed by Tim Graham
Browse files

Fixed #21283 -- Added support for migrations if models is a package. 

Thanks Markus Holtermann for the report.
parent 96d1d4e2

django/db/migrations/loader.py

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ class MigrationLoader(object): 
    def migrations_module(cls, app_label):

        if app_label in settings.MIGRATION_MODULES:

            return settings.MIGRATION_MODULES[app_label]

        app = cache.get_app(app_label)

        return ".".join(app.__name__.split(".")[:-1] + ["migrations"])

        else:

            return '%s.migrations' % cache.get_app_package(app_label)



    def load_disk(self):

        """

django/db/migrations/writer.py

+10 −8
Original line number Diff line number Diff line
@@ -61,20 +61,22 @@ class MigrationWriter(object): 


    @property

    def path(self):

        migrations_module_name = MigrationLoader.migrations_module(self.migration.app_label)

        app_module = cache.get_app(self.migration.app_label)

        migrations_package_name = MigrationLoader.migrations_module(self.migration.app_label)

        # See if we can import the migrations module directly

        try:

            migrations_module = import_module(migrations_module_name)

            migrations_module = import_module(migrations_package_name)

            basedir = os.path.dirname(migrations_module.__file__)

        except ImportError:

            app = cache.get_app(self.migration.app_label)

            app_path = cache._get_app_path(app)

            app_package_name = cache._get_app_package(app)

            migrations_package_basename = migrations_package_name.split(".")[-1]



            # Alright, see if it's a direct submodule of the app

            oneup = ".".join(migrations_module_name.split(".")[:-1])

            app_oneup = ".".join(app_module.__name__.split(".")[:-1])

            if oneup == app_oneup:

                basedir = os.path.join(os.path.dirname(app_module.__file__), migrations_module_name.split(".")[-1])

            if '%s.%s' % (app_package_name, migrations_package_basename) == migrations_package_name:

                basedir = os.path.join(app_path, migrations_package_basename)

            else:

                raise ImportError("Cannot open migrations module %s for app %s" % (migrations_module_name, self.migration.app_label))

                raise ImportError("Cannot open migrations module %s for app %s" % (migrations_package_name, self.migration.app_label))

        return os.path.join(basedir, self.filename)



    @classmethod

django/db/models/loading.py

+7 −0
Original line number Diff line number Diff line
@@ -185,6 +185,12 @@ class BaseAppCache(object): 


        return [elt[0] for elt in apps]



    def _get_app_package(self, app):

        return '.'.join(app.__name__.split('.')[:-1])



    def get_app_package(self, app_label):

        return self._get_app_package(self.get_app(app_label))



    def _get_app_path(self, app):

        if hasattr(app, '__path__'):        # models/__init__.py package

            app_path = app.__path__[0]
@@ -380,6 +386,7 @@ cache = AppCache() 
# These methods were always module level, so are kept that way for backwards

# compatibility.

get_apps = cache.get_apps

get_app_package = cache.get_app_package

get_app_path = cache.get_app_path

get_app_paths = cache.get_app_paths

get_app = cache.get_app

tests/migrations/migrations_test_apps/__init__.py

0 → 100644
+0 −0

Empty file added.

tests/migrations/migrations_test_apps/normal/__init__.py

0 → 100644
+0 −0

Empty file added.