fixed sqla orm delete_object

Author: CosmoV

fastapi_jsonapi/data_layers/sqla_orm.py

@@ -386,8 +386,10 @@ async def delete_object(self, obj: TypeModel, view_kwargs: dict):
         :param view_kwargs: kwargs from the resource view.
         """
         await self.before_delete_object(obj, view_kwargs)
+        stmt = delete(self.model).where(self.model.id == obj.id)
+
         try:
-            await self.session.delete(obj)
+            await self.session.execute(stmt)
             await self.save()
         except DBAPIError as e:
             await self.session.rollback()

tests/models.py

@@ -3,7 +3,7 @@
 
 from sqlalchemy import JSON, Column, DateTime, ForeignKey, Index, Integer, String, Text
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import declared_attr, relationship
+from sqlalchemy.orm import backref, declared_attr, relationship
 from sqlalchemy.types import CHAR, TypeDecorator
 
 from tests.common import is_postgres_tests, sqla_uri
@@ -390,3 +390,25 @@ class Delta(Base):
     name = Column(String)
     gammas: List["Gamma"] = relationship("Gamma", back_populates="delta", lazy="noload")
     betas: List["Beta"] = relationship("Beta", secondary="beta_delta_binding", back_populates="deltas", lazy="noload")
+
+
+class CascadeCase(Base):
+    __tablename__ = "cascade_case"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    parent_item_id = Column(
+        Integer,
+        ForeignKey(
+            "cascade_case.id",
+            onupdate="CASCADE",
+            ondelete="CASCADE",
+        ),
+        nullable=True,
+    )
+    sub_items = relationship(
+        "CascadeCase",
+        backref=backref("parent_item", remote_side=[id]),
+    )
+
+    if TYPE_CHECKING:
+        parent_item: Optional["CascadeCase"]

tests/schemas.py

@@ -409,6 +409,21 @@ class SelfRelationshipSchema(BaseModel):
     )
 
 
+class CascadeCaseSchema(BaseModel):
+    name: str
+    parent_item: Optional["CascadeCaseSchema"] = Field(
+        relationship=RelationshipInfo(
+            resource_type="cascade_case",
+        ),
+    )
+    sub_items: Optional[list["CascadeCaseSchema"]] = Field(
+        relationship=RelationshipInfo(
+            resource_type="cascade_case",
+            many=True,
+        ),
+    )
+
+
 class CustomUserAttributesSchema(UserBaseSchema):
     spam: str
     eggs: str

tests/test_api/test_api_sqla_with_includes.py

@@ -31,6 +31,7 @@
 from tests.models import (
     Alpha,
     Beta,
+    CascadeCase,
     Computer,
     ContainsTimestamp,
     CustomUUIDItem,
@@ -1474,6 +1475,43 @@ async def test_create_with_relationship_to_the_same_table(self):
                 "meta": None,
             }
 
+    async def test_cascade_delete(self, async_session: AsyncSession):
+        resource_type = "cascade_case"
+        app = build_app_custom(
+            model=CascadeCase,
+            schema=SelfRelationshipSchema,
+            resource_type=resource_type,
+        )
+
+        top_item = CascadeCase()
+        sub_item_1 = CascadeCase(parent_item=top_item)
+        sub_item_2 = CascadeCase(parent_item=top_item)
+        async_session.add_all(
+            [
+                top_item,
+                sub_item_1,
+                sub_item_2,
+            ],
+        )
+        await async_session.commit()
+
+        assert sub_item_1.parent_item_id == top_item.id
+        assert sub_item_2.parent_item_id == top_item.id
+
+        async with AsyncClient(app=app, base_url="http://test") as client:
+            url = app.url_path_for(f"delete_{resource_type}_detail", obj_id=top_item.id)
+
+            res = await client.delete(url)
+            assert res.status_code == status.HTTP_204_NO_CONTENT, res.text
+
+            top_item_stmt = select(CascadeCase).where(CascadeCase.id == top_item.id)
+            top_item = (await async_session.execute(top_item_stmt)).one_or_none()
+            assert top_item is None
+
+            sub_items_stmt = select(CascadeCase).where(CascadeCase.id.in_([sub_item_1.id, sub_item_2.id]))
+            sub_items = (await async_session.execute(sub_items_stmt)).all()
+            assert sub_items == []
+
     async def test_create_with_timestamp_and_fetch(self, async_session: AsyncSession):
         resource_type = "contains_timestamp_model"