ormlambda 2.9.0__py3-none-any.whl → 2.10.0__py3-none-any.whl

ormlambda/databases/my_sql/statements.py

@@ -4,6 +4,7 @@ import inspect
 from mysql.connector import MySQLConnection, errors, errorcode
 import functools
 
+
 if TYPE_CHECKING:
     from ormlambda import Table
     from ormlambda.components.where.abstract_where import AbstractWhere
@@ -13,6 +14,8 @@ if TYPE_CHECKING:
     from ormlambda.common.interfaces import IAggregate
     from ormlambda.common.interfaces.IStatements import WhereTypes
 
+from ormlambda.utils.foreign_key import ForeignKey
+
 from ormlambda import AbstractSQLStatements
 from .clauses import DeleteQuery
 from .clauses import InsertQuery
@@ -29,7 +32,7 @@ from .clauses import Count
 from .clauses import GroupBy
 
 
-from ormlambda.utils import ForeignKey, Table
+from ormlambda.utils import Table
 from ormlambda.common.enums import JoinType
 from . import functions as func
 
@@ -46,8 +49,8 @@ def clear_list(f: Callable[..., Any]):
     return wrapper
 
 
-class MySQLStatements[T: Table](AbstractSQLStatements[T, MySQLConnection]):
-    def __init__(self, model: T, repository: IRepositoryBase[MySQLConnection]) -> None:
+class MySQLStatements[T: Table, *Ts](AbstractSQLStatements[T, *Ts, MySQLConnection]):
+    def __init__(self, model: tuple[T, *Ts], repository: IRepositoryBase[MySQLConnection]) -> None:
         super().__init__(model, repository=repository)
 
     @property
@@ -141,24 +144,17 @@ class MySQLStatements[T: Table](AbstractSQLStatements[T, MySQLConnection]):
         self,
         selection: Callable[[T], tuple] = lambda x: "*",
         alias=True,
-        alias_name=None,
+        alias_name="count",
     ) -> IQuery:
         return Count[T](self._model, selection, alias=alias, alias_name=alias_name)
 
-    @override
-    def join(self, table_left: Table, table_right: Table, *, by: str) -> IStatements_two_generic[T, MySQLConnection]:
-        where = ForeignKey.MAPPED[table_left.__table_name__][table_right.__table_name__]
-        join_query = JoinSelector[table_left, Table](table_left, table_right, JoinType(by), where=where)
-        self._query_list["join"].append(join_query)
-        return self
-
     @override
     def where(self, conditions: WhereTypes = lambda: None, **kwargs) -> IStatements_two_generic[T, MySQLConnection]:
         # FIXME [x]: I've wrapped self._model into tuple to pass it instance attr. Idk if it's correct
 
         if isinstance(conditions, Iterable):
             for x in conditions:
-                self._query_list["where"].append(WhereCondition[T](function=x, instances=(self._model,), **kwargs))
+                self._query_list["where"].append(WhereCondition[T](function=x, instances=self._models, **kwargs))
             return self
 
         where_query = WhereCondition[T](function=conditions, instances=(self._model,), **kwargs)
@@ -188,7 +184,30 @@ class MySQLStatements[T: Table](AbstractSQLStatements[T, MySQLConnection]):
         return func.Sum[T](self._model, column=column, alias=alias, alias_name=alias_name)
 
     @override
-    def select[TValue, TFlavour, *Ts](self, selector: Optional[Callable[[T], tuple[TValue, *Ts]]] = lambda: None, *, flavour: Optional[Type[TFlavour]] = None, by: JoinType = JoinType.INNER_JOIN):
+    def join[*FKTables](
+        self,
+        table: Optional[T] = None,
+        relation: Optional[WhereCondition[T, *FKTables]] = None,
+        join_type: Optional[JoinType] = None,
+    ) -> IStatements_two_generic[T, *FKTables, MySQLConnection]:
+        if isinstance(table, type) and issubclass(table, Table):
+            joins = ((table, relation, join_type),)
+        else:
+            if any(len(x) != 3 for x in table):
+                raise ValueError("Each tuple inside of 'join' method must contain the referenced table, relation between columns and join type")
+            joins = table
+
+        new_tables: list[Type[Table]] = [self._model]
+
+        for table, where, by in joins:
+            new_tables.append(table)
+            join_query = JoinSelector[T, type(table)](self._model, table, by=by, where=where)
+            self._query_list["join"].append(join_query)
+        self._models = new_tables
+        return self
+
+    @override
+    def select[TValue, TFlavour, *Ts](self, selector: Optional[Callable[[T, *Ts], tuple[TValue, *Ts]]] = lambda: None, *, flavour: Optional[Type[TFlavour]] = None, by: JoinType = JoinType.INNER_JOIN, **kwargs):
         if len(inspect.signature(selector).parameters) == 0:
             # COMMENT: if we do not specify any lambda function we assumed the user want to retreive only elements of the Model itself avoiding other models
             result = self.select(selector=lambda x: (x,), flavour=flavour, by=by)
@@ -197,19 +216,28 @@ class MySQLStatements[T: Table](AbstractSQLStatements[T, MySQLConnection]):
             if flavour:
                 return result
             return () if not result else result[0]
-        select = Select[T](self._model, lambda_query=selector, by=by, alias=False)
+
+        joins = self._query_list.pop("join", None)
+        select = Select[T, *Ts](
+            self._models,
+            lambda_query=selector,
+            by=by,
+            alias=False,
+            joins=joins,
+        )
         self._query_list["select"].append(select)
 
-        query: str = self._build()
+        self._query: str = self._build()
+
         if flavour:
-            result = self._return_flavour(query, flavour, select)
-            if issubclass(flavour, tuple) and isinstance(selector(self._model), property):
+            result = self._return_flavour(self.query, flavour, select, **kwargs)
+            if issubclass(flavour, tuple) and isinstance(selector(*self._models), property):
                 return tuple([x[0] for x in result])
             return result
-        return self._return_model(select, query)
+        return self._return_model(select, self.query)
 
     @override
-    def select_one[TValue, TFlavour, *Ts](self, selector: Optional[Callable[[T], tuple[TValue, *Ts]]] = lambda: None, *, flavour: Optional[Type[TFlavour]] = None, by: JoinType = JoinType.INNER_JOIN):
+    def select_one[TValue, TFlavour, *Ts](self, selector: Optional[Callable[[T, *Ts], tuple[TValue, *Ts]]] = lambda: None, *, flavour: Optional[Type[TFlavour]] = None, by: JoinType = JoinType.INNER_JOIN):
         self.limit(1)
         if len(inspect.signature(selector).parameters) == 0:
             response = self.select(selector=lambda x: (x,), flavour=flavour, by=by)
@@ -226,11 +254,11 @@ class MySQLStatements[T: Table](AbstractSQLStatements[T, MySQLConnection]):
         return tuple([res[0] for res in response])
 
     @override
-    def group_by[*Ts](self, column: str | Callable[[T], Any]) -> IStatements_two_generic[T, MySQLConnection]:
+    def group_by(self, column: str | Callable[[T, *Ts], Any]):
         if isinstance(column, str):
-            groupby = GroupBy[T, tuple[*Ts]](self._model, lambda x: column)
+            groupby = GroupBy[T, tuple[*Ts]](self._models, lambda x: column)
         else:
-            groupby = GroupBy[T, tuple[*Ts]](self._model, column)
+            groupby = GroupBy[T, tuple[*Ts]](self._models, column)
         # Only can be one LIMIT SQL parameter. We only use the last LimitQuery
         self._query_list["group by"].append(groupby)
         return self
@@ -240,26 +268,21 @@ class MySQLStatements[T: Table](AbstractSQLStatements[T, MySQLConnection]):
     def _build(self) -> str:
         query_list: list[str] = []
         for x in self.__order__:
-            sub_query: Optional[list[IQuery]] = self._query_list.get(x, None)
+            if len(self._query_list) == 0:
+                break
+
+            sub_query: Optional[list[IQuery]] = self._query_list.pop(x, None)
             if sub_query is None:
                 continue
 
             if isinstance(sub_query[0], WhereCondition):
                 query_ = self.__build_where_clause(sub_query)
 
-            # we must check if any join already exists on query string
-            elif isinstance(sub_query[0], JoinSelector):
-                select_query: str = self._query_list["select"][0].query
-                query_ = ""
-                for join in sub_query:
-                    if join.query not in select_query:
-                        query_ += f"\n{join.query}"
-
             elif isinstance((select := sub_query[0]), Select):
                 query_: str = ""
                 where_joins = self.__create_necessary_inner_join()
                 if where_joins:
-                    select._fk_relationship.update(where_joins)
+                    select._joins.update(where_joins)
                 query_ = select.query
 
             else:
@@ -277,18 +300,21 @@ class MySQLStatements[T: Table](AbstractSQLStatements[T, MySQLConnection]):
             query += f" {and_} ({clause})"
         return query
 
-    def __create_necessary_inner_join(self) -> Optional[set[tuple[Type[Table], Type[Table]]]]:
+    def __create_necessary_inner_join(self) -> Optional[set[JoinSelector]]:
         # When we applied filters in any table that we wont select any column, we need to add manually all neccessary joins to achieve positive result.
         if "where" not in self._query_list:
             return None
 
-        res = []
         for where in self._query_list["where"]:
             where: AbstractWhere
 
             tables = where.get_involved_tables()
 
             if tables:
-                [res.append(x) for x in tables]
-
-        return set(res)
+                # FIXME [ ]: Refactor to avoid copy and paste the same code of the '_add_fk_relationship' method
+                joins = []
+                for ltable, rtable in tables:
+                    lambda_relationship = ForeignKey.MAPPED[ltable.__table_name__].referenced_tables[rtable.__table_name__].relationship
+                    joins.append(JoinSelector(ltable, rtable, JoinType.INNER_JOIN, where=lambda_relationship))
+                return set(joins)
+        return None

ormlambda/model_base.py

@@ -10,20 +10,20 @@ from .databases.my_sql import MySQLStatements, MySQLRepository
 # endregion
 
 
-class BaseModel[T: Type[Table]]:
+class BaseModel[T: Type[Table], *Ts]:
     """
     Class to select the correct AbstractSQLStatements class depends on the repository.
 
     Contiene los metodos necesarios para hacer consultas a una tabla
     """
 
-    statements_dicc: dict[Type[IRepositoryBase], Type[AbstractSQLStatements[T, IRepositoryBase]]] = {
+    statements_dicc: dict[Type[IRepositoryBase], Type[AbstractSQLStatements[T, *Ts, IRepositoryBase]]] = {
         MySQLRepository: MySQLStatements,
     }
 
     # region Constructor
 
-    def __new__[TRepo](cls, model: T, repository: IRepositoryBase[TRepo]) -> IStatements_two_generic[T, TRepo]:
+    def __new__[TRepo](cls, model: tuple[T, *Ts], repository: IRepositoryBase[TRepo]) -> IStatements_two_generic[T, *Ts, TRepo]:
         if repository is None:
             raise ValueError("`None` cannot be passed to the `repository` attribute when calling the `BaseModel` class")
         cls: AbstractSQLStatements[T, TRepo] = cls.statements_dicc.get(type(repository), None)

{ormlambda-2.9.0.dist-info → ormlambda-2.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ormlambda
-Version: 2.9.0
+Version: 2.10.0
 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-2.9.0.dist-info → ormlambda-2.10.0.dist-info}/RECORD

@@ -1,19 +1,21 @@
 ormlambda/__init__.py,sha256=lWQxjf2cQ2bXenNaDpoy2Bar6imiPlzc4nK0hkIYhC0,723
 ormlambda/common/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 ormlambda/common/abstract_classes/__init__.py,sha256=tk2J4Mn_nD-1ZjtMVBE5FH7KR_8ppN_1Kx1s6c38GjM,167
-ormlambda/common/abstract_classes/abstract_model.py,sha256=W7E3DDeFeQbnBX0ccLqmhUX3dCHHDCADK3bT2wyPEtk,4618
-ormlambda/common/abstract_classes/decomposition_query.py,sha256=0k1cTFftZZaRmjuYOEnZ-r7nqljTwcSlz1ZbEElnlbk,12586
+ormlambda/common/abstract_classes/abstract_model.py,sha256=xmpr7_Hn5r1bRG2UtOKdhlZgXUqgFGuTTXsmm4LqmEI,5100
+ormlambda/common/abstract_classes/decomposition_query.py,sha256=vX4H-QLGo7mEuDgyXuKSd_1RySywN3fSislrmU4M-No,13791
 ormlambda/common/abstract_classes/non_query_base.py,sha256=5jhvyT7OZaJxlGp9XMP3vQ4ei5QQZBn-fFtJnD640mE,980
 ormlambda/common/abstract_classes/query_base.py,sha256=6qUFPwsVx45kUW3b66pHiSyjhcH4mzbdkddlGeUnG7c,266
 ormlambda/common/enums/__init__.py,sha256=4lVKCHi1JalwgNzjsAXqX-C54NJEH83y2v5baMO8fN4,103
 ormlambda/common/enums/condition_types.py,sha256=mDPMrtzZu4IYv3-q5Zw4NNgwUoNAx4lih5SIDFRn1Qo,309
 ormlambda/common/enums/join_type.py,sha256=7LEhE34bzYOwJxe8yxPJo_EjQpGylgClAPX1Wt3z4n4,292
+ormlambda/common/errors/__init__.py,sha256=cWFOYuAauXxzYyGKVP97Uy0EIim5D8ewoTyK-hXkonY,184
 ormlambda/common/interfaces/IAggregate.py,sha256=i9zZIYrstP2oolUYqR-udeQQl7M0NwSzrr-VUL0b5HI,271
-ormlambda/common/interfaces/IDecompositionQuery.py,sha256=dHdCxezbWwy-c4U4po2hQB8f_wa0wGFvA2TKaHBx0Do,1363
+ormlambda/common/interfaces/ICustomAlias.py,sha256=_4r8ew9trUY_DJWdYUZXhJCe_I62HUr7ZdsmW6Ln98M,121
+ormlambda/common/interfaces/IDecompositionQuery.py,sha256=7B4cnbJbyESk8GltS1A8wCXr56T_6kZJNIij66CcvPA,1447
 ormlambda/common/interfaces/INonQueryCommand.py,sha256=7CjLW4sKqkR5zUIGvhRXOtzTs6vypJW1a9EJHlgCw2c,260
 ormlambda/common/interfaces/IQueryCommand.py,sha256=hfzCosK4-n8RJIb2PYs8b0qU3TNmfYluZXBf47KxxKs,331
-ormlambda/common/interfaces/IRepositoryBase.py,sha256=zGm7tDrFLKj3FMYN-MWI-em3INws27g2yByNYYMx0qk,1126
-ormlambda/common/interfaces/IStatements.py,sha256=XJ0hCp7_7wMclPvZmavpdr7unQshOXKZDasgVk6RfwU,10409
+ormlambda/common/interfaces/IRepositoryBase.py,sha256=M4pD4t6tXo5WaRhwu2vsza1FoAj2S-rEJKjPfKeSRn0,1134
+ormlambda/common/interfaces/IStatements.py,sha256=bew7bXGQ2YdT2BKko-RS35_w5qBLgo8FKyaSbr7ijqc,13130
 ormlambda/common/interfaces/__init__.py,sha256=00ca9a-u_A8DzyEyxPfBMxfqLKFzzUgJaeNmoRitAbA,360
 ormlambda/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ormlambda/components/delete/IDelete.py,sha256=06ZEdbKBxsHSwsGMBu0E1om4WJjojZAm-L3b95eQrcc,139
@@ -33,18 +35,19 @@ ormlambda/components/where/abstract_where.py,sha256=93tIJBC81OUUVV6il7mISibBwqJe
 ormlambda/databases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ormlambda/databases/my_sql/__init__.py,sha256=3PbOp4WqxJzFOSRwBozqyNtQi25cLLdiJFPDzEnSI70,115
 ormlambda/databases/my_sql/clauses/__init__.py,sha256=F7p---sNQBefi_dgydV6Wp1YuOwDzvSQOdbcjWtBi2k,767
+ormlambda/databases/my_sql/clauses/alias.py,sha256=yRBEJ1IlL7j8ZozjR-4jtQNkJZDweu-1VNLJEOyA4o8,887
 ormlambda/databases/my_sql/clauses/count.py,sha256=UFJD-ELp-xvOyPbvYX37GvRZsP8M_axambnI7_h91yA,1177
 ormlambda/databases/my_sql/clauses/create_database.py,sha256=WnWaAuhxeE71NZKXW37WZ-msRqjum7TFCSRK1IGdSTE,1279
 ormlambda/databases/my_sql/clauses/delete.py,sha256=nUKNQgwF5YUfzk2icWpecYjrGk5DeXpp7eiwtWCf_3c,1924
 ormlambda/databases/my_sql/clauses/drop_database.py,sha256=nMM0YUbcH0D9X3bU70Uc6S_dsIrAZy-IrYuIKrQZNrg,505
 ormlambda/databases/my_sql/clauses/drop_table.py,sha256=meX4e-pVPQ7UwlPSHV5e9HHRblI1BlkLSc7ssl8WUiI,592
-ormlambda/databases/my_sql/clauses/group_by.py,sha256=xG8YhdaDWBm99EFMkzCsBJNhHOJy5lvXmpaHu3jClro,1042
+ormlambda/databases/my_sql/clauses/group_by.py,sha256=k2idhaHOfLFwc6XNwhai6LMoAySp6efBTsWCOBVzsc8,1052
 ormlambda/databases/my_sql/clauses/insert.py,sha256=mnOy62U4go0Ub6tmmgn8DRRWvPN12WRE5lqpCNbyR70,3136
-ormlambda/databases/my_sql/clauses/joins.py,sha256=U6JnUvQo7AXyEeK-X1jMvckXefgAB7ugSmJCZhH1XQI,3058
+ormlambda/databases/my_sql/clauses/joins.py,sha256=2SHRAah4FDzYwCDfpqz9SLU0cFH20mL-epP_FCPgBxM,4402
 ormlambda/databases/my_sql/clauses/limit.py,sha256=a4lI8FVRKpfXwBQTXdkbVtlQkmzcjE20ymiCy1IaSc4,391
 ormlambda/databases/my_sql/clauses/offset.py,sha256=81170JhsQndjKlDfQj1ll-tiYHQbW8SuU4IE3mhQF7Y,395
 ormlambda/databases/my_sql/clauses/order.py,sha256=XTMtR5ObAJxq8eTHp392rykQD991ecJ95dyXXLUpgeU,1680
-ormlambda/databases/my_sql/clauses/select.py,sha256=o0gjCt8cZfTkMsJwZcCt0XkSeFa2rlKz-0Ymi7XL5xU,1833
+ormlambda/databases/my_sql/clauses/select.py,sha256=q-rJWbYtfgKEGf-OOH3ToGY90KXGzH3FnKHTc0xsAbM,1962
 ormlambda/databases/my_sql/clauses/update.py,sha256=d2nSLiGe8OUk0ASgGxchit_1DL-Yg8U-DUtBbgpfkto,1571
 ormlambda/databases/my_sql/clauses/upsert.py,sha256=eW2pQ4ax-GKuXiaWKoSRSS1GrHuILJBsmj83ADbBQ34,1951
 ormlambda/databases/my_sql/clauses/where_condition.py,sha256=UgU5vnTqFAx91wKwnECpww5tETDZ9F7IdC_SiZOgZhI,8336
@@ -53,9 +56,9 @@ ormlambda/databases/my_sql/functions/concat.py,sha256=cZztl5eSATpYMKVKfyPbul6Ooc
 ormlambda/databases/my_sql/functions/max.py,sha256=zrO_RBKsHhyokEmSpPI6Yg5OY6Jf4GGp2RveBJdOuuA,1190
 ormlambda/databases/my_sql/functions/min.py,sha256=SEVuUdIJNz9zM5za1kLTWalFkhErjsjyBb8SU8n0F94,1190
 ormlambda/databases/my_sql/functions/sum.py,sha256=akKYr2dI8TZS5MDvybfHn_idhPOvEH0cj6mDRQIHe-M,1188
-ormlambda/databases/my_sql/repository.py,sha256=fj_RcMY6QhANvKRyfAnu6PEfvkrpiBXrlTvmeXUf5Vo,8823
-ormlambda/databases/my_sql/statements.py,sha256=ukP8ypxegCnxOuIEH99pNgWVUyOP-ELHD6GzfLEWUx4,12045
-ormlambda/model_base.py,sha256=RrAATQWX_bHJ0ZQ5sCHyJKA4NiR7ZJY4I6dqhnGWWAc,1216
+ormlambda/databases/my_sql/repository.py,sha256=6qrP-JC4tvUxin3ixGKBeuqvU9cl9mkjNCdwjWZQA9Y,9059
+ormlambda/databases/my_sql/statements.py,sha256=d__3pLfNObTmlUK8yL-N7fMm4C6hNZhrnCYM0CUEhgQ,12867
+ormlambda/model_base.py,sha256=_UGTnin-yUi9ecT-28YY6TniIPdrje-jMFD3QXyZD6c,1243
 ormlambda/utils/__init__.py,sha256=ywMdWqmA2jHj19-W-S04yfaYF5hv4IZ1lZDq0B8Jnjs,142
 ormlambda/utils/column.py,sha256=SqbX8N63_RwXNrMXuVMOpatDw--aLc47o3kG1sEXhNs,3413
 ormlambda/utils/dtypes.py,sha256=Ji4QOyKD0n9bKe7yXIIduy9uEX5BaXolQSIsx0NXYJY,7843
@@ -72,7 +75,7 @@ ormlambda/utils/module_tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 ormlambda/utils/module_tree/dfs_traversal.py,sha256=lSF03G63XtJFLp03ueAmsHMBvhUkjptDbK3IugXm8iU,1425
 ormlambda/utils/module_tree/dynamic_module.py,sha256=zwvjU3U2cz6H2CDp9Gncs5D5bSAyfITNa2SDqFDl8rw,8551
 ormlambda/utils/table_constructor.py,sha256=ch1geCSJIQnnv_D_uzfYk6do533kjtZyeCIh2t0_dkU,10863
-ormlambda-2.9.0.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
-ormlambda-2.9.0.dist-info/METADATA,sha256=t2WNOq0P72brj6Qr1h_PXY0oXRJ85NjY6oYbn7l2REs,8461
-ormlambda-2.9.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ormlambda-2.9.0.dist-info/RECORD,,
+ormlambda-2.10.0.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
+ormlambda-2.10.0.dist-info/METADATA,sha256=gPWslhcBiUlKHa2OCKwBwbWJUmZ4ObU12Kugr2Onv5M,8462
+ormlambda-2.10.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ormlambda-2.10.0.dist-info/RECORD,,