update the dosc with split of queries, fix tests

tests/test_forward_cross_refs.py

@@ -60,55 +60,57 @@ def create_test_database():
 
 @pytest.mark.asyncio
 async def test_double_relations():
-    t1 = await Teacher.objects.create(name="Mr. Jones")
-    t2 = await Teacher.objects.create(name="Ms. Smith")
-    t3 = await Teacher.objects.create(name="Mr. Quibble")
+    async with db:
+        async with db.transaction(force_rollback=True):
+            t1 = await Teacher.objects.create(name="Mr. Jones")
+            t2 = await Teacher.objects.create(name="Ms. Smith")
+            t3 = await Teacher.objects.create(name="Mr. Quibble")
 
-    s1 = await Student.objects.create(name="Joe", primary_teacher=t1)
-    s2 = await Student.objects.create(name="Sam", primary_teacher=t1)
-    s3 = await Student.objects.create(name="Kate", primary_teacher=t2)
-    s4 = await Student.objects.create(name="Zoe", primary_teacher=t2)
-    s5 = await Student.objects.create(name="John", primary_teacher=t3)
-    s6 = await Student.objects.create(name="Anna", primary_teacher=t3)
+            s1 = await Student.objects.create(name="Joe", primary_teacher=t1)
+            s2 = await Student.objects.create(name="Sam", primary_teacher=t1)
+            s3 = await Student.objects.create(name="Kate", primary_teacher=t2)
+            s4 = await Student.objects.create(name="Zoe", primary_teacher=t2)
+            s5 = await Student.objects.create(name="John", primary_teacher=t3)
+            s6 = await Student.objects.create(name="Anna", primary_teacher=t3)
 
-    for t in [t1, t2, t3]:
-        for s in [s1, s2, s3, s4, s5, s6]:
-            await t.students.add(s)
+            for t in [t1, t2, t3]:
+                for s in [s1, s2, s3, s4, s5, s6]:
+                    await t.students.add(s)
 
-    jones = (
-        await Teacher.objects.select_related(["students", "own_students"])
-        .order_by(["students__name", "own_students__name"])
-        .get(name="Mr. Jones")
-    )
-    assert len(jones.students) == 6
-    assert jones.students[0].name == "Anna"
-    assert jones.students[5].name == "Zoe"
-    assert len(jones.own_students) == 2
-    assert jones.own_students[0].name == "Joe"
-    assert jones.own_students[1].name == "Sam"
+            jones = (
+                await Teacher.objects.select_related(["students", "own_students"])
+                .order_by(["students__name", "own_students__name"])
+                .get(name="Mr. Jones")
+            )
+            assert len(jones.students) == 6
+            assert jones.students[0].name == "Anna"
+            assert jones.students[5].name == "Zoe"
+            assert len(jones.own_students) == 2
+            assert jones.own_students[0].name == "Joe"
+            assert jones.own_students[1].name == "Sam"
 
-    smith = (
-        await Teacher.objects.select_related(["students", "own_students"])
-        .filter(students__name__contains="a")
-        .order_by(["students__name", "own_students__name"])
-        .get(name="Ms. Smith")
-    )
-    assert len(smith.students) == 3
-    assert smith.students[0].name == "Anna"
-    assert smith.students[2].name == "Sam"
-    assert len(smith.own_students) == 2
-    assert smith.own_students[0].name == "Kate"
-    assert smith.own_students[1].name == "Zoe"
+            smith = (
+                await Teacher.objects.select_related(["students", "own_students"])
+                .filter(students__name__contains="a")
+                .order_by(["students__name", "own_students__name"])
+                .get(name="Ms. Smith")
+            )
+            assert len(smith.students) == 3
+            assert smith.students[0].name == "Anna"
+            assert smith.students[2].name == "Sam"
+            assert len(smith.own_students) == 2
+            assert smith.own_students[0].name == "Kate"
+            assert smith.own_students[1].name == "Zoe"
 
-    quibble = (
-        await Teacher.objects.select_related(["students", "own_students"])
-        .filter(students__name__startswith="J")
-        .order_by(["-students__name", "own_students__name"])
-        .get(name="Mr. Quibble")
-    )
-    assert len(quibble.students) == 2
-    assert quibble.students[1].name == "Joe"
-    assert quibble.students[0].name == "John"
-    assert len(quibble.own_students) == 2
-    assert quibble.own_students[1].name == "John"
-    assert quibble.own_students[0].name == "Anna"
+            quibble = (
+                await Teacher.objects.select_related(["students", "own_students"])
+                .filter(students__name__startswith="J")
+                .order_by(["-students__name", "own_students__name"])
+                .get(name="Mr. Quibble")
+            )
+            assert len(quibble.students) == 2
+            assert quibble.students[1].name == "Joe"
+            assert quibble.students[0].name == "John"
+            assert len(quibble.own_students) == 2
+            assert quibble.own_students[1].name == "John"
+            assert quibble.own_students[0].name == "Anna"