Ticket #26149: migration-bug-twotest.patch

django/db/migrations/autodetector.py

@@ -176 +176 @@
         self.generate_removed_fields()
         self.generate_added_fields()
         self.generate_altered_fields()
+        self.generate_altered_order_with_respect_to()
         self.generate_altered_unique_together()
         self.generate_altered_index_together()
         self.generate_altered_db_table()
-        self.generate_altered_order_with_respect_to()
 
         self._sort_migrations()
         self._build_migration_list(graph)
@@ -518 +518 @@
                 if getattr(field.remote_field, "through", None) and not field.remote_field.through._meta.auto_created:
                     related_fields[field.name] = field
             # Are there unique/index_together to defer?
+            order_with_respect_to = model_state.options.pop('order_with_respect_to', None)
             unique_together = model_state.options.pop('unique_together', None)
             index_together = model_state.options.pop('index_together', None)
-            order_with_respect_to = model_state.options.pop('order_with_respect_to', None)
             # Depend on the deletion of any possible proxy version of us
             dependencies = [
                 (app_label, model_name, None, False),
@@ -577 +577 @@
                 for name, field in sorted(related_fields.items())
             ]
             related_dependencies.append((app_label, model_name, None, True))
+            if order_with_respect_to:
+                self.add_operation(
+                    app_label,
+                    operations.AlterOrderWithRespectTo(
+                        name=model_name,
+                        order_with_respect_to=order_with_respect_to,
+                    ),
+                    dependencies=[
+                        (app_label, model_name, order_with_respect_to, True),
+                        (app_label, model_name, None, True),
+                    ]
+                )
             if unique_together:
                 self.add_operation(
                     app_label,
@@ -595 +607 @@
                     ),
                     dependencies=related_dependencies
                 )
-            if order_with_respect_to:
-                self.add_operation(
-                    app_label,
-                    operations.AlterOrderWithRespectTo(
-                        name=model_name,
-                        order_with_respect_to=order_with_respect_to,
-                    ),
-                    dependencies=[
-                        (app_label, model_name, order_with_respect_to, True),
-                        (app_label, model_name, None, True),
-                    ]
-                )
 
     def generate_created_proxies(self):
         """

tests/migrations/test_autodetector.py

@@ -195 +195 @@
         ("name", models.CharField(max_length=200)),
         ("book", models.ForeignKey("otherapp.Book", models.CASCADE)),
     ], options={"order_with_respect_to": "book"})
+    author_with_book_order_wrt_together = ModelState("testapp", "Author", [
+        ("id", models.AutoField(primary_key=True)),
+        ("name", models.CharField(max_length=200)),
+        ("book", models.ForeignKey("otherapp.Book", models.CASCADE)),
+    ], options={"order_with_respect_to": "book",
+        "unique_together": {("book", "_order")},
+    })
     author_renamed_with_book = ModelState("testapp", "Writer", [
         ("id", models.AutoField(primary_key=True)),
         ("name", models.CharField(max_length=200)),
@@ -1818 +1825 @@
         self.assertOperationAttributes(changes, 'testapp', 0, 1, name="author", order_with_respect_to="book")
         self.assertNotIn("_order", [name for name, field in changes['testapp'][0].operations[0].fields])
 
+    def test_create_add_order_with_respect_to_unique_together(self):
+        """
+        Tests that setting create a model and order_with_respect_to option set
+        along with a unique_together which involves the implicit _order
+        field created by order_with_respect_to.
+        """
+        # Make state
+        before = self.make_project_state([])
+        after = self.make_project_state([
+            self.book,
+            self.author_with_book_order_wrt_together
+        ])
+        autodetector = MigrationAutodetector(before, after)
+        changes = autodetector._detect_changes()
+        # Right number/type of migrations?
+        self.assertNumberMigrations(changes, 'testapp', 1)
+        self.assertOperationTypes(changes, 'testapp', 0, [
+            "CreateModel",
+            "AlterOrderWithRespectTo",
+            "AlterUniqueTogether"
+        ])
+        self.assertOperationAttributes(
+            changes, 'testapp', 0, 1, name="author",
+            order_with_respect_to="book"
+        )
+        self.assertOperationAttributes(
+            changes, 'testapp', 0, 2, name="author",
+            unique_together={("book", "_order")}
+        )
+
+    def test_add_order_with_respect_to_and_unique_together(self):
+        """
+        Tests that setting order_with_respect_to option set along
+        with a unique_together which involves the implicit _order
+        field created by order_with_respect_to
+        """
+        # Make state
+        before = self.make_project_state([
+            self.book, 
+            self.author_with_book
+        ])
+        after = self.make_project_state([
+            self.book,
+            self.author_with_book_order_wrt_together
+        ])
+        autodetector = MigrationAutodetector(before, after)
+        changes = autodetector._detect_changes()
+        # Right number/type of migrations?
+        self.assertNumberMigrations(changes, 'testapp', 1)
+        self.assertOperationTypes(changes, 'testapp', 0, [
+            "AlterOrderWithRespectTo",
+            "AlterUniqueTogether"
+        ])
+        self.assertOperationAttributes(
+            changes, 'testapp', 0, 0, name="author",
+            order_with_respect_to="book"
+        )
+        self.assertOperationAttributes(
+            changes, 'testapp', 0, 1, name="author",
+            unique_together={("book", "_order")}
+        )
+
     def test_alter_model_managers(self):
         """
         Tests that changing the model managers adds a new operation.