Ticket #20666: 20666.patch

new file tests/fixtures_regress/fixtures/circular-fk.json

@@ +1 @@
+[
+    {
+        "model": "fixtures_regress.order",
+        "pk": 1,
+        "fields": {
+            "bill_address": 1
+        }
+    },
+    {
+        "model": "fixtures_regress.orderaddress",
+        "pk": 1,
+        "fields": {
+            "order": 1
+        }
+    }
+]

tests/fixtures_regress/models.py

@@ -235 +235 @@
 # Model for regression test of #11101
 class Thingy(models.Model):
     name = models.CharField(max_length=255)
+
+
+class Order(models.Model):
+    bill_address = models.OneToOneField(
+        'fixtures_regress.OrderAddress',
+        null=True,
+        on_delete=models.SET_NULL,
+        related_name='bill_address_order',
+        verbose_name=u'bill to address'
+    )
+
+class OrderAddress(models.Model):
+    order = models.ForeignKey('fixtures_regress.Order', verbose_name=u'order')

tests/fixtures_regress/tests.py

@@ -26 +26 @@
     ExternalDependency, Thingy)
 
 
-class TestFixtures(TestCase):
+class FixtureTests(TestCase):
 
     def animal_pre_save_check(self, signal, sender, instance, **kwargs):
         self.pre_save_checks.append(
@@ -683 +683 @@
         )
 
 
-class TestTicket11101(TransactionTestCase):
+class TransactionFixtureTests(TransactionTestCase):
 
     available_apps = [
         'fixtures_regress',
@@ -691 +691 @@
         'django.contrib.contenttypes',
     ]
 
-    def ticket_11101(self):
-        management.call_command(
-            'loaddata',
-            'thingy.json',
-            verbosity=0,
-            commit=False
-        )
-        self.assertEqual(Thingy.objects.count(), 1)
-        transaction.rollback()
-        self.assertEqual(Thingy.objects.count(), 0)
-        transaction.commit()
-
     @skipUnlessDBFeature('supports_transactions')
     def test_ticket_11101(self):
         """Test that fixtures can be rolled back (ticket #11101)."""
         transaction.set_autocommit(False)
         try:
-            self.ticket_11101()
+            management.call_command(
+                'loaddata',
+                'thingy.json',
+                verbosity=0,
+                commit=False
+            )
+            self.assertEqual(Thingy.objects.count(), 1)
+            transaction.rollback()
+            self.assertEqual(Thingy.objects.count(), 0)
+            transaction.commit()
         finally:
             transaction.set_autocommit(True)
+
+    def test_circular_relation(self):
+        """Test that fixtures may contain circular relations (#20666)."""
+        management.call_command(
+            'loaddata',
+            'circular-fk.json',
+            verbosity=0
+        )