Commit 3dbbb8a8 authored by Andriy Sokolovskiy's avatar Andriy Sokolovskiy Committed by Tim Graham
Browse files

Fixed #23983 -- Fixed a crash in migrations when adding order_with_respect_to to non-empty table.

parent ca013e65

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ answer newbie questions, and generally made Django that much better: 
    Andrew Godwin <andrew@aeracode.org>

    Andrew Pinkham <http://AndrewsForge.com>

    Andrews Medina <andrewsmedina@gmail.com>

    Andriy Sokolovskiy <sokandpal@yandex.ru>

    Andy Dustman <farcepest@gmail.com>

    Andy Gayton <andy-django@thecablelounge.com>

    andy@jadedplanet.net

django/db/migrations/operations/models.py

+2 −0
Original line number Diff line number Diff line
@@ -404,6 +404,8 @@ class AlterOrderWithRespectTo(Operation): 
            # it's likely a rename)

            elif to_model._meta.order_with_respect_to and not from_model._meta.order_with_respect_to:

                field = to_model._meta.get_field_by_name("_order")[0]

                if not field.has_default():

                    field.default = 0

                schema_editor.add_field(

                    from_model,

                    field,

docs/releases/1.7.2.txt

+3 −0
Original line number Diff line number Diff line
@@ -143,3 +143,6 @@ Bugfixes 


* ``makemigrations`` no longer prompts for a default value when adding

  ``TextField()`` or ``CharField()`` without a ``default`` (:ticket:`23405`).



* Fixed migration crash when adding ``order_with_respect_to`` to a table

  with existing rows (:ticket:`23983`).

tests/migrations/test_operations.py

+9 −0
Original line number Diff line number Diff line
@@ -1237,10 +1237,19 @@ class OperationTests(OperationTestBase): 
        self.assertEqual(new_state.models["test_alorwrtto", "rider"].options.get("order_with_respect_to", None), "pony")

        # Make sure there's no matching index

        self.assertColumnNotExists("test_alorwrtto_rider", "_order")

        # Create some rows before alteration

        rendered_state = project_state.render()

        pony = rendered_state.get_model("test_alorwrtto", "Pony").objects.create(weight=50)

        rendered_state.get_model("test_alorwrtto", "Rider").objects.create(pony=pony, friend_id=1)

        rendered_state.get_model("test_alorwrtto", "Rider").objects.create(pony=pony, friend_id=2)

        # Test the database alteration

        with connection.schema_editor() as editor:

            operation.database_forwards("test_alorwrtto", editor, project_state, new_state)

        self.assertColumnExists("test_alorwrtto_rider", "_order")

        # Check for correct value in rows

        updated_riders = new_state.render().get_model("test_alorwrtto", "Rider").objects.all()

        self.assertEqual(updated_riders[0]._order, 0)

        self.assertEqual(updated_riders[1]._order, 0)

        # And test reversal

        with connection.schema_editor() as editor:

            operation.database_backwards("test_alorwrtto", editor, new_state, project_state)