ormlambda 4.0.5__tar.gz → 4.4.4__tar.gz

{ormlambda-4.0.5 → ormlambda-4.4.4}/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: ormlambda
-Version: 4.0.5
+Version: 4.4.4
 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

{ormlambda-4.0.5 → ormlambda-4.4.4}/pyproject.toml

@@ -1,9 +1,6 @@
-[tool.ruff]
-line-length = 320
-
 [tool.poetry]
 name = "ormlambda"
-version = "4.0.5"
+version = "4.4.4"
 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"
@@ -21,8 +18,27 @@ ruff = "^0.4.5"
 parameterized = "^0.9.0"
 pydantic = "^2.11.1"
 sqlserver = "^0.0.17.1"
+pytest = "^8.4.2"
+
+[tool.ruff]
+line-length = 320
 
+[tool.pytest.ini_options]
+testpaths = ["src/test"]
+python_files = ["test_*.py"]
+python_classes = ["Test*"]
+python_functions = ["test_*"]
+addopts = [
+    "-v",                    # verbose output
+    "--strict-markers",      # error on unknown markers
+    "--tb=short",           # shorter traceback format
+]
+
+markers = [
+    "slow: Slow test (deselect with '-m \"not slow\"')",
+]
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+

{ormlambda-4.0.5 → ormlambda-4.4.4}/src/ormlambda/__init__.py

@@ -62,7 +62,6 @@ from .sql.sqltypes import POINT as POINT
 
 
 from .sql.clauses import Alias as Alias
-from .sql.clauses import Count as Count
 from .sql.clauses import Delete as Delete
 from .sql.clauses import GroupBy as GroupBy
 from .sql.clauses import Insert as Insert
@@ -76,12 +75,21 @@ from .sql.clauses import Having as Having
 from .sql.clauses import Update as Update
 from .sql.clauses import Upsert as Upsert
 
-from .sql.functions import Max as Max
-from .sql.functions import Min as Min
-from .sql.functions import Concat as Concat
-from .sql.functions import Sum as Sum
-
+from .sql import functions as functions
 
+from .sql.functions import *  # noqa: F403
 from . import util as _util
 
+
+from .sql.column.metadata import PrimaryKey as PrimaryKey
+from .sql.column.metadata import AutoGenerated as AutoGenerated
+from .sql.column.metadata import AutoIncrement as AutoIncrement
+from .sql.column.metadata import Unique as Unique
+from .sql.column.metadata import CheckTypes as CheckTypes
+from .sql.column.metadata import Default as Default
+from .sql.column.metadata import NotNull as NotNull
+
+from ormlambda.statements.interfaces import IStatements as IStatements
+from ormlambda.engine import Engine as Engine
+
 _util.import_prefix("ormlambda")

{ormlambda-4.0.5 → ormlambda-4.4.4}/src/ormlambda/common/__init__.py

@@ -1 +1,2 @@
 from .global_checker import GlobalChecker as GlobalChecker
+from .constants import DOT as DOT

ormlambda-4.4.4/src/ormlambda/common/constants.py

@@ -0,0 +1 @@
+DOT = '.'

{ormlambda-4.0.5 → ormlambda-4.4.4}/src/ormlambda/common/enums/__init__.py

@@ -1,3 +1,4 @@
 from .join_type import JoinType  # noqa: F401
 from .condition_types import ConditionType  # noqa: F401
-from .order_type  import OrderType  # noqa: F401
+from .order_type import OrderType  # noqa: F401
+from .union_type import UnionEnum  # noqa: F401

{ormlambda-4.0.5 → ormlambda-4.4.4}/src/ormlambda/common/enums/condition_types.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 
-class ConditionType(Enum):
+class ConditionType(str, Enum):
     EQUAL = "="
     LESS_THAN = "<"
     GREATER_THAN = ">"
@@ -15,3 +15,6 @@ class ConditionType(Enum):
     NOT_IN = "NOT IN"
     IS = "IS"
     IS_NOT = "IS NOT"
+
+    def __str__(self):
+        return super().__str__()

ormlambda-4.4.4/src/ormlambda/common/enums/union_type.py

@@ -0,0 +1,9 @@
+import enum
+
+
+class UnionEnum(str, enum.Enum):
+    AND = "AND"
+    OR = "OR"
+
+    def __str__(self):
+        return super().__str__()

{ormlambda-4.0.5 → ormlambda-4.4.4}/src/ormlambda/common/errors/__init__.py

@@ -6,6 +6,7 @@ from ormlambda import util
 
 if tp.TYPE_CHECKING:
     from ormlambda.sql.clause_info import ClauseInfo
+    from ormlambda.sql import Column
 
 
 class UnmatchedLambdaParameterError(Exception):
@@ -18,16 +19,16 @@ class UnmatchedLambdaParameterError(Exception):
         return f"Unmatched number of parameters in lambda function with the number of tables: Expected {self.expected_params} parameters but found {str(self.found_param)}."
 
 
-class NotKeysInIAggregateError(Exception):
+class NotKeysInIFunctionError(Exception):
     def __init__(self, match_regex: list[str], *args: object) -> None:
         super().__init__(*args)
         self._match_regex: list[str] = match_regex
 
     def __str__(self) -> str:
-        return f"We cannot use placeholders in IAggregate class. You used {self._match_regex}"
+        return f"We cannot use placeholders in IFunction class. You used {self._match_regex}"
 
 
-class AggregateFunctionError[T](Exception):
+class FunctionFunctionError[T](Exception):
     def __init__(self, clause: ClauseInfo[T], *args):
         self.clause = clause
         super().__init__(*args)
@@ -36,18 +37,18 @@ class AggregateFunctionError[T](Exception):
         agg_methods = self.__get_all_aggregate_method(self.clause)
         return f"You cannot use aggregation method like '{agg_methods}' to return model objects. Try specifying 'flavour' attribute as 'dict'."
 
-    @util.preload_module("ormlambda.sql.clause_info")
+    @util.preload_module("ormlambda.sql.functions")
     def __get_all_aggregate_method(self, clauses: list[ClauseInfo]) -> str:
         """
-        Get the class name of those classes that inherit from 'IAggregate' class in order to create a better error message.
+        Get the class name of those classes that inherit from 'IFunction' class in order to create a better error message.
         """
 
-        IAggregate = util.preloaded.sql_clause_info.IAggregate
+        IFunction = util.preloaded.sql_functions.IFunction
         res: set[str] = set()
         if not isinstance(clauses, tp.Iterable):
             return clauses.__class__.__name__
         for clause in clauses:
-            if isinstance(clause, IAggregate):
+            if isinstance(clause, IFunction):
                 res.add(clause.__class__.__name__)
         return ", ".join(res)
 
@@ -56,5 +57,46 @@ class NotCallableError(ValueError):
     def __init__(self, *args):
         super().__init__(*args)
 
-    def __str__(self)->str:
-        return f"You must provide a function or callable to proceed with the query creation. Passed '{self.args[0].__class__.__name__}' "
+    def __str__(self) -> str:
+        return f"You must provide a function or callable to proceed with the query creation. Passed '{self.args[0].__class__.__name__}' "
+
+
+class CompileError(Exception):
+    """Exception raised for errors in the compilation process."""
+
+    def __init__(self, message):
+        super().__init__(message)
+        self.message = message
+
+    def __str__(self):
+        return f"CompileError: {self.message}"
+
+
+class NoSuchModuleError(Exception):
+    """Raised when a dynamically-loaded module (usually a database dialect)
+    of a particular name cannot be located."""
+
+    def __str__(self):
+        return f"NoSuchModuleError: {self.args[0]}"
+
+
+class DuplicatedClauseNameError(Exception):
+    def __init__(self, names: tuple[str], **kw):
+        self.names = names
+        super().__init__(**kw)
+
+    def __str__(self):
+        return f"Some clauses has the same alias. {self.names}\nTry wrapping the clause with the 'Alias' class first or setting 'avoid_duplicates' param as 'True'"
+
+
+class ColumnError(ValueError):
+    def __init__(self, column: Column, *args):
+        super().__init__(*args)
+        self.column = column
+        self.clause: str = ""
+
+    def set_clause(self, value: str) -> None:
+        self.clause = value
+
+    def __str__(self):
+        return f"The column '{self.column.column_name}' does not exist. Check the name you used inside of '{self.clause}' clause."

{ormlambda-4.0.5 → ormlambda-4.4.4}/src/ormlambda/common/global_checker.py

@@ -29,7 +29,7 @@ class GlobalChecker[T: TableProxy]:
         try:
             table_proxy = TableProxy(table)
 
-            if not callable(lambda_func): 
+            if not callable(lambda_func):
                 raise NotCallableError(lambda_func)
 
             if isinstance(lambda_func, Iterable):

{ormlambda-4.0.5 → ormlambda-4.4.4}/src/ormlambda/common/interfaces/__init__.py

@@ -1,3 +1,2 @@
 from .IJoinSelector import IJoinSelector as IJoinSelector
-from .INonQueryCommand import INonQueryCommand as INonQueryCommand
 from .IQueryCommand import IQuery as IQuery