ormlambda 3.35.0__tar.gz → 3.35.2__tar.gz

{ormlambda-3.35.0 → ormlambda-3.35.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ormlambda
-Version: 3.35.0
+Version: 3.35.2
 Summary: ORM designed to interact with the database (currently with MySQL) using lambda functions and nested functions
 Author: p-hzamora
 Author-email: p.hzamora@icloud.com

{ormlambda-3.35.0 → ormlambda-3.35.2}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 320
 
 [tool.poetry]
 name = "ormlambda"
-version = "3.35.0"
+version = "3.35.2"
 description = "ORM designed to interact with the database (currently with MySQL) using lambda functions and nested functions"
 authors = ["p-hzamora <p.hzamora@icloud.com>"]
 readme = "README.md"

{ormlambda-3.35.0 → ormlambda-3.35.2}/src/ormlambda/databases/my_sql/caster/types/iterable.py

@@ -1,8 +1,9 @@
 from typing import Optional
 from ormlambda.caster import BaseCaster, Caster
+from .json import JsonCaster
 
 
-class IterableCaster[TType](BaseCaster[bytes, TType]):
+class IterableCaster[TType](JsonCaster[TType]):
     def __init__(self, value: bytes, type_value: TType):
         super().__init__(value, type_value)
 
@@ -18,12 +19,12 @@ class IterableCaster[TType](BaseCaster[bytes, TType]):
     @property
     @BaseCaster.return_value_if_exists
     def to_database(self) -> Optional[bytes]:
-        return tuple(self.value)
+        return super().to_database
 
     @property
     @BaseCaster.return_value_if_exists
     def from_database(self) -> Optional[bytes]:
-        return tuple(self.value)
+        return super().from_database
 
     @property
     @BaseCaster.return_value_if_exists

{ormlambda-3.35.0 → ormlambda-3.35.2}/src/ormlambda/sql/sqltypes.py

@@ -449,14 +449,14 @@ class Point(TypeEngine[_python_Point]):
         return _python_Point
 
 
-class JSON(TypeEngine[Any]):
+class JSON[T](TypeEngine[dict | list | T]):
     """JSON data type."""
 
     __visit_name__ = "JSON"
 
     @property
-    def python_type(self) -> Type[dict]:
-        return dict
+    def python_type(self) -> T | Type[dict | list]:
+        return dict | list
 
 
 type UuidType = str | _python_UUID

{ormlambda-3.35.0 → ormlambda-3.35.2}/src/ormlambda/sql/table/table.py

@@ -95,7 +95,12 @@ class Table(metaclass=TableMeta):
     def to_dict(self) -> dict[str, str | int]:
         dicc: dict[str, Any] = {}
         for x in self.__annotations__:
-            dicc[x] = getattr(self, x)
+            value = getattr(self, x)
+            if isinstance(value, dict):
+                value = tuple(sorted(value.items()))
+            if isinstance(value, list | set):
+                value = tuple(value)
+            dicc[x] = value
         return dicc
 
     @classmethod