ormlambda 3.11.1__tar.gz → 3.11.2__tar.gz

{ormlambda-3.11.1 → ormlambda-3.11.2}/PKG-INFO

@@ -1,12 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: ormlambda
-Version: 3.11.1
+Version: 3.11.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
 Requires-Python: >=3.12,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: mysql-connector-python (>=9.0.0,<10.0.0)
 Requires-Dist: shapely (>=2.0.6,<3.0.0)
 Description-Content-Type: text/markdown
@@ -69,10 +70,12 @@ Once the `AddressModel` class is created, we will not only be able to access all
 
 ```python
 from models.address import Address
+from ormlambda import create_engine, ORM
+
+db = create_engine('mysql://root:1234@localhost:3306/sakila')
 
-db = MySQLRepository(**config_dict)
 
-AddressModel = ORM(Address,db)
+AddressModel = ORM(Address, db)
 
 result = AddressModel.where(Address.City.Country.country.regex(r"^[aA]")).select(
     lambda address: (
@@ -360,10 +363,11 @@ class AddressCombine(BaseModel):
 
     model_config: ConfigDict = {"extra": "forbid"}
 
-ddbb = MySQLRepository(**config_dict)
-model = ORM(Address, ddbb)
+db = create_engine('mysql://root:1234@localhost:3306/sakila')
+
 select = (
-    model.order(lambda x: x.City.Country.country, "DESC")
+    ORM(Address, db)
+    .order(lambda x: x.City.Country.country, "DESC")
     .limit(10)
     .where(Address.City.Country.country == "Spain")
     .first(

{ormlambda-3.11.1 → ormlambda-3.11.2}/README.md

@@ -56,10 +56,12 @@ Once the `AddressModel` class is created, we will not only be able to access all
 
 ```python
 from models.address import Address
+from ormlambda import create_engine, ORM
+
+db = create_engine('mysql://root:1234@localhost:3306/sakila')
 
-db = MySQLRepository(**config_dict)
 
-AddressModel = ORM(Address,db)
+AddressModel = ORM(Address, db)
 
 result = AddressModel.where(Address.City.Country.country.regex(r"^[aA]")).select(
     lambda address: (
@@ -347,10 +349,11 @@ class AddressCombine(BaseModel):
 
     model_config: ConfigDict = {"extra": "forbid"}
 
-ddbb = MySQLRepository(**config_dict)
-model = ORM(Address, ddbb)
+db = create_engine('mysql://root:1234@localhost:3306/sakila')
+
 select = (
-    model.order(lambda x: x.City.Country.country, "DESC")
+    ORM(Address, db)
+    .order(lambda x: x.City.Country.country, "DESC")
     .limit(10)
     .where(Address.City.Country.country == "Spain")
     .first(

{ormlambda-3.11.1 → ormlambda-3.11.2}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 320
 
 [tool.poetry]
 name = "ormlambda"
-version = "3.11.1"
+version = "3.11.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.11.1 → ormlambda-3.11.2}/src/ormlambda/__init__.py

@@ -21,4 +21,4 @@ from .model.base_model import (
     ORM as ORM,
 )  # COMMENT: to avoid relative import we need to import BaseModel after import Table,Column, ForeignKey, IRepositoryBase and Disassembler
 
-from .engine import create_engine, URL  # noqa: F401
+from .engine import create_engine, URL, make_url # noqa: F401

{ormlambda-3.11.1 → ormlambda-3.11.2}/src/ormlambda/caster/caster.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 PLACEHOLDER: str = "%s"
 
 
-class Caster[TRepo]:
+class Caster:
     def __init__(self, repository: IRepositoryBase):
         self._repository: IRepositoryBase = repository
         self._caster = RepositoryTemplateDict().get(repository).caster

{ormlambda-3.11.1 → ormlambda-3.11.2}/src/ormlambda/databases/my_sql/clauses/delete.py

@@ -6,7 +6,6 @@ if TYPE_CHECKING:
 from ormlambda import Table
 from ormlambda.repository import IRepositoryBase
 from ormlambda.components.delete import DeleteQueryBase
-from mysql.connector import MySQLConnection
 
 
 class DeleteQuery[T: Table](DeleteQueryBase[T, IRepositoryBase]):

{ormlambda-3.11.1 → ormlambda-3.11.2}/src/ormlambda/databases/my_sql/statements.py

@@ -11,6 +11,7 @@ from mysql.connector import MySQLConnection
 
 
 if TYPE_CHECKING:
+    from ormlambda.sql.types import AliasType
     from ormlambda import Table
     from ormlambda.statements.types import OrderTypes
     from ormlambda.sql.types import ColumnType
@@ -464,7 +465,7 @@ class MySQLStatements[T: Table, *Ts](BaseStatement[T, MySQLConnection]):
         return self
 
     @override
-    def alias[TProp](self, column: ColumnType[TProp], alias: str) -> ClauseInfo[T, TProp]:
+    def alias[TProp](self, column: ColumnType[TProp], alias: AliasType[ClauseInfo[T]]) -> ClauseInfo[T]:
         return Alias(
             table=column.table,
             column=column,

{ormlambda-3.11.1 → ormlambda-3.11.2}/src/ormlambda/engine/__init__.py

@@ -1,2 +1,2 @@
 from .create import create_engine  # noqa: F401
-from .url import URL  # noqa: F401
+from .url import URL, make_url  # noqa: F401

{ormlambda-3.11.1 → ormlambda-3.11.2}/src/ormlambda/statements/interfaces/IStatements.py

@@ -4,7 +4,6 @@ from enum import Enum
 from abc import abstractmethod, ABC
 
 
-from ormlambda.common.enums import JoinType
 
 if TYPE_CHECKING:
     from ormlambda.repository import BaseRepository
@@ -12,6 +11,10 @@ if TYPE_CHECKING:
     from ormlambda.sql.clause_info import IAggregate
     from ormlambda.sql.types import TupleJoinType, ColumnType
     from ormlambda.databases.my_sql.join_context import JoinContext
+    from ormlambda.common.enums import JoinType
+    from ormlambda.sql.clause_info import ClauseInfo
+    from ormlambda.sql.types import AliasType
+
 
 from ..types import (
     OrderTypes,
@@ -319,7 +322,7 @@ class IStatements[T: Table](ABC):
     # endregion
 
     @abstractmethod
-    def alias(self, column: Callable[[T], Any], alias: str) -> IStatements[T]: ...
+    def alias[TProp](self, column: ColumnType[TProp], alias: AliasType[ClauseInfo[T]]) -> ClauseInfo[T]: ...
 
 
 class IStatements_two_generic[T, TPool](IStatements[T]):

ormlambda-3.11.1/src/ormlambda/databases/my_sql/caster/read.py

@@ -1,39 +0,0 @@
-from datetime import datetime
-from typing import Optional
-from shapely import Point
-from types import NoneType
-from ormlambda.common.abstract_classes.caster.cast_base import ReadCastBase
-
-
-from .types.datetime import MySQLReadDatetime
-from .types.string import MySQLReadString
-from .types.int import MySQLReadInt
-from .types.float import MySQLReadFloat
-from .types.point import MySQLReadPoint
-from .types.none import MySQLReadNoneType
-
-
-class MySQLReadCastBase(ReadCastBase):
-    @staticmethod
-    def cast_str(value: str) -> str:
-        return MySQLReadString.cast(value)
-
-    @staticmethod
-    def cast_int(value: str) -> int:
-        return MySQLReadInt.cast(value)
-
-    @staticmethod
-    def cast_float(value: str) -> float:
-        return MySQLReadFloat.cast(value)
-
-    @staticmethod
-    def cast_Point(value: str) -> Point:
-        return MySQLReadPoint.cast(value)
-
-    @staticmethod
-    def cast_NoneType(value: str) -> NoneType:
-        return MySQLReadNoneType.cast(value)
-
-    @staticmethod
-    def cast_datetime(value: str) -> datetime:
-        return MySQLReadDatetime.cast(value)

ormlambda-3.11.1/src/ormlambda/databases/my_sql/caster/write.py

@@ -1,37 +0,0 @@
-from datetime import datetime
-from shapely import Point
-from types import NoneType
-from ormlambda.common.abstract_classes.caster.cast_base import WriteCastBase
-
-from .types.datetime import MySQLWriteDatetime
-from .types.string import MySQLWriteString
-from .types.int import MySQLWriteInt
-from .types.float import MySQLWriteFloat
-from .types.point import MySQLWritePoint
-from .types.none import MySQLWriteNoneType
-
-
-class MySQLWriteCastBase(WriteCastBase):
-    @staticmethod
-    def cast_str(value: str, insert_data: bool = False) -> str:
-        return MySQLWriteString.cast(value, insert_data)
-
-    @staticmethod
-    def cast_int(value: int, insert_data: bool = False) -> str:
-        return MySQLWriteInt.cast(value, insert_data)
-
-    @staticmethod
-    def cast_float(value: float, insert_data: bool = False) -> str:
-        return MySQLWriteFloat.cast(value, insert_data)
-
-    @staticmethod
-    def cast_Point(value: Point, insert_data: bool = False) -> str:
-        return MySQLWritePoint.cast(value, insert_data)
-
-    @staticmethod
-    def cast_NoneType(value: NoneType, insert_data: bool = False) -> str:
-        return MySQLWriteNoneType.cast(value, insert_data)
-
-    @staticmethod
-    def cast_datetime(value: datetime, insert_data: bool = False) -> str:
-        return MySQLWriteDatetime.cast(value, insert_data)