Fix unnecessary joins in different pages

sqladmin/application.py

@@ -388,7 +388,7 @@ async def details(self, request: Request) -> Response:
 
         model_view = self._find_model_view(request.path_params["identity"])
 
-        model = await model_view.get_model_by_pk(request.path_params["pk"])
+        model = await model_view.get_object_for_details(request.path_params["pk"])
         if not model:
             raise HTTPException(status_code=404)
 
@@ -412,7 +412,7 @@ async def delete(self, request: Request) -> Response:
 
         pks = request.query_params.get("pks", "")
         for pk in pks.split(","):
-            model = await model_view.get_model_by_pk(pk)
+            model = await model_view.get_object_for_delete(pk)
             if not model:
                 raise HTTPException(status_code=404)
 
@@ -473,7 +473,7 @@ async def edit(self, request: Request) -> Response:
         identity = request.path_params["identity"]
         model_view = self._find_model_view(identity)
 
-        model = await model_view.get_model_by_pk(request.path_params["pk"])
+        model = await model_view.get_object_for_edit(request.path_params["pk"])
         if not model:
             raise HTTPException(status_code=404)
 

sqladmin/models.py

@@ -675,21 +675,18 @@ def __init__(self) -> None:
         }
 
         self._list_props = self.get_list_columns()
-        self._list_columns = [
-            (name, prop)
-            for (name, prop) in self._list_props
-            if isinstance(prop, ColumnProperty)
-        ]
-        self._list_relations = [
-            prop
+        self._list_relation_attrs = [
+            getattr(self.model, prop.key)
             for (_, prop) in self._list_props
             if isinstance(prop, RelationshipProperty)
         ]
-        self._list_relation_attrs = [
-            getattr(self.model, prop.key) for prop in self._list_relations
-        ]
 
         self._details_props = self.get_details_columns()
+        self._details_relation_attrs = [
+            getattr(self.model, prop.key)
+            for (_, prop) in self._details_props
+            if isinstance(prop, RelationshipProperty)
+        ]
 
         column_formatters = getattr(self, "column_formatters", {})
         self._list_formatters = {
@@ -704,6 +701,11 @@ def __init__(self) -> None:
         }
 
         self._form_props = self.get_form_columns()
+        self._form_relation_attrs = [
+            getattr(self.model, prop.key)
+            for (_, prop) in self._form_props
+            if isinstance(prop, RelationshipProperty)
+        ]
 
         self._export_props = self.get_export_columns()
 
@@ -846,17 +848,32 @@ async def get_model_objects(self, limit: Union[int, None] = 0) -> List[Any]:
         rows = await self._run_query(stmt)
         return rows
 
-    async def get_model_by_pk(self, value: Any) -> Any:
+    async def _get_object_by_pk(self, stmt: Select) -> Any:
+        rows = await self._run_query(stmt)
+        return rows[0] if rows else None
+
+    async def get_object_for_details(self, value: Any) -> Any:
         pk_value = get_column_python_type(self.pk_column)(value)
         stmt = select(self.model).where(self.pk_column == pk_value)
 
-        for relation in self._relation_attrs:
+        for relation in self._details_relation_attrs:
             stmt = stmt.options(joinedload(relation))
 
-        rows = await self._run_query(stmt)
-        if rows:
-            return rows[0]
-        return None
+        return await self._get_object_by_pk(stmt)
+
+    async def get_object_for_edit(self, value: Any) -> Any:
+        pk_value = get_column_python_type(self.pk_column)(value)
+        stmt = select(self.model).where(self.pk_column == pk_value)
+
+        for relation in self._form_relation_attrs:
+            stmt = stmt.options(joinedload(relation))
+
+        return await self._get_object_by_pk(stmt)
+
+    async def get_object_for_delete(self, value: Any) -> Any:
+        pk_value = get_column_python_type(self.pk_column)(value)
+        stmt = select(self.model).where(self.pk_column == pk_value)
+        return await self._get_object_by_pk(stmt)
 
     def get_prop_value(
         self, obj: type, prop: Union[Column, ColumnProperty, RelationshipProperty]