rebuild the registry of relationships

tests/test_fastapi_usage.py

@@ -1,17 +1,13 @@
-import json
-from typing import Optional
-
 import databases
-import pydantic
 import sqlalchemy
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 
-app = FastAPI()
-
 import orm
 from tests.settings import DATABASE_URL
 
+app = FastAPI()
+
 database = databases.Database(DATABASE_URL, force_rollback=True)
 metadata = sqlalchemy.MetaData()
 

tests/test_foreign_keys.py

@@ -3,7 +3,7 @@ import pytest
 import sqlalchemy
 
 import orm
-from orm.exceptions import NoMatch, MultipleMatches
+from orm.exceptions import NoMatch, MultipleMatches, RelationshipInstanceError
 from tests.settings import DATABASE_URL
 
 database = databases.Database(DATABASE_URL, force_rollback=True)
@@ -229,3 +229,10 @@ async def test_get_exceptions():
         await Track.objects.create(album=fantasies, title="Test3", position=3)
         with pytest.raises(MultipleMatches):
             await Track.objects.select_related("album").get(album=fantasies)
+
+
+@pytest.mark.asyncio
+async def test_wrong_model_passed_as_fk():
+    with pytest.raises(RelationshipInstanceError):
+        org = await Organisation.objects.create(ident="ACME Ltd")
+        await Track.objects.create(album=org, title="Test1", position=1)

tests/test_same_table_joins.py

@@ -0,0 +1,77 @@
+import databases
+import pytest
+import sqlalchemy
+
+import orm
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+
+class SchoolClass(orm.Model):
+    __tablename__ = "schoolclasses"
+    __metadata__ = metadata
+    __database__ = database
+
+    id = orm.Integer(primary_key=True)
+    name = orm.String(length=100)
+
+
+class Category(orm.Model):
+    __tablename__ = "cateogories"
+    __metadata__ = metadata
+    __database__ = database
+
+    id = orm.Integer(primary_key=True)
+    name = orm.String(length=100)
+
+
+class Student(orm.Model):
+    __tablename__ = "students"
+    __metadata__ = metadata
+    __database__ = database
+
+    id = orm.Integer(primary_key=True)
+    name = orm.String(length=100)
+    schoolclass = orm.ForeignKey(SchoolClass)
+    category = orm.ForeignKey(Category, nullable=True)
+
+
+class Teacher(orm.Model):
+    __tablename__ = "teachers"
+    __metadata__ = metadata
+    __database__ = database
+
+    id = orm.Integer(primary_key=True)
+    name = orm.String(length=100)
+    schoolclass = orm.ForeignKey(SchoolClass)
+    category = orm.ForeignKey(Category, nullable=True)
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = sqlalchemy.create_engine(DATABASE_URL)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+@pytest.mark.asyncio
+async def test_model_multiple_instances_of_same_table_in_schema():
+    async with database:
+        class1 = await SchoolClass.objects.create(name="Math")
+        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 Teacher.objects.create(name="Joe", category=category2, schoolclass=class1)
+
+        classes = await SchoolClass.objects.select_related(['teachers', 'students']).all()
+        assert classes[0].name == 'Math'
+        assert classes[0].students[0].name == 'Jane'
+
+        # related fields of main model are only populated by pk
+        # but you can load them anytime
+        assert classes[0].students[0].schoolclass.name is None
+        await classes[0].students[0].schoolclass.load()
+        assert classes[0].students[0].schoolclass.name == 'Math'