ormlambda 3.35.0__py3-none-any.whl → 3.35.2__py3-none-any.whl

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/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/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

{ormlambda-3.35.0.dist-info → ormlambda-3.35.2.dist-info}/METADATA

@@ -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.dist-info → ormlambda-3.35.2.dist-info}/RECORD

@@ -33,7 +33,7 @@ ormlambda/databases/my_sql/caster/types/datetime.py,sha256=ISzcsbwijTa2wC9ZD8zy5
 ormlambda/databases/my_sql/caster/types/decimal.py,sha256=ycQnSqO-aFkrcsa8JKVPdnfjotNL_BUFeScYRcueOWM,1068
 ormlambda/databases/my_sql/caster/types/float.py,sha256=EbU6J3yoL5_naLowfibkfUC9Bk9WzDaWks7lJ2pNhyA,1026
 ormlambda/databases/my_sql/caster/types/int.py,sha256=a30xbe0LNj2BvbtLNZhUXFvT3WJ115MFsHC19Y3NLTk,1016
-ormlambda/databases/my_sql/caster/types/iterable.py,sha256=nFPMOiaahzw_HWSdMZLRDQVim0aWUMoP-OLvp7vONC4,1029
+ormlambda/databases/my_sql/caster/types/iterable.py,sha256=S7pEAJ_NaxZqYhJAXwaJBS_zrbSz9J2yiYPpmDHATso,1057
 ormlambda/databases/my_sql/caster/types/json.py,sha256=AR7D6CEgyK3zAEijyNO1AuWtLBgC7KTj-YNEWkyilkg,1042
 ormlambda/databases/my_sql/caster/types/none.py,sha256=Bl4jpVVyoLG7ehoCAYj9lFBZbRWbyDN8QsQeWmIb84I,948
 ormlambda/databases/my_sql/caster/types/point.py,sha256=GHAf51kE0AS7wOlCYM9YW-z2ZbmY8hXwcHs979ZCeaY,1442
@@ -128,10 +128,10 @@ ormlambda/sql/functions/max.py,sha256=wXNhFmOlMyD1sKcaBO9asQeXcfY0OvMQPkrlARVXgd
 ormlambda/sql/functions/min.py,sha256=MTRGXgwzbLgKk9PJpn6JGK1TU91hZe_VsTszngLOh7Q,1570
 ormlambda/sql/functions/sum.py,sha256=_TN8SitDDBVD6VlsHZH3RpmiE5hkFrGGgC3tuEctKjk,1614
 ormlambda/sql/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ormlambda/sql/sqltypes.py,sha256=cqP33UzFx-cAXYosvBIht06O6LqR6miAnAFaDDxXtHY,14409
+ormlambda/sql/sqltypes.py,sha256=mvFn_YM0RTpQWj_ggE4SfbD_LxQhjJX4Kz2M3XUsuBk,14442
 ormlambda/sql/table/__init__.py,sha256=LLZcMLjwFxgBCPhdm5UQYYZDIbtYWCKPO9CbcXsy5zI,50
 ormlambda/sql/table/fields.py,sha256=ovNR3bJ473aKW-2NhbKr0iJlVpgW06jurHLob2IyZU8,2116
-ormlambda/sql/table/table.py,sha256=l_oXhTHid09IaG-eapBxZTdaNrWCVgGHWLDHnIrrEqY,6484
+ormlambda/sql/table/table.py,sha256=Po6mWk6-ES8URSO6sdoFnnCIACrdce03y0LCcvgXAGk,6686
 ormlambda/sql/table/table_constructor.py,sha256=c3Z-1El0onSClYBmAatoUBYUOT70tITVqtsDJMxZ9QU,1092
 ormlambda/sql/type_api.py,sha256=vepqMw6hR4zVhhNIYbtX491iVsxAfwHiSiD3uYQUGTE,1067
 ormlambda/sql/types.py,sha256=lQxC5gbhDPRckGSRJZ4rYSZr-XUvIMMH8WfkN1wtM1g,844
@@ -152,8 +152,8 @@ ormlambda/util/module_tree/dfs_traversal.py,sha256=lSF03G63XtJFLp03ueAmsHMBvhUkj
 ormlambda/util/module_tree/dynamic_module.py,sha256=vJOqvm5-WKksudXBK1IcTn4WsuLxt1qXNISq-_21sy4,8705
 ormlambda/util/plugin_loader.py,sha256=p6WLn-MF1bQd2i2GHy98WQjNKmbQdqIUyTFIcBIHC5M,1034
 ormlambda/util/typing.py,sha256=Z7irz53ui0hoFnJTe06NX4JPl60_thgdjJIxh5gjGGk,169
-ormlambda-3.35.0.dist-info/AUTHORS,sha256=uWpOHaCPTOLbVkk5x9McoLwbgzSeCg7yILeDRyMGWGM,606
-ormlambda-3.35.0.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
-ormlambda-3.35.0.dist-info/METADATA,sha256=Z4kT8T0DtDB11oDxUuL8Zc3jR21861m8Y0BfwdGsvyk,13326
-ormlambda-3.35.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ormlambda-3.35.0.dist-info/RECORD,,
+ormlambda-3.35.2.dist-info/AUTHORS,sha256=uWpOHaCPTOLbVkk5x9McoLwbgzSeCg7yILeDRyMGWGM,606
+ormlambda-3.35.2.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
+ormlambda-3.35.2.dist-info/METADATA,sha256=PJqbjjydIYtwXAgKpVJkZrgjT90adtCWAvQO59XBmnE,13326
+ormlambda-3.35.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ormlambda-3.35.2.dist-info/RECORD,,