Commit a1ddfe44 authored by Loic Bistuer's avatar Loic Bistuer
Browse files

[1.7.x] Fixed #22906 -- Added a more helpful repr to migrations' ModelState. 

Thanks Collin Anderson for the report and original patch.

Backport of 2572c07c from master
parent 8fbd9b0b

django/db/migrations/state.py

+3 −0
Original line number Diff line number Diff line
@@ -300,6 +300,9 @@ class ModelState(object): 
                return field

        raise ValueError("No field called %s on model %s" % (name, self.name))



    def __repr__(self):

        return "<ModelState: '%s.%s'>" % (self.app_label, self.name)



    def __eq__(self, other):

        return (

            (self.app_label == other.app_label) and

tests/migrations/test_state.py

+10 −0
Original line number Diff line number Diff line
@@ -420,3 +420,13 @@ class ModelStateTests(TestCase): 
        state = ModelState('app', 'Model', [('name', field)])

        Model = state.render(apps)

        self.assertNotEqual(Model._meta.get_field('name'), field)



    def test_repr(self):

        field = models.CharField(max_length=1)

        state = ModelState('app', 'Model', [('name', field)], bases=['app.A', 'app.B', 'app.C'])

        self.assertEqual(repr(state), "<ModelState: 'app.Model'>")



        project_state = ProjectState()

        project_state.add_model_state(state)

        with self.assertRaisesMessage(InvalidBasesError, "Cannot resolve bases for [<ModelState: 'app.Model'>]"):

            project_state.render()