ormlambda 2.6.0__py3-none-any.whl → 2.6.1__py3-none-any.whl

ormlambda/common/interfaces/IRepositoryBase.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Any, Literal, Optional, Type
+from typing import Literal, Optional, Type
 
 TypeExists = Literal["fail", "replace", "append"]
 
@@ -8,15 +8,6 @@ class IRepositoryBase[T](ABC):
     def __repr__(self) -> str:
         return f"{IRepositoryBase.__name__}: {self.__class__.__name__}"
 
-    @abstractmethod
-    def is_connected(self) -> bool: ...
-
-    @abstractmethod
-    def connect(self, **kwargs: Any) -> None: ...
-
-    @abstractmethod
-    def close_connection(self) -> None: ...
-
     @abstractmethod
     def read_sql[TFlavour](self, query: str, flavour: Optional[Type[TFlavour]], **kwargs) -> tuple[TFlavour]: ...
 

ormlambda/databases/my_sql/repository.py

@@ -77,45 +77,27 @@ class Response[TFlavour, *Ts]:
 class MySQLRepository(IRepositoryBase[MySQLConnection]):
     def get_connection(func: Callable[..., Any]):
         @functools.wraps(func)
-        def wrapper(self: IRepositoryBase[MySQLConnection], *args, **kwargs):
-            self.connect()
-            try:
-                foo = func(self, *args, **kwargs)
-            except Exception as e:
-                self.connection.rollback()
-                raise e
-            finally:
-                self.close_connection()
-            return foo
+        def wrapper(self: MySQLRepository, *args, **kwargs):
+            with self._pool.get_connection() as cnx:
+                try:
+                    foo = func(self, cnx, *args, **kwargs)
+                    return foo
+                except Exception as e:
+                    self.connection.rollback()
+                    raise e
 
         return wrapper
 
     def __init__(self, **kwargs: Any) -> None:
         self._data_config: dict[str, Any] = kwargs
         self._pool: MySQLConnectionPool = self.__create_MySQLConnectionPool()
-        self._connection: PooledMySQLConnection = None
 
     def __create_MySQLConnectionPool(self):
         return MySQLConnectionPool(pool_name="mypool", pool_size=10, **self._data_config)
 
-    @override
-    def is_connected(self) -> bool:
-        return self._connection._cnx is not None if self._connection else False
-
-    @override
-    def connect(self) -> None:
-        self._connection = self._pool.get_connection()
-        return None
-
-    @override
-    def close_connection(self) -> None:
-        if self.is_connected():
-            self._connection.close()
-        return None
-
     @override
     @get_connection
-    def read_sql[TFlavour](self, query: str, flavour: Type[TFlavour] = tuple, **kwargs) -> tuple[TFlavour]:
+    def read_sql[TFlavour](self, cnx: MySQLConnection, query: str, flavour: Type[TFlavour] = tuple, **kwargs) -> tuple[TFlavour]:
         """
         Return tuple of tuples by default.
 
@@ -125,7 +107,7 @@ class MySQLRepository(IRepositoryBase[MySQLConnection]):
             - flavour: Type[TFlavour]: Useful to return tuple of any Iterable type as dict,set,list...
         """
 
-        with self._connection._cnx.cursor(buffered=True) as cursor:
+        with cnx.cursor(buffered=True) as cursor:
             cursor.execute(query)
             values: list[tuple] = cursor.fetchall()
             columns: tuple[str] = cursor.column_names
@@ -133,7 +115,7 @@ class MySQLRepository(IRepositoryBase[MySQLConnection]):
 
     # FIXME [ ]: this method does not comply with the implemented interface
     @get_connection
-    def create_tables_code_first(self, path: str | Path) -> None:
+    def create_tables_code_first(self, cnx: MySQLConnection, path: str | Path) -> None:
         if not isinstance(path, Path | str):
             raise ValueError
 
@@ -148,33 +130,33 @@ class MySQLRepository(IRepositoryBase[MySQLConnection]):
         queries_list: list[str] = module_tree.get_queries()
 
         for query in queries_list:
-            with self._connection._cnx.cursor(buffered=True) as cursor:
+            with cnx.cursor(buffered=True) as cursor:
                 cursor.execute(query)
-        self._connection._cnx.commit()
+        cnx.commit()
         return None
 
     @override
     @get_connection
-    def executemany_with_values(self, query: str, values) -> None:
-        with self._connection._cnx.cursor(buffered=True) as cursor:
+    def executemany_with_values(self, cnx: MySQLConnection, query: str, values) -> None:
+        with cnx.cursor(buffered=True) as cursor:
             cursor.executemany(query, values)
-        self._connection._cnx.commit()
+        cnx.commit()
         return None
 
     @override
     @get_connection
-    def execute_with_values(self, query: str, values) -> None:
-        with self._connection._cnx.cursor(buffered=True) as cursor:
+    def execute_with_values(self, cnx: MySQLConnection, query: str, values) -> None:
+        with cnx.cursor(buffered=True) as cursor:
             cursor.execute(query, values)
-        self._connection._cnx.commit()
+        cnx.commit()
         return None
 
     @override
     @get_connection
-    def execute(self, query: str) -> None:
-        with self._connection._cnx.cursor(buffered=True) as cursor:
+    def execute(self, cnx: MySQLConnection, query: str) -> None:
+        with cnx.cursor(buffered=True) as cursor:
             cursor.execute(query)
-        self._connection._cnx.commit()
+        cnx.commit()
         return None
 
     @override
@@ -183,9 +165,9 @@ class MySQLRepository(IRepositoryBase[MySQLConnection]):
 
     @override
     @get_connection
-    def database_exists(self, name: str) -> bool:
+    def database_exists(self, cnx: MySQLConnection, name: str) -> bool:
         query = "SHOW DATABASES LIKE %s;"
-        with self._connection._cnx.cursor(buffered=True) as cursor:
+        with cnx.cursor(buffered=True) as cursor:
             cursor.execute(query, (name,))
             res = cursor.fetchmany(1)
         return len(res) > 0
@@ -196,12 +178,12 @@ class MySQLRepository(IRepositoryBase[MySQLConnection]):
 
     @override
     @get_connection
-    def table_exists(self, name: str) -> bool:
-        if not self._connection._cnx.database:
+    def table_exists(self, cnx: MySQLConnection, name: str) -> bool:
+        if not cnx.database:
             raise Exception("No database selected")
 
         query = "SHOW TABLES LIKE %s;"
-        with self._connection._cnx.cursor(buffered=True) as cursor:
+        with cnx.cursor(buffered=True) as cursor:
             cursor.execute(query, (name,))
             res = cursor.fetchmany(1)
         return len(res) > 0

{ormlambda-2.6.0.dist-info → ormlambda-2.6.1.dist-info}/METADATA

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

@@ -12,7 +12,7 @@ ormlambda/common/interfaces/IAggregate.py,sha256=i9zZIYrstP2oolUYqR-udeQQl7M0NwS
 ormlambda/common/interfaces/IDecompositionQuery.py,sha256=VwZdYhVApNyGrWgqr27mRMOxREMb6Xv-oYtW_0c2D2g,1365
 ormlambda/common/interfaces/INonQueryCommand.py,sha256=7CjLW4sKqkR5zUIGvhRXOtzTs6vypJW1a9EJHlgCw2c,260
 ormlambda/common/interfaces/IQueryCommand.py,sha256=hfzCosK4-n8RJIb2PYs8b0qU3TNmfYluZXBf47KxxKs,331
-ormlambda/common/interfaces/IRepositoryBase.py,sha256=iWZ9X2qjvacZHdbykrE5wAMyi-4LJLKcNvtNTGD6S-8,1398
+ormlambda/common/interfaces/IRepositoryBase.py,sha256=jIwQ6c_eadf3K7dyvBf88kTIb6AqIsIYBc2aJ90RS0I,1196
 ormlambda/common/interfaces/IStatements.py,sha256=zsjR6JnQ57M6GPGRqAXkuuwZx6fh3Mq6NB4D6gWw-3w,10028
 ormlambda/common/interfaces/__init__.py,sha256=00ca9a-u_A8DzyEyxPfBMxfqLKFzzUgJaeNmoRitAbA,360
 ormlambda/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -51,7 +51,7 @@ ormlambda/databases/my_sql/functions/__init__.py,sha256=jUFHlFc04UAPht65GlEkLXa5
 ormlambda/databases/my_sql/functions/concat.py,sha256=cZztl5eSATpYMKVKfyPbul6OocaUkaEGpt3uWmhf-3o,1177
 ormlambda/databases/my_sql/functions/group_by.py,sha256=ym1L6RBA70hmzrkJ-IA_-6Esq7eoVgNdf1vWpqxRq-8,1080
 ormlambda/databases/my_sql/functions/max.py,sha256=zrO_RBKsHhyokEmSpPI6Yg5OY6Jf4GGp2RveBJdOuuA,1190
-ormlambda/databases/my_sql/repository.py,sha256=3IQX8z6g5N1e7FVFCr-kEnKoi_E_N3aCQ_MA5q_bHnc,7566
+ormlambda/databases/my_sql/repository.py,sha256=KltLdpWFiPaHKFOVcefy3pQ0g_pBFsUVlpBFV7CGEEk,7034
 ormlambda/databases/my_sql/statements.py,sha256=4o1NguIiNOVA9i8hqaUMJdIfgn1MvXnnJhJABKPJtF0,9660
 ormlambda/model_base.py,sha256=RrAATQWX_bHJ0ZQ5sCHyJKA4NiR7ZJY4I6dqhnGWWAc,1216
 ormlambda/utils/__init__.py,sha256=ywMdWqmA2jHj19-W-S04yfaYF5hv4IZ1lZDq0B8Jnjs,142
@@ -69,7 +69,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=8Apm44K6MiYMK3PQyK74MUV18OatbFI9eDLAVklQO0w,11660
-ormlambda-2.6.0.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
-ormlambda-2.6.0.dist-info/METADATA,sha256=HtLgvKuUEcQqDadfokBM0qyxTjTUSNOoErjtJ3aMdGk,8428
-ormlambda-2.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ormlambda-2.6.0.dist-info/RECORD,,
+ormlambda-2.6.1.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
+ormlambda-2.6.1.dist-info/METADATA,sha256=OUhV3mP2xqwH75LftvCqJis1Kmx00sBUnazCPG5DrOQ,8428
+ormlambda-2.6.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ormlambda-2.6.1.dist-info/RECORD,,