WIP changes up to join redefinition pending - use fields instead of join_params

tests/test_forward_refs.py

@@ -35,34 +35,34 @@ Game = ForwardRef("Game")
 Child = ForwardRef("Child")
 
 
-class ChildFriends(ormar.Model):
+class ChildFriend(ormar.Model):
     class Meta(ModelMeta):
         metadata = metadata
         database = db
 
 
-# class Child(ormar.Model):
-#     class Meta(ModelMeta):
-#         metadata = metadata
-#         database = db
-#
-#     id: int = ormar.Integer(primary_key=True)
-#     name: str = ormar.String(max_length=100)
-#     favourite_game: Game = ormar.ForeignKey(Game, related_name="liked_by")
-#     least_favourite_game: Game = ormar.ForeignKey(Game, related_name="not_liked_by")
-#     friends: List[Child] = ormar.ManyToMany(Child, through=ChildFriends)
-#
-#
-# class Game(ormar.Model):
-#     class Meta(ModelMeta):
-#         metadata = metadata
-#         database = db
-#
-#     id: int = ormar.Integer(primary_key=True)
-#     name: str = ormar.String(max_length=100)
+class Child(ormar.Model):
+    class Meta(ModelMeta):
+        metadata = metadata
+        database = db
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+    favourite_game: Game = ormar.ForeignKey(Game, related_name="liked_by")
+    least_favourite_game: Game = ormar.ForeignKey(Game, related_name="not_liked_by")
+    friends = ormar.ManyToMany(Child, through=ChildFriend, related_name="also_friends")
 
 
-# Child.update_forward_refs()
+class Game(ormar.Model):
+    class Meta(ModelMeta):
+        metadata = metadata
+        database = db
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+
+
+Child.update_forward_refs()
 
 
 @pytest.fixture(autouse=True, scope="module")
@@ -125,22 +125,56 @@ async def test_self_relation():
     assert sam_check.employees[0].name == "Joe"
 
 
-# @pytest.mark.asyncio
-# async def test_other_forwardref_relation():
-#     checkers = await Game.objects.create(name="checkers")
-#     uno = await Game(name="Uno").save()
-#
-#     await Child(name="Billy", favourite_game=uno, least_favourite_game=checkers).save()
-#     await Child(name="Kate", favourite_game=checkers, least_favourite_game=uno).save()
-#
-#     billy_check = await Child.objects.select_related(
-#         ["favourite_game", "least_favourite_game"]
-#     ).get(name="Billy")
-#     assert billy_check.favourite_game == uno
-#     assert billy_check.least_favourite_game == checkers
-#
-#     uno_check = await Game.objects.select_related(["liked_by", "not_liked_by"]).get(
-#         name="Uno"
-#     )
-#     assert uno_check.liked_by[0].name == "Billy"
-#     assert uno_check.not_liked_by[0].name == "Kate"
+@pytest.mark.asyncio
+async def test_other_forwardref_relation():
+    checkers = await Game.objects.create(name="checkers")
+    uno = await Game(name="Uno").save()
+
+    await Child(name="Billy", favourite_game=uno, least_favourite_game=checkers).save()
+    await Child(name="Kate", favourite_game=checkers, least_favourite_game=uno).save()
+
+    billy_check = await Child.objects.select_related(
+        ["favourite_game", "least_favourite_game"]
+    ).get(name="Billy")
+    assert billy_check.favourite_game == uno
+    assert billy_check.least_favourite_game == checkers
+
+    uno_check = await Game.objects.select_related(["liked_by", "not_liked_by"]).get(
+        name="Uno"
+    )
+    assert uno_check.liked_by[0].name == "Billy"
+    assert uno_check.not_liked_by[0].name == "Kate"
+
+
+@pytest.mark.asyncio
+async def test_m2m_self_forwardref_relation():
+    checkers = await Game.objects.create(name="checkers")
+    uno = await Game(name="Uno").save()
+    jenga = await Game(name="Jenga").save()
+
+    billy = await Child(
+        name="Billy", favourite_game=uno, least_favourite_game=checkers
+    ).save()
+    kate = await Child(
+        name="Kate", favourite_game=checkers, least_favourite_game=uno
+    ).save()
+    steve = await Child(
+        name="Steve", favourite_game=jenga, least_favourite_game=uno
+    ).save()
+
+    await billy.friends.add(kate)
+    await billy.friends.add(steve)
+
+    await steve.friends.add(kate)
+    await steve.friends.add(billy)
+
+    billy_check = await Child.objects.select_related(
+        [
+            "friends",
+            "favourite_game",
+            "least_favourite_game",
+            "friends__favourite_game",
+            "friends__least_favourite_game",
+        ]
+    ).get(name="Billy")
+    assert len(billy_check.friends) == 2

tests/test_many_to_many.py

@@ -80,6 +80,17 @@ async def cleanup():
         await Author.objects.delete(each=True)
 
 
+@pytest.mark.asyncio
+async def test_not_saved_raises_error(cleanup):
+    async with database:
+        guido = await Author(first_name="Guido", last_name="Van Rossum").save()
+        post = await Post.objects.create(title="Hello, M2M", author=guido)
+        news = Category(name="News")
+
+        with pytest.raises(ModelPersistenceError):
+            await post.categories.add(news)
+
+
 @pytest.mark.asyncio
 async def test_assigning_related_objects(cleanup):
     async with database:

tests/test_saving_related.py

@@ -6,6 +6,7 @@ import sqlalchemy as sa
 from sqlalchemy import create_engine
 
 import ormar
+from ormar.exceptions import ModelPersistenceError
 from tests.settings import DATABASE_URL
 
 metadata = sa.MetaData()
@@ -61,3 +62,15 @@ async def test_model_relationship():
             assert ws.id == 1
             assert ws.topic == "Topic 2"
             assert ws.category.name == "Foo"
+
+
+@pytest.mark.asyncio
+async def test_model_relationship_with_not_saved():
+    async with db:
+        async with db.transaction(force_rollback=True):
+            cat = Category(name="Foo", code=123)
+            with pytest.raises(ModelPersistenceError):
+                await Workshop(topic="Topic 1", category=cat).save()
+
+            with pytest.raises(ModelPersistenceError):
+                await Workshop.objects.create(topic="Topic 1", category=cat)