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

Better error reporting when from_app_cache fails

parent 4ca39684

django/db/migrations/state.py

+16 −2
Original line number Diff line number Diff line
@@ -99,11 +99,25 @@ class ModelState(object): 
        for field in model._meta.local_fields:

            name, path, args, kwargs = field.deconstruct()

            field_class = import_by_path(path)

            try:

                fields.append((name, field_class(*args, **kwargs)))

            except TypeError as e:

                raise TypeError("Couldn't reconstruct field %s on %s: %s" % (

                    name,

                    model._meta.object_name,

                    e,

                ))

        for field in model._meta.local_many_to_many:

            name, path, args, kwargs = field.deconstruct()

            field_class = import_by_path(path)

            try:

                fields.append((name, field_class(*args, **kwargs)))

            except TypeError as e:

                raise TypeError("Couldn't reconstruct m2m field %s on %s: %s" % (

                    name,

                    model._meta.object_name,

                    e,

                ))

        # Extract the options

        options = {}

        for name in DEFAULT_NAMES: