change queryset to work with column and table aliases

tests/test_same_table_joins.py

@@ -9,6 +9,15 @@ database = databases.Database(DATABASE_URL, force_rollback=True)
 metadata = sqlalchemy.MetaData()
 
 
+class Department(orm.Model):
+    __tablename__ = "departments"
+    __metadata__ = metadata
+    __database__ = database
+
+    id = orm.Integer(primary_key=True)
+    name = orm.String(length=100)
+
+
 class SchoolClass(orm.Model):
     __tablename__ = "schoolclasses"
     __metadata__ = metadata
@@ -16,6 +25,7 @@ class SchoolClass(orm.Model):
 
     id = orm.Integer(primary_key=True)
     name = orm.String(length=100)
+    department = orm.ForeignKey(Department)
 
 
 class Category(orm.Model):
@@ -60,7 +70,8 @@ def create_test_database():
 @pytest.mark.asyncio
 async def test_model_multiple_instances_of_same_table_in_schema():
     async with database:
-        class1 = await SchoolClass.objects.create(name="Math")
+        department = await Department.objects.create(name='Math Department')
+        class1 = await SchoolClass.objects.create(name="Math", department=department)
         category = await Category.objects.create(name="Foreign")
         category2 = await Category.objects.create(name="Domestic")
         await Student.objects.create(name="Jane", category=category, schoolclass=class1)
@@ -80,7 +91,8 @@ async def test_model_multiple_instances_of_same_table_in_schema():
 @pytest.mark.asyncio
 async def test_right_tables_join():
     async with database:
-        class1 = await SchoolClass.objects.create(name="Math")
+        department = await Department.objects.create(name='Math Department')
+        class1 = await SchoolClass.objects.create(name="Math", department=department)
         category = await Category.objects.create(name="Foreign")
         category2 = await Category.objects.create(name="Domestic")
         await Student.objects.create(name="Jane", category=category, schoolclass=class1)
@@ -89,5 +101,25 @@ async def test_right_tables_join():
         classes = await SchoolClass.objects.select_related(['teachers__category', 'students']).all()
         assert classes[0].name == 'Math'
         assert classes[0].students[0].name == 'Jane'
-        breakpoint()
+        assert classes[0].teachers[0].category.name == 'Domestic'
+
+        assert classes[0].students[0].category.name is None
+        await classes[0].students[0].category.load()
+        assert classes[0].students[0].category.name == 'Foreign'
+
+
+@pytest.mark.asyncio
+async def test_multiple_reverse_related_objects():
+    async with database:
+        department = await Department.objects.create(name='Math Department')
+        class1 = await SchoolClass.objects.create(name="Math", department=department)
+        category = await Category.objects.create(name="Foreign")
+        category2 = await Category.objects.create(name="Domestic")
+        await Student.objects.create(name="Jane", category=category, schoolclass=class1)
+        await Student.objects.create(name="Jack", category=category, schoolclass=class1)
+        await Teacher.objects.create(name="Joe", category=category2, schoolclass=class1)
+
+        classes = await SchoolClass.objects.select_related(['teachers__category', 'students']).all()
+        assert classes[0].name == 'Math'
+        assert classes[0].students[0].name == 'Jane'
         assert classes[0].teachers[0].category.name == 'Domestic'