ormlambda 4.0.4__tar.gz → 4.0.5__tar.gz

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

@@ -1,12 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: ormlambda
-Version: 4.0.4
+Version: 4.0.5
 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.4 → ormlambda-4.0.5}/pyproject.toml

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

@@ -3,13 +3,14 @@ from typing import Callable, Optional, Type, TYPE_CHECKING, ClassVar
 import abc
 from ormlambda import util
 import importlib
+from ormlambda import BaseRepository
 
 
 if TYPE_CHECKING:
+    from ormlambda import URL
     from ormlambda.caster.caster import Caster
     from ormlambda.repository.interfaces.IRepositoryBase import DBAPIConnection
     from ormlambda.sql.types import DDLCompiler, SQLCompiler, TypeCompiler
-    from ormlambda import BaseRepository
 
 
 class Dialect(abc.ABC):
@@ -57,15 +58,21 @@ class Dialect(abc.ABC):
     type_compiler_instance: ClassVar[TypeCompiler]
     """The instance of the type compiler class used by the dialect."""
 
-    repository_cls: ClassVar[Type[BaseRepository]]
-    """The repository class used by the dialect."""
-
     caster: ClassVar[Type[Caster]]
 
     @classmethod
     def get_dialect_cls(cls) -> Type[Dialect]:
         return cls
 
+    @classmethod
+    @abc.abstractmethod
+    def get_pool_class(cls, url: URL) -> Type[BaseRepository]: ...
+
+    @abc.abstractmethod
+    def get_dialect_pool_class(self, url: str) -> None:
+        """Validates an identifier name, raising an exception if invalid"""
+        ...
+
     @classmethod
     @abc.abstractmethod
     def import_dbapi(cls) -> DBAPIConnection:

{ormlambda-4.0.4 → ormlambda-4.0.5}/src/ormlambda/dialects/default/base.py

@@ -2,7 +2,6 @@ from ormlambda.dialects import Dialect
 from ormlambda.sql import compiler
 from typing import Optional, Any
 from types import ModuleType
-from ormlambda import BaseRepository
 
 
 class DefaultDialect(Dialect):
@@ -11,7 +10,6 @@ class DefaultDialect(Dialect):
     statement_compiler = compiler.SQLCompiler
     ddl_compiler = compiler.DDLCompiler
     type_compiler_cls = compiler.GenericTypeCompiler
-    repository_cls = BaseRepository
     default_paramstyle = "named"
 
     def __init__(
@@ -37,3 +35,6 @@ class DefaultDialect(Dialect):
         self.type_compiler_instance = self.type_compiler = tt_callable(self)
 
         super().__init__(**kwargs)
+
+    def get_dialect_pool_class(self, url):
+        return self.get_pool_class(url)

{ormlambda-4.0.4 → ormlambda-4.0.5}/src/ormlambda/dialects/mysql/base.py

@@ -627,7 +627,6 @@ class MySQLDialect(default.DefaultDialect):
     statement_compiler = MySQLCompiler
     ddl_compiler = MySQLDDLCompiler
     type_compiler_cls = MySQLTypeCompiler
-    repository_cls = MySQLRepository
     caster = MySQLCaster
 
     def __init__(self, **kwargs):
@@ -638,3 +637,7 @@ class MySQLDialect(default.DefaultDialect):
         from mysql import connector
 
         return connector
+
+    @classmethod
+    def get_pool_class(cls, url):
+        return MySQLRepository

{ormlambda-4.0.4 → ormlambda-4.0.5}/src/ormlambda/engine/base.py

@@ -3,6 +3,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO, Literal, Optional, TextIO
 from ormlambda.engine import url
 from ormlambda.sql.ddl import CreateSchema, DropSchema, CreateBackup
+from ormlambda import BaseRepository
 
 if TYPE_CHECKING:
     from ormlambda.dialects import Dialect
@@ -11,10 +12,10 @@ type TypeExists = Literal["fail", "replace", "append"]
 
 
 class Engine:
-    def __init__(self, dialect: Dialect, url: url.URL):
+    def __init__(self, repository: BaseRepository, dialect: Dialect, url: url.URL):
+        self.repository = repository
         self.dialect = dialect
         self.url = url
-        self.repository = self.dialect.repository_cls(url, dialect=dialect)
 
     def __repr__(self):
         return f"{Engine.__name__}: {self.url}"
@@ -78,3 +79,15 @@ class Engine:
             )
             .string
         )
+
+    @property
+    def engine(self) -> Engine:
+        return self
+
+    @property
+    def driver(self) -> str:
+        return self.dialect.driver
+
+    @property
+    def name(self) -> str:
+        return self.dialect.name

{ormlambda-4.0.4 → ormlambda-4.0.5}/src/ormlambda/engine/create.py

@@ -18,4 +18,9 @@ def create_engine(url: URL | str, **kwargs: Any) -> base.Engine:
     dialect_args["dbapi"] = dialect_cls.import_dbapi()
 
     dialect = dialect_cls(**dialect_args)
-    return base.Engine(dialect, u)
+
+    repositoryclass = dialect.get_dialect_pool_class(u)
+
+    repository_args = {"dialect": dialect, **kwargs}
+    repository = repositoryclass(u, **repository_args)
+    return base.Engine(repository, dialect, u)

{ormlambda-4.0.4 → ormlambda-4.0.5}/src/ormlambda/repository/base_repository.py

@@ -42,3 +42,7 @@ class BaseRepository[TPool](IRepositoryBase):
 
     @abc.abstractmethod
     def get_connection[TCnx](self) -> Generator[TCnx, None, None]: ...
+
+    @property
+    def pool(self) -> TPool:
+        return self._pool