Commit f25a385a authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Makemigration command now works

parent ab5cbae9

django/core/management/commands/makemigration.py

+29 −1
Original line number Diff line number Diff line 
import sys

import os

from optparse import make_option



from django.core.management.base import BaseCommand
@@ -8,6 +9,7 @@ from django.db import connections 
from django.db.migrations.loader import MigrationLoader

from django.db.migrations.autodetector import MigrationAutodetector, InteractiveMigrationQuestioner

from django.db.migrations.state import ProjectState

from django.db.migrations.writer import MigrationWriter

from django.db.models.loading import cache
@@ -49,4 +51,30 @@ class Command(BaseCommand): 
        if app_labels:

            changes = autodetector.trim_to_apps(changes, app_labels)



        print changes
 
        # No changes? Tell them.

        if not changes:

            if len(app_labels) == 1:

                self.stdout.write("No changes detected in app '%s'" % app_labels.pop())

            elif len(app_labels) > 1:

                self.stdout.write("No changes detected in apps '%s'" % ("', '".join(app_labels)))

            else:

                self.stdout.write("No changes detected")

            return



        for app_label, migrations in changes.items():

            self.stdout.write(self.style.MIGRATE_HEADING("Migrations for '%s':" % app_label) + "\n")

            for migration in migrations:

                # Describe the migration

                writer = MigrationWriter(migration)

                self.stdout.write("  %s:\n" % (self.style.MIGRATE_LABEL(writer.filename),))

                for operation in migration.operations:

                    self.stdout.write("    - %s\n" % operation.describe())

                # Write it

                migrations_directory = os.path.dirname(writer.path)

                if not os.path.isdir(migrations_directory):

                    os.mkdir(migrations_directory)

                init_path = os.path.join(migrations_directory, "__init__.py")

                if not os.path.isfile(init_path):

                    open(init_path, "w").close()

                with open(writer.path, "w") as fh:

                    fh.write(writer.as_string())

django/db/migrations/autodetector.py

+4 −4
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ class MigrationAutodetector(object): 
            self.add_to_migration(

                app_label,

                operations.CreateModel(

                    model_state.name,

                    model_state.fields,

                    model_state.options,

                    model_state.bases,

                    name = model_state.name,

                    fields = model_state.fields,

                    options = model_state.options,

                    bases = model_state.bases,

                )

            )

        # Removing models

django/db/migrations/loader.py

+3 −2
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ class MigrationLoader(object): 
        self.disk_migrations = None

        self.applied_migrations = None



    def migration_module(self, app_label):

    @classmethod

    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)
@@ -52,7 +53,7 @@ class MigrationLoader(object): 
        for app in cache.get_apps():

            # Get the migrations module directory

            app_label = app.__name__.split(".")[-2]

            module_name = self.migration_module(app_label)

            module_name = self.migrations_module(app_label)

            try:

                module = import_module(module_name)

            except ImportError as e:

django/db/migrations/operations/base.py

+6 −0
Original line number Diff line number Diff line
@@ -54,3 +54,9 @@ class Operation(object): 
        drop the model's table.

        """

        raise NotImplementedError()



    def describe(self):

        """

        Outputs a brief summary of what the action does.

        """

        return "%s: %s" % (self.__class__.__name__, self._constructor_args)

django/db/migrations/operations/fields.py

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ class AddField(Operation): 
        from_model = from_state.render().get_model(app_label, self.model_name)

        schema_editor.remove_field(from_model, from_model._meta.get_field_by_name(self.name)[0])



    def describe(self):

        return "Add field %s to %s" % (self.name, self.model_name)





class RemoveField(Operation):

    """
@@ -48,3 +51,6 @@ class RemoveField(Operation): 
        from_model = from_state.render().get_model(app_label, self.model_name)

        to_model = to_state.render().get_model(app_label, self.model_name)

        schema_editor.add_field(from_model, to_model._meta.get_field_by_name(self.name)[0])



    def describe(self):

        return "Remove field %s from %s" % (self.name, self.model_name)