ormlambda 3.34.5__py3-none-any.whl → 3.34.7__py3-none-any.whl

ormlambda/dialects/mysql/__init__.py

@@ -1,8 +1,84 @@
 from . import base
 from . import mysqlconnector
 
-# default dialect
-base.dialect = dialect = mysqlconnector.dialect
+from .base import BIGINT
+from .base import BINARY
+from .base import BIT
+from .base import BLOB
+from .base import BOOLEAN
+from .base import CHAR
+from .base import DATE
+from .base import DATETIME
+from .base import DECIMAL
+from .base import DOUBLE
+from .base import FLOAT
+from .base import INTEGER
+from .base import LONGBLOB
+from .base import LONGTEXT
+from .base import MEDIUMBLOB
+from .base import MEDIUMINT
+from .base import MEDIUMTEXT
+from .base import NCHAR
+from .base import NUMERIC
+from .base import NVARCHAR
+from .base import REAL
+from .base import SMALLINT
+from .base import TEXT
+from .base import TIME
+from .base import TIMESTAMP
+from .base import TINYBLOB
+from .base import TINYINT
+from .base import TINYTEXT
+from .base import VARBINARY
+from .base import VARCHAR
+from .base import YEAR
+
+
 
+__all__ = (
+    "BIGINT",
+    "BINARY",
+    "BIT",
+    "BLOB",
+    "BOOLEAN",
+    "CHAR",
+    "DATE",
+    "DATETIME",
+    "DECIMAL",
+    "DOUBLE",
+    "ENUM",
+    "FLOAT",
+    "INET4",
+    "INET6",
+    "INTEGER",
+    "INTEGER",
+    "JSON",
+    "LONGBLOB",
+    "LONGTEXT",
+    "MEDIUMBLOB",
+    "MEDIUMINT",
+    "MEDIUMTEXT",
+    "NCHAR",
+    "NVARCHAR",
+    "NUMERIC",
+    "SET",
+    "SMALLINT",
+    "REAL",
+    "TEXT",
+    "TIME",
+    "TIMESTAMP",
+    "TINYBLOB",
+    "TINYINT",
+    "TINYTEXT",
+    "VARBINARY",
+    "VARCHAR",
+    "YEAR",
+    "dialect",
+    "insert",
+    "Insert",
+    "match",
+)
 
-from .types import *  # noqa: F403
+
+# default dialect
+base.dialect = dialect = mysqlconnector.dialect

ormlambda/dialects/mysql/base.py

@@ -46,6 +46,7 @@ from ormlambda.sql.sqltypes import (
     DATE,
     UUID,
     VARBINARY,
+    BINARY,
 )
 
 

ormlambda/sql/clauses/new_join.py

@@ -0,0 +1,119 @@
+from __future__ import annotations
+from collections import defaultdict
+from typing import override, Optional, TYPE_CHECKING, Type
+
+
+from ormlambda.util.module_tree.dfs_traversal import DFSTraversal
+from ormlambda.common.interfaces.IQueryCommand import IQuery
+from ormlambda import JoinType
+from ormlambda.sql.clause_info import ClauseInfo
+from ormlambda.sql.comparer import Comparer
+from ormlambda.sql.elements import ClauseElement
+
+
+# TODOL [x]: Try to import Table module without circular import Error
+if TYPE_CHECKING:
+    from ormlambda.dialects import Dialect
+
+
+class Join(ClauseElement):
+    __visit_name__ = "join"
+    __slots__: tuple = (
+        "comparer",
+        "alias",
+        "from_clause",
+        "left_clause",
+        "right_clause",
+        "by",
+        "_dialect",
+    )
+
+    DEFAULT_TABLE: str = "{table}"
+
+    @override
+    def __repr__(self) -> str:
+        return f"{IQuery.__name__}: {self.query(self._dialect)}"
+
+    def __init__(
+        self,
+        comparer: Comparer,
+        right_alias: Optional[str] = DEFAULT_TABLE,
+        left_alias: Optional[str] = DEFAULT_TABLE,
+        by: JoinType = JoinType.LEFT_EXCLUSIVE,
+        *,
+        dialect: Dialect,
+        **kw,
+    ) -> None:
+        self.comparer = comparer
+        self._dialect = dialect
+        self.by = by
+
+        # COMMENT: When multiple columns reference the same table, we need to create an alias to maintain clear references.
+        self.alias: Optional[str] = right_alias
+        self.left_clause: ClauseInfo = comparer.left_condition(dialect)
+        self.left_clause.alias_table = left_alias if left_alias is not None else self.DEFAULT_TABLE
+
+        self.right_clause: ClauseInfo = comparer.right_condition(dialect)
+        self.right_clause.alias_table = right_alias if right_alias is not None else self.DEFAULT_TABLE
+        self.from_clause = ClauseInfo(self.right_clause.table, None, alias_table=self.alias, dialect=dialect)
+
+    def __eq__(self, __value: Join) -> bool:
+        return isinstance(__value, Join) and self.__hash__() == __value.__hash__()
+
+    def __hash__(self) -> int:
+        return hash(
+            (
+                self.by,
+                self.left_clause.query(self._dialect),
+                self.right_clause.query(self._dialect),
+                self.from_clause.query(self._dialect),
+            )
+        )
+
+    @classmethod
+    def join_selectors(cls, dialect: Dialect, *args: Join) -> str:
+        return "\n".join([x.query(dialect) for x in args])
+
+    def query(self, dialect: Dialect) -> str:
+        list_ = [
+            self.by.value,  # inner join
+            self.from_clause.query(dialect),
+            "ON",
+            self.left_clause.query(dialect),
+            "=",
+            self.right_clause.query(dialect),
+        ]
+        return " ".join([x for x in list_ if x is not None])
+
+    @classmethod
+    def sort_join_selectors(cls, joins: set[Join]) -> tuple[Join]:
+        # FIXME [x]: How to sort when needed because it's not necessary at this point. It is for testing purpouse
+        if len(joins) == 1:
+            return tuple(joins)
+
+        # create graph and sort it using 'Depth First Search' algorithm
+        graph: dict[str, list[str]] = defaultdict(list)
+        for join in joins:
+            graph[join.left_clause.alias_table].append(join.right_clause.alias_table)
+
+        sorted_graph = DFSTraversal.sort(graph)[::-1]
+
+        if not sorted_graph:
+            return tuple(joins)
+
+        # Mapped Join class using his unique alias
+        join_object_map: dict[str, Join] = {}
+        for obj in joins:
+            join_object_map[obj.alias] = obj
+
+        res = []
+        for table in sorted_graph:
+            tables = join_object_map.get(table, None)
+
+            if not tables:
+                continue
+            res.append(tables)
+        return res
+
+
+__all__ = ["Join"]

ormlambda/sql/sqltypes.py

@@ -561,6 +561,12 @@ class BLOB(LargeBinary):
     __visit_name__ = "BLOB"
 
 
+class BINARY(_Binary):
+    """The SQL BINARY type."""
+
+    __visit_name__ = "BINARY"
+
+
 class VARCHAR(String):
     __visit_name__ = "VARCHAR"
 

ormlambda/sql/table/table.py

@@ -159,14 +159,10 @@ class Table(metaclass=TableMeta):
         return [ForeignKey.MAPPED[x].table_object for x in order_table]
 
     def __eq__(self, __value: Any) -> bool:
-        if isinstance(__value, Table):
-            return all(
-                (
-                    self.__table_name__ == __value.__table_name__,
-                    tuple(self.to_dict().items()),
-                )
-            )
-        return False
+        return hash(self) == hash(__value)
+
+    def __hash__(self):
+        return hash((self.__table_name__, *list(self.to_dict().items())))
 
     @classmethod
     def table_alias(cls, column: Optional[str] = None) -> str:

{ormlambda-3.34.5.dist-info → ormlambda-3.34.7.dist-info}/METADATA

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

@@ -60,8 +60,8 @@ ormlambda/dialects/default/__init__.py,sha256=N1B0LKEDu7r2-mTF9mBA4ReyhYeDuJDnbQ
 ormlambda/dialects/default/base.py,sha256=rmK-nV5luN2lphSgisM8TBy3s4JXVgvZa79ATHeVOuU,1088
 ormlambda/dialects/interface/__init__.py,sha256=IbB5o6ae7XNVVfNt4uqZRZcVK9HHG6eLLK_E0J99kwY,43
 ormlambda/dialects/interface/dialect.py,sha256=z47GXCi-uJ6Oq7Zm64OHM0q61T3xWCss-uGdcuuXng0,2810
-ormlambda/dialects/mysql/__init__.py,sha256=y4gh32agzxxpjuC6x3oKEuCJYBwMYYuvJ-xxBS1rbv4,152
-ormlambda/dialects/mysql/base.py,sha256=p_nqbUGy_-iNF8vPB1psGKHEjY8_TSMz30xemVns82I,14523
+ormlambda/dialects/mysql/__init__.py,sha256=1yAEM2MDcp56eSv1MrbtuDVQ5d_EzQ0S7ztSXKVS-eo,1511
+ormlambda/dialects/mysql/base.py,sha256=drHxKpFVVJPWy82rWSD2rFKvQ-GN8imoDmp3_ou4hcw,14535
 ormlambda/dialects/mysql/mysqlconnector.py,sha256=DOjK7U7LOhjuVQJULzAV8xaRGX0OlBU8APUeRiTcbDY,1378
 ormlambda/dialects/mysql/types.py,sha256=ZQ75KyUwmNAt48F48CeIiMHgQjO0JeDXrksrrss2ILg,23537
 ormlambda/dialects/sqlite/__init__.py,sha256=2EMmxD7ORtGoD18GJ_9aC_tPutAq9ormMZJmaJ5nkYA,103
@@ -107,6 +107,7 @@ ormlambda/sql/clauses/join/__init__.py,sha256=7hwAB-nKaMirTT6uNZ1JtYNkkIx5zMSa6j
 ormlambda/sql/clauses/join/join_context.py,sha256=69R_X_RoWO2kXPgJ94Wck6s-sJjTIqFXpOifmLsYC9c,3497
 ormlambda/sql/clauses/joins.py,sha256=w0c_uHNe3BNqL9-rAdQaAFeM6ExJXTNENG_sO7I2HWI,5505
 ormlambda/sql/clauses/limit.py,sha256=NX9qUp_8Zd-0myZ80PhD2tbF72N5jsx_SaYakf7lNbU,345
+ormlambda/sql/clauses/new_join.py,sha256=e-tLvSQJJpTEQURYgLLoKZ6TrVsY8xGphBnqlEGg76A,3859
 ormlambda/sql/clauses/offset.py,sha256=FibzDho7Bc1UQchrPHjOakW_0BfZVupbuI62lHoha94,350
 ormlambda/sql/clauses/order.py,sha256=qOcz2T0NQNY0H7vt-jbvBRjTy3X5Lw-kGSuISTGfAPA,1609
 ormlambda/sql/clauses/select.py,sha256=gJfTqTCi32Knyp-rox_qo-JeoVYr6YWTEPl9FF8FsFg,1670
@@ -126,10 +127,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=pPv3jg7Anwo1sFFHFtynPD-5eafm-Ww7HkiXSiPvIno,14246
+ormlambda/sql/sqltypes.py,sha256=1Ir_Wxz1VjnNOh2zzIf7P7w4tbY0ljlubZMoAEiUkYU,14333
 ormlambda/sql/table/__init__.py,sha256=LLZcMLjwFxgBCPhdm5UQYYZDIbtYWCKPO9CbcXsy5zI,50
 ormlambda/sql/table/fields.py,sha256=ovNR3bJ473aKW-2NhbKr0iJlVpgW06jurHLob2IyZU8,2116
-ormlambda/sql/table/table.py,sha256=U8ByMDEEXIOwfPykDcjzoyNV1WEieN40Zk18EXveX60,6594
+ormlambda/sql/table/table.py,sha256=l_oXhTHid09IaG-eapBxZTdaNrWCVgGHWLDHnIrrEqY,6484
 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
@@ -150,8 +151,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.34.5.dist-info/AUTHORS,sha256=uWpOHaCPTOLbVkk5x9McoLwbgzSeCg7yILeDRyMGWGM,606
-ormlambda-3.34.5.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
-ormlambda-3.34.5.dist-info/METADATA,sha256=WRnB6oou1Q5bTlD2OCJ6vZvNrBi7_Gmrnm1wH-mkd90,13326
-ormlambda-3.34.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ormlambda-3.34.5.dist-info/RECORD,,
+ormlambda-3.34.7.dist-info/AUTHORS,sha256=uWpOHaCPTOLbVkk5x9McoLwbgzSeCg7yILeDRyMGWGM,606
+ormlambda-3.34.7.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
+ormlambda-3.34.7.dist-info/METADATA,sha256=KY00nCr8bLYuTDA0h70RF6PeYZ2Kt-NOcN3Nd5UfR18,13326
+ormlambda-3.34.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ormlambda-3.34.7.dist-info/RECORD,,