ormlambda 2.9.4__tar.gz → 2.10.0__tar.gz

{ormlambda-2.9.4 → ormlambda-2.10.0}/PKG-INFO

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

@@ -3,7 +3,7 @@ line-length = 320
 
 [tool.poetry]
 name = "ormlambda"
-version = "2.9.4"
+version = "2.10.0"
 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-2.9.4 → ormlambda-2.10.0}/src/ormlambda/common/interfaces/IStatements.py

@@ -35,7 +35,7 @@ type SelectRes10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10] = tuple[*SelectRes9[T1
 
 
 type WhereCondition[T, T1] = Callable[[T, T1], bool]
-type JoinCondition[T, T1] = tuple[T1, WhereCondition[T, T1]]
+type JoinCondition[T, T1] = tuple[T1, WhereCondition[T, T1], Optional[JoinType]]
 
 type TupleJoins1[T, T1] = tuple[JoinCondition[T, T1]]
 type TupleJoins2[T, T1, T2] = tuple[*TupleJoins1[T, T1], JoinCondition[T, T2]]
@@ -227,22 +227,29 @@ class IStatements[T, *Ts](ABC):
     # region join
 
     @overload
-    def join[T1](self, joins: JoinCondition[T, T1]) -> IStatements[T, T1]: ...
+    def join[T1](self, table: T1, relation: WhereCondition[T, T1], join_type: Optional[JoinType]) -> IStatements[T, T1]: ...
     @overload
-    def join[T1](self, joins: TupleJoins1[T, T1]) -> IStatements[T, T1]: ...
+    def join[T1](self, table: JoinCondition[T, T1]) -> IStatements[T, T1]: ...
     @overload
-    def join[T1, T2](self, joins: TupleJoins2[T, T1, T2]) -> IStatements[T, T1, T2]: ...
+    def join[T1](self, table: TupleJoins1[T, T1]) -> IStatements[T, T1]: ...
     @overload
-    def join[T1, T2, T3](self, joins: TupleJoins3[T, T1, T2, T3]) -> IStatements[T, T1, T2, T3]: ...
+    def join[T1, T2](self, table: TupleJoins2[T, T1, T2]) -> IStatements[T, T1, T2]: ...
     @overload
-    def join[T1, T2, T3, T4](self, joins: TupleJoins4[T, T1, T2, T3, T4]) -> IStatements[T, T1, T2, T3, T4]: ...
+    def join[T1, T2, T3](self, table: TupleJoins3[T, T1, T2, T3]) -> IStatements[T, T1, T2, T3]: ...
     @overload
-    def join[T1, T2, T3, T4, T5](self, joins: TupleJoins5[T, T1, T2, T3, T4, T5]) -> IStatements[T, T1, T2, T3, T4, T5]: ...
+    def join[T1, T2, T3, T4](self, table: TupleJoins4[T, T1, T2, T3, T4]) -> IStatements[T, T1, T2, T3, T4]: ...
     @overload
-    def join[T1, T2, T3, T4, T5, T6](self, joins: TupleJoins6[T, T1, T2, T3, T4, T5, T6]) -> IStatements[T, T1, T2, T3, T4, T5, T6]: ...
+    def join[T1, T2, T3, T4, T5](self, table: TupleJoins5[T, T1, T2, T3, T4, T5]) -> IStatements[T, T1, T2, T3, T4, T5]: ...
+    @overload
+    def join[T1, T2, T3, T4, T5, T6](self, table: TupleJoins6[T, T1, T2, T3, T4, T5, T6]) -> IStatements[T, T1, T2, T3, T4, T5, T6]: ...
 
     @abstractmethod
-    def join[*FKTables](self, joins) -> IStatements[T, *FKTables]: ...
+    def join[*FKTables](
+        self,
+        table: Optional[T] = ...,
+        relation: Optional[WhereCondition[T, FKTables]] = ...,
+        join_type: Optional[JoinType] = ...,
+    ) -> IStatements[T, *FKTables]: ...
 
     # endregion
     # region select

{ormlambda-2.9.4 → ormlambda-2.10.0}/src/ormlambda/databases/my_sql/statements.py

@@ -184,13 +184,24 @@ class MySQLStatements[T: Table, *Ts](AbstractSQLStatements[T, *Ts, MySQLConnecti
         return func.Sum[T](self._model, column=column, alias=alias, alias_name=alias_name)
 
     @override
-    def join[*FKTables](self, joins) -> IStatements_two_generic[T, *FKTables, MySQLConnection]:
-        if not isinstance(joins[0], tuple):
-            joins = (joins,)
+    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 in joins:
+
+        for table, where, by in joins:
             new_tables.append(table)
-            join_query = JoinSelector[T, type(table)](self._model, table, by=JoinType.INNER_JOIN, where=where)
+            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
@@ -217,7 +228,7 @@ class MySQLStatements[T: Table, *Ts](AbstractSQLStatements[T, *Ts, MySQLConnecti
         self._query_list["select"].append(select)
 
         self._query: str = self._build()
-        
+
         if flavour:
             result = self._return_flavour(self.query, flavour, select, **kwargs)
             if issubclass(flavour, tuple) and isinstance(selector(*self._models), property):