ormlambda 3.34.9__tar.gz → 3.35.1__tar.gz

{ormlambda-3.34.9 → ormlambda-3.35.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ormlambda
-Version: 3.34.9
+Version: 3.35.1
 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.34.9 → ormlambda-3.35.1}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 320
 
 [tool.poetry]
 name = "ormlambda"
-version = "3.34.9"
+version = "3.35.1"
 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.34.9 → ormlambda-3.35.1}/src/ormlambda/databases/my_sql/caster/caster.py

@@ -13,6 +13,7 @@ from .types import (
     IterableCaster,
     BooleanCaster,
     DecimalCaster,
+    JsonCaster,
 )
 
 from shapely import Point
@@ -40,4 +41,5 @@ class MySQLCaster(Caster):
             list: IterableCaster,
             bool: BooleanCaster,
             Decimal: DecimalCaster,
+            dict:JsonCaster
         }

{ormlambda-3.34.9 → ormlambda-3.35.1}/src/ormlambda/databases/my_sql/caster/types/__init__.py

@@ -9,3 +9,4 @@ from .iterable import IterableCaster as IterableCaster
 from .boolean import BooleanCaster as BooleanCaster
 from .date import DateCaster as DateCaster
 from .decimal import DecimalCaster as DecimalCaster
+from .json import JsonCaster as JsonCaster 

ormlambda-3.35.1/src/ormlambda/databases/my_sql/caster/types/json.py

@@ -0,0 +1,31 @@
+from typing import Optional
+from ormlambda.caster import BaseCaster, Caster
+import json
+
+class JsonCaster[TType](BaseCaster[dict, TType]):
+    def __init__(self, value: dict, type_value: TType):
+        super().__init__(value, type_value)
+
+    def wildcard_to_select(self, value: Optional[str] = None) -> str:
+        return Caster.PLACEHOLDER if value is None else value
+
+    def wildcard_to_where(self, value: Optional[str] = None) -> str:
+        return Caster.PLACEHOLDER if value is None else value
+
+    def wildcard_to_insert(self, value: Optional[str] = None) -> str:
+        return Caster.PLACEHOLDER if value is None else value
+
+    @property
+    @BaseCaster.return_value_if_exists
+    def to_database(self) -> Optional[str]:
+        return json.dumps(self.value)
+
+    @property
+    @BaseCaster.return_value_if_exists
+    def from_database(self) -> Optional[str]:
+        return json.loads(self.value)
+
+    @property
+    @BaseCaster.return_value_if_exists
+    def string_data(self) -> Optional[str]:
+        return f"'{self.value}'"

{ormlambda-3.34.9 → ormlambda-3.35.1}/src/ormlambda/sql/sqltypes.py

@@ -449,10 +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"
+    __visit_name__ = "JSON"
+
+    @property
+    def python_type(self) -> T | Type[dict | list]:
+        return dict | list
 
 
 type UuidType = str | _python_UUID

{ormlambda-3.34.9 → ormlambda-3.35.1}/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