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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from forestadmin.datasource_toolkit.interfaces.query.filter.unpaginated import Filter
from forestadmin.datasource_toolkit.interfaces.query.projections import Projection
from forestadmin.datasource_toolkit.interfaces.records import RecordsDataAlias
from forestadmin.datasource_toolkit.utils.collections import CollectionUtils
from sqlalchemy import Table
from sqlalchemy import column as SqlAlchemyColumn
from sqlalchemy import text
Expand Down Expand Up @@ -207,7 +208,7 @@ async def update(self, caller: User, filter_: Optional[Filter], patch: RecordsDa

def _cast_condition_tree(self, tree: ConditionTree) -> ConditionTree:
if isinstance(tree, ConditionTreeLeaf):
if cast(Column, self.schema["fields"][tree.field])["column_type"] == PrimitiveType.DATE:
if cast(Column, CollectionUtils.get_field_schema(self, tree.field))["column_type"] == PrimitiveType.DATE:
iso_format = tree.value
if isinstance(iso_format, str):
if iso_format[-1] == "Z":
Expand Down
11 changes: 11 additions & 0 deletions src/datasource_sqlalchemy/tests/test_sqlalchemy_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,17 @@ def test_list_filter_in_and_not_in_with_null_in_values_should_work(self):
self.assertEqual(len(results), 1)
self.assertEqual(results[0]["id"], 1)

def test_list_filter_relation(self):
collection = self.datasource.get_collection("order")
filter_ = PaginatedFilter({"condition_tree": ConditionTreeLeaf("customer:id", Operator.IN, [1, None])})

results = self.loop.run_until_complete(
collection.list(self.mocked_caller, filter_, Projection("id", "customer:id"))
)

self.assertEqual(len(results), 1)
self.assertEqual(results[0]["customer"]["id"], 1)

def test_create(self):
order = {
"id": 11,
Expand Down