remove auto related parsing, switch to relations on instance instead of relationship manager

tests/test_foreign_keys.py

@@ -131,7 +131,7 @@ async def test_model_crud():
 
         album1 = await Album.objects.get(name="Malibu")
         assert album1.pk == 1
-        assert album1.tracks is None
+        assert album1.tracks == []
 
         await Track.objects.create(album={"id": track.album.pk}, title="The Bird2", position=4)
 

tests/test_more_same_table_joins.py

@@ -0,0 +1,110 @@
+import asyncio
+
+import databases
+import pytest
+import sqlalchemy
+
+import ormar
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+
+class Department(ormar.Model):
+    class Meta:
+        tablename = "departments"
+        metadata = metadata
+        database = database
+
+    id: ormar.Integer(primary_key=True, autoincrement=False)
+    name: ormar.String(max_length=100)
+
+
+class SchoolClass(ormar.Model):
+    class Meta:
+        tablename = "schoolclasses"
+        metadata = metadata
+        database = database
+
+    id: ormar.Integer(primary_key=True)
+    name: ormar.String(max_length=100)
+
+
+class Category(ormar.Model):
+    class Meta:
+        tablename = "categories"
+        metadata = metadata
+        database = database
+
+    id: ormar.Integer(primary_key=True)
+    name: ormar.String(max_length=100)
+    department: ormar.ForeignKey(Department, nullable=False)
+
+
+class Student(ormar.Model):
+    class Meta:
+        tablename = "students"
+        metadata = metadata
+        database = database
+
+    id: ormar.Integer(primary_key=True)
+    name: ormar.String(max_length=100)
+    schoolclass: ormar.ForeignKey(SchoolClass)
+    category: ormar.ForeignKey(Category, nullable=True)
+
+
+class Teacher(ormar.Model):
+    class Meta:
+        tablename = "teachers"
+        metadata = metadata
+        database = database
+
+    id: ormar.Integer(primary_key=True)
+    name: ormar.String(max_length=100)
+    schoolclass: ormar.ForeignKey(SchoolClass)
+    category: ormar.ForeignKey(Category, nullable=True)
+
+
+@pytest.fixture(scope="module")
+def event_loop():
+    loop = asyncio.get_event_loop()
+    yield loop
+    loop.close()
+
+
+@pytest.fixture(autouse=True, scope="module")
+async def create_test_database():
+    engine = sqlalchemy.create_engine(DATABASE_URL)
+    metadata.drop_all(engine)
+    metadata.create_all(engine)
+    department = await Department.objects.create(id=1, name="Math Department")
+    department2 = await Department.objects.create(id=2, name="Law Department")
+    class1 = await SchoolClass.objects.create(name="Math")
+    class2 = await SchoolClass.objects.create(name="Logic")
+    category = await Category.objects.create(name="Foreign", department=department)
+    category2 = await Category.objects.create(name="Domestic", department=department2)
+    await Student.objects.create(name="Jane", category=category, schoolclass=class1)
+    await Student.objects.create(name="Judy", category=category2, schoolclass=class1)
+    await Student.objects.create(name="Jack", category=category2, schoolclass=class2)
+    await Teacher.objects.create(name="Joe", category=category2, schoolclass=class1)
+    yield
+    metadata.drop_all(engine)
+
+
+@pytest.mark.asyncio
+async def test_model_multiple_instances_of_same_table_in_schema():
+    async with database:
+        classes = await SchoolClass.objects.select_related(
+            ["teachers__category__department", "students"]
+        ).all()
+        assert classes[0].name == "Math"
+        assert classes[0].students[0].name == "Jane"
+        assert len(classes[0].dict().get("students")) == 2
+        assert classes[0].teachers[0].category.department.name == 'Law Department'
+
+        assert classes[0].students[0].category.pk is not None
+        assert classes[0].students[0].category.name is None
+        await classes[0].students[0].category.load()
+        await classes[0].students[0].category.department.load()
+        assert classes[0].students[0].category.department.name == 'Math Department'

tests/test_same_table_joins.py

@@ -79,11 +79,14 @@ async def create_test_database():
     metadata.drop_all(engine)
     metadata.create_all(engine)
     department = await Department.objects.create(id=1, name="Math Department")
+    department2 = await Department.objects.create(id=2, name="Law Department")
     class1 = await SchoolClass.objects.create(name="Math", department=department)
+    class2 = await SchoolClass.objects.create(name="Logic", department=department2)
     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=category2, schoolclass=class1)
+    await Student.objects.create(name="Judy", category=category2, schoolclass=class1)
+    await Student.objects.create(name="Jack", category=category2, schoolclass=class2)
     await Teacher.objects.create(name="Joe", category=category2, schoolclass=class1)
     yield
     metadata.drop_all(engine)
@@ -100,15 +103,15 @@ async def test_model_multiple_instances_of_same_table_in_schema():
 
         assert len(classes[0].dict().get("students")) == 2
 
-        # related fields of main model are only populated by pk
-        # unless there is a required foreign key somewhere along the way
-        # since department is required for schoolclass it was pre loaded (again)
-        # but you can load them anytime
+        # since it's going from schoolclass => teacher => schoolclass (same class) department is already populated
         assert classes[0].students[0].schoolclass.name == "Math"
         assert classes[0].students[0].schoolclass.department.name is None
         await classes[0].students[0].schoolclass.department.load()
         assert classes[0].students[0].schoolclass.department.name == "Math Department"
 
+        await classes[1].students[0].schoolclass.department.load()
+        assert classes[1].students[0].schoolclass.department.name == "Law Department"
+
 
 @pytest.mark.asyncio
 async def test_right_tables_join():
@@ -130,5 +133,7 @@ async def test_multiple_reverse_related_objects():
             ["teachers__category", "students__category"]
         ).all()
         assert classes[0].name == "Math"
-        assert classes[0].students[1].name == "Jack"
+        assert classes[0].students[1].name == "Judy"
+        assert classes[0].students[0].category.name == "Foreign"
+        assert classes[0].students[1].category.name == "Domestic"
         assert classes[0].teachers[0].category.name == "Domestic"