Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/_example/django/django_demo/app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
from app.flask_models import * # noqa:F401,F403
from django.db import models

# from django.db.models.functions import Concat

"""
checklist:
* data types:
Expand Down Expand Up @@ -61,6 +63,23 @@ class Address(models.Model):
country = models.CharField(max_length=254, default="France")
zip_code = models.CharField(max_length=5, default="75009")

# test with django 5 ; if enable, don't forget to make migration and migrate
# full_text_address = models.GeneratedField(
# expression=Concat(
# models.F("number"),
# models.Value(" "),
# models.F("street"),
# models.Value(" "),
# models.F("zip_code"),
# models.Value(" "),
# models.F("city"),
# models.Value(" "),
# models.F("country"),
# ),
# output_field=models.TextField(),
# db_persist=False,
# )

customers = models.ManyToManyField(
"Customer", related_name="addresses", through="CustomerAddress", through_fields=("address", "customer")
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
)
from forestadmin.datasource_toolkit.interfaces.models.collections import CollectionSchema

try:
# GeneratedField is available since django 5
from django.db.models import GeneratedField
except ImportError:
GeneratedField = None


class FieldFactory:
@staticmethod
Expand All @@ -42,6 +48,8 @@ def _build_is_read_only(field: Field) -> bool:
return isinstance(field, AutoFieldMixin)
elif isinstance(field, DateField) or isinstance(field, TimeField):
return field.auto_now is True or field.auto_now_add is True
if GeneratedField is not None and isinstance(field, GeneratedField):
return True
return False

@classmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
from forestadmin.datasource_toolkit.interfaces.fields import ColumnAlias, Operator, PrimitiveType
from forestadmin.datasource_toolkit.utils.operators import BaseFilterOperator

try:
# GeneratedField is available since django 5
from django.db.models import GeneratedField
except Exception:
GeneratedField = None


class ConverterException(DjangoDatasourceException):
pass
Expand Down Expand Up @@ -65,6 +71,9 @@ def convert(cls, field: models.Field) -> ColumnAlias:
if isinstance(field, models.ForeignKey):
return cls.convert(field.target_field)

if GeneratedField is not None and isinstance(field, GeneratedField):
return cls.convert(field.output_field)

if field.__class__ in cls.TYPES:
return cls.TYPES[field.__class__]

Expand Down
2 changes: 1 addition & 1 deletion src/datasource_django/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include = "forestadmin"
python = ">=3.8,<3.13"
typing-extensions = "~=4.2"
tzdata = "~=2022.6"
django = ">=3.2,<5.0"
django = ">=3.2,<6.0"
psycopg2 = ">=2.8.4"
forestadmin-datasource-toolkit = "1.3.0-beta.5"
forestadmin-agent-toolkit = "1.3.0-beta.5"
Expand Down
2 changes: 1 addition & 1 deletion src/django_agent/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ typing-extensions = "~=4.2"
tzdata = "~=2022.6"
forestadmin-agent-toolkit = "1.3.0-beta.5"
forestadmin-datasource-django = "1.3.0-beta.5"
django = ">=3.2,<5.0"
django = ">=3.2,<6.0"
django-cors-headers = ">=3.8"

[tool.pytest.ini_options]
Expand Down