Add support for sqlalchemy column_property (#408)

* Add tests for sqlalchemy column_property * Fix * update changelog
jowilf · Dec 23, 2023 · 950bf13 · 950bf13
1 parent 37a551c
commit 950bf13
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/docs/changelog/index.md b/docs/changelog/index.md
@@ -9,9 +9,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
-* Add Support for SQLAlchemy Models with Multiple Primary Keys by [@jowilf](https://github.com/jowilf)
+* Add support for SQLAlchemy `column_property` by [@jowilf](https://github.com/jowilf)
   in [#402](https://github.com/jowilf/starlette-admin/pull/402)
-* Adds AdminConfig to override app_title, logo_url in the templates
+* Add support for SQLAlchemy Models with Multiple Primary Keys by [@jowilf](https://github.com/jowilf)
+  in [#402](https://github.com/jowilf/starlette-admin/pull/402)
+* Adds `AdminConfig` to override `app_title` and `logo_url` in the templates
   by [@hasansezertasan](https://github.com/hasansezertasan)
   in [#374](https://github.com/jowilf/starlette-admin/pull/374)
 

diff --git a/starlette_admin/contrib/sqla/converters.py b/starlette_admin/contrib/sqla/converters.py
@@ -10,6 +10,7 @@
     Mapper,
     RelationshipProperty,
 )
+from sqlalchemy.sql.elements import ColumnElement, Label
 from starlette_admin.contrib.sqla.exceptions import NotSupportedColumn
 from starlette_admin.contrib.sqla.fields import FileField, ImageField
 from starlette_admin.converters import BaseModelConverter, converts
@@ -121,8 +122,14 @@ def convert_fields_list(
 class ModelConverter(BaseSQLAModelConverter):
     @classmethod
     def _field_common(
-        cls, *, name: str, column: Column, **kwargs: Any
+        cls, *, name: str, column: ColumnElement, **kwargs: Any
     ) -> Dict[str, Any]:
+        if isinstance(column, Label):
+            return {
+                "name": column.key,
+                "exclude_from_edit": True,
+                "exclude_from_create": True,
+            }
         return {
             "name": name,
             "help_text": column.comment,

diff --git a/tests/sqla/test_view_meta.py b/tests/sqla/test_view_meta.py
@@ -22,7 +22,7 @@
 )
 from sqlalchemy.dialects.mysql import INTEGER, YEAR
 from sqlalchemy.dialects.postgresql import BIT, INET, MACADDR, UUID
-from sqlalchemy.orm import declarative_base, relationship
+from sqlalchemy.orm import column_property, declarative_base, relationship
 from starlette_admin import (
     BooleanField,
     DateField,
@@ -102,6 +102,7 @@ class Other(Base):
     year = Column(YEAR)
     macaddr = Column(MACADDR)
     inet = Column(INET)
+    cp = column_property(macaddr + ";" + inet)
 
 
 class UserView(ModelView):
@@ -197,6 +198,7 @@ def test_other_fields_conversion():
         IntegerField("year", min=1901, max=2155),
         StringField("macaddr"),
         StringField("inet"),
+        StringField("cp", exclude_from_edit=True, exclude_from_create=True),
     ]