database-wrapper 0.1.38__py3-none-any.whl → 0.1.42__py3-none-any.whl

database_wrapper/config.py

@@ -3,7 +3,7 @@ from typing import Any
 CONFIG: dict[str, Any] = {
     # These are supposed to be set automatically by a git pre-compile script
     # They are one git commit hash behind, if used automatically
-    "git_commit_hash": "5160789e2c4bdb5815a162e04dca5392b820c3f5",
-    "git_commit_date": "11.11.2024 22:26",
-    "app_version": "0.1.38",
+    "git_commit_hash": "365f062181488aa4bd2f56e694fce6b26a113b1b",
+    "git_commit_date": "15.11.2024 02:01",
+    "app_version": "0.1.42",
 }

database_wrapper/db_wrapper.py

@@ -42,7 +42,14 @@ class DBWrapper(DBWrapperMixin):
         Returns:
             The created cursor object.
         """
-        assert self.db is not None, "Database connection is not set"
+        if self.db is None and self.dbConn is None:
+            raise ValueError(
+                "Database object and connection is not properly initialized"
+            )
+
+        if self.dbConn is not None:
+            return self.dbConn.cursor()
+
         return self.db.cursor
 
     #####################
@@ -65,12 +72,7 @@ class DBWrapper(DBWrapperMixin):
         Returns:
             DataModelType | None: The result of the query.
         """
-        # Query and filter
-        _query = (
-            customQuery
-            or emptyDataClass.queryBase()
-            or self.filterQuery(emptyDataClass.schemaName, emptyDataClass.tableName)
-        )
+        # Figure out the id key and value
         idKey = emptyDataClass.idKey
         idValue = emptyDataClass.id
         if not idKey:
@@ -78,32 +80,12 @@ class DBWrapper(DBWrapperMixin):
         if not idValue:
             raise ValueError("Id value is not set")
 
-        _filter = f"WHERE {self.makeIdentifier(emptyDataClass.tableAlias, idKey)} = %s"
-        _params = (idValue,)
-
-        # Create a SQL object for the query and format it
-        querySql = self._formatFilterQuery(_query, _filter, None, None)
-
-        # Create a new cursor
-        newCursor = self.createCursor(emptyDataClass)
-
-        # Log
-        self.logQuery(newCursor, querySql, _params)
-
-        # Load data
-        try:
-            newCursor.execute(querySql, _params)
-
-            # Fetch one row
-            row = newCursor.fetchone()
-            if row is None:
-                return
-
-            # Turn data into model
-            return self.turnDataIntoModel(emptyDataClass, row)
-        finally:
-            # Close the cursor
-            newCursor.close()
+        # Get the record
+        res = self.getAll(
+            emptyDataClass, idKey, idValue, limit=1, customQuery=customQuery
+        )
+        for row in res:
+            return row
 
     def getByKey(
         self,
@@ -124,39 +106,12 @@ class DBWrapper(DBWrapperMixin):
         Returns:
             DataModelType | None: The result of the query.
         """
-        # Query and filter
-        _query = (
-            customQuery
-            or emptyDataClass.queryBase()
-            or self.filterQuery(emptyDataClass.schemaName, emptyDataClass.tableName)
+        # Get the record
+        res = self.getAll(
+            emptyDataClass, idKey, idValue, limit=1, customQuery=customQuery
         )
-        _filter = f"WHERE {self.makeIdentifier(emptyDataClass.tableAlias, idKey)} = %s"
-        _params = (idValue,)
-
-        # Create a SQL object for the query and format it
-        querySql = self._formatFilterQuery(_query, _filter, None, None)
-
-        # Create a new cursor
-        newCursor = self.createCursor(emptyDataClass)
-
-        # Log
-        self.logQuery(newCursor, querySql, _params)
-
-        # Load data
-        try:
-            newCursor.execute(querySql, _params)
-
-            # Fetch one row
-            row = newCursor.fetchone()
-            if row is None:
-                return
-
-            # Turn data into model
-            return self.turnDataIntoModel(emptyDataClass, row)
-
-        finally:
-            # Close the cursor
-            newCursor.close()
+        for row in res:
+            return row
 
     def getAll(
         self,
@@ -191,11 +146,10 @@ class DBWrapper(DBWrapperMixin):
         )
         _params: tuple[Any, ...] = ()
         _filter = ""
+
+        # TODO: Rewrite this so that filter method with loop is not used here
         if idKey and idValue:
-            _filter = (
-                f"WHERE {self.makeIdentifier(emptyDataClass.tableAlias, idKey)} = %s"
-            )
-            _params = (idValue,)
+            (_filter, _params) = self.createFilter({idKey: idValue})
 
         # Order and limit
         _order = self.orderQuery(orderBy)

database_wrapper/db_wrapper_async.py

@@ -66,12 +66,7 @@ class DBWrapperAsync(DBWrapperMixin):
         Returns:
             DataModelType | None: The result of the query.
         """
-        # Query and filter
-        _query = (
-            customQuery
-            or emptyDataClass.queryBase()
-            or self.filterQuery(emptyDataClass.schemaName, emptyDataClass.tableName)
-        )
+        # Figure out the id key and value
         idKey = emptyDataClass.idKey
         idValue = emptyDataClass.id
         if not idKey:
@@ -79,32 +74,12 @@ class DBWrapperAsync(DBWrapperMixin):
         if not idValue:
             raise ValueError("Id value is not set")
 
-        _filter = f"WHERE {self.makeIdentifier(emptyDataClass.tableAlias, idKey)} = %s"
-        _params = (idValue,)
-
-        # Create a SQL object for the query and format it
-        querySql = self._formatFilterQuery(_query, _filter, None, None)
-
-        # Create a new cursor
-        newCursor = await self.createCursor(emptyDataClass)
-
-        # Log
-        self.logQuery(newCursor, querySql, _params)
-
-        # Load data
-        try:
-            await newCursor.execute(querySql, _params)
-
-            # Fetch one row
-            row = await newCursor.fetchone()
-            if row is None:
-                return
-
-            # Turn data into model
-            return self.turnDataIntoModel(emptyDataClass, row)
-        finally:
-            # Close the cursor
-            await newCursor.close()
+        # Get the record
+        res = self.getAll(
+            emptyDataClass, idKey, idValue, limit=1, customQuery=customQuery
+        )
+        async for row in res:
+            return row
 
     async def getByKey(
         self,
@@ -125,39 +100,12 @@ class DBWrapperAsync(DBWrapperMixin):
         Returns:
             DataModelType | None: The result of the query.
         """
-        # Query and filter
-        _query = (
-            customQuery
-            or emptyDataClass.queryBase()
-            or self.filterQuery(emptyDataClass.schemaName, emptyDataClass.tableName)
+        # Get the record
+        res = self.getAll(
+            emptyDataClass, idKey, idValue, limit=1, customQuery=customQuery
         )
-        _filter = f"WHERE {self.makeIdentifier(emptyDataClass.tableAlias, idKey)} = %s"
-        _params = (idValue,)
-
-        # Create a SQL object for the query and format it
-        querySql = self._formatFilterQuery(_query, _filter, None, None)
-
-        # Create a new cursor
-        newCursor = await self.createCursor(emptyDataClass)
-
-        # Log
-        self.logQuery(newCursor, querySql, _params)
-
-        # Load data
-        try:
-            await newCursor.execute(querySql, _params)
-
-            # Fetch one row
-            row = await newCursor.fetchone()
-            if row is None:
-                return
-
-            # Turn data into model
-            return self.turnDataIntoModel(emptyDataClass, row)
-
-        finally:
-            # Close the cursor
-            await newCursor.close()
+        async for row in res:
+            return row
 
     async def getAll(
         self,
@@ -192,11 +140,10 @@ class DBWrapperAsync(DBWrapperMixin):
         )
         _params: tuple[Any, ...] = ()
         _filter = None
+
+        # TODO: Rewrite this so that filter method with loop is not used here
         if idKey and idValue:
-            _filter = (
-                f"WHERE {self.makeIdentifier(emptyDataClass.tableAlias, idKey)} = %s"
-            )
-            _params = (idValue,)
+            (_filter, _params) = self.createFilter({idKey: idValue})
 
         # Order and limit
         _order = self.orderQuery(orderBy)

database_wrapper/db_wrapper_mixin.py

@@ -2,7 +2,6 @@ import logging
 
 from typing import cast, Any
 
-from .db_backend import DatabaseBackend
 from .common import OrderByItem, NoParam, DataModelType
 
 
@@ -80,22 +79,31 @@ class DBWrapperMixin:
     ### Setters ###
     ###############
 
-    def updateDb(self, db: Any) -> None:
+    def setDb(self, db: Any) -> None:
         """
         Updates the database backend object.
 
         Args:
-            db (DatabaseBackend): The new database backend object.
+            db (Any): The new database backend object.
         """
+        if db is None:
+            del self.db
+            return
+
         self.db = db
 
-    def updateDbConn(self, dbConn: Any) -> None:
+    def setDbConn(self, dbConn: Any) -> None:
         """
         Updates the database connection object.
 
         Args:
             dbConn (Any): The new database connection object.
         """
+
+        if dbConn is None:
+            del self.dbConn
+            return
+
         self.dbConn = dbConn
 
     ######################
@@ -268,7 +276,7 @@ class DBWrapperMixin:
 
     def createFilter(
         self, filter: dict[str, Any] | None
-    ) -> tuple[str, tuple[Any, ...]]:
+    ) -> tuple[Any, tuple[Any, ...]]:
         if filter is None or len(filter) == 0:
             return ("", tuple())
 

{database_wrapper-0.1.38.dist-info → database_wrapper-0.1.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: database_wrapper
-Version: 0.1.38
+Version: 0.1.42
 Summary: A Different Approach to Database Wrappers in Python
 Author-email: Gints Murans <gm@gm.lv>
 License: GNU General Public License v3.0 (GPL-3.0)
@@ -46,13 +46,13 @@ Requires-Dist: psycopg[pool] >=3.2.0 ; extra == 'dev'
 Requires-Dist: mysqlclient >=2.2.2 ; extra == 'dev'
 Requires-Dist: pymssql >=2.2.10 ; extra == 'dev'
 Provides-Extra: mssql
-Requires-Dist: database-wrapper-mssql ==0.1.38 ; extra == 'mssql'
+Requires-Dist: database-wrapper-mssql ==0.1.42 ; extra == 'mssql'
 Provides-Extra: mysql
-Requires-Dist: database-wrapper-mysql ==0.1.38 ; extra == 'mysql'
+Requires-Dist: database-wrapper-mysql ==0.1.42 ; extra == 'mysql'
 Provides-Extra: pgsql
-Requires-Dist: database-wrapper-pgsql ==0.1.38 ; extra == 'pgsql'
+Requires-Dist: database-wrapper-pgsql ==0.1.42 ; extra == 'pgsql'
 Provides-Extra: sqlite
-Requires-Dist: database-wrapper-sqlite ==0.1.38 ; extra == 'sqlite'
+Requires-Dist: database-wrapper-sqlite ==0.1.42 ; extra == 'sqlite'
 
 # database_wrapper
 

{database_wrapper-0.1.38.dist-info → database_wrapper-0.1.42.dist-info}/RECORD

@@ -1,16 +1,16 @@
 database_wrapper/__init__.py,sha256=amoShlhRpOhrFbGeKbdq47H5omcVRd4xWG-RUX7bdIk,830
 database_wrapper/common.py,sha256=fsxe28o_4xCrotPbB274dmzQ9rOyes0sBtcHog-9RVc,258
-database_wrapper/config.py,sha256=kr7_uBZI8cqfjahVUuClewOKJgeCF-ys6A-68hDXcoQ,334
+database_wrapper/config.py,sha256=w7NSHEnvNqa6zdULt1estaAC-9Vqj72jV38tGrbRpqo,334
 database_wrapper/db_backend.py,sha256=iQd1yVsLumutfoOmWY-XAAiLg00_I-IueOv_RtO_7ew,5068
 database_wrapper/db_data_model.py,sha256=njef4LR7XQcTdob961t1DQ7q3i2dzfVrFyuAtD3YYwQ,12181
-database_wrapper/db_wrapper.py,sha256=9RuixREftA52pL24qYBJSmaZ2_4a9dDSUS4MUhPSrlE,17874
-database_wrapper/db_wrapper_async.py,sha256=0fFqrV8fbFOaloXOg1qQVu_xA3RRJVrrJ6rQWti1aek,18318
-database_wrapper/db_wrapper_mixin.py,sha256=hWI-t7cJr_0jfsLNcm6sY-FDsJbe9gyN1DOcwRX2LLc,10485
+database_wrapper/db_wrapper.py,sha256=O5H7Q8xvvzN4p7KL_NnHflY-EZCfw9TM5mYBzRuJfZA,16488
+database_wrapper/db_wrapper_async.py,sha256=4K-01_UtNxaRgN5qB3j1O2eBX2cOW0xi2ZJJimnqgYw,16714
+database_wrapper/db_wrapper_mixin.py,sha256=-k8Gna_iGE5Gz1gRsVP8sOkUbwX3djjCWeM3ZkGKT7E,10570
 database_wrapper/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 database_wrapper/utils/__init__.py,sha256=mnewmY38-837VAh4f42hvpMUBVUjOLoMtIfdZBxbkg0,134
 database_wrapper/utils/dataclass_addons.py,sha256=5_ZAj8h-4RtimEM-b9lo6TXi4qYVTf7KIjTtu0jzAS4,762
 database_wrapper/utils/timer.py,sha256=ZJpVMsQ7oHHgyuqMOxVee1fZD78kcDrP4c8gHug3xGU,8927
-database_wrapper-0.1.38.dist-info/METADATA,sha256=7tJjSlK3g81yKphZzBLgvHh11BSBZCLXHvoAoLO79Ok,3370
-database_wrapper-0.1.38.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-database_wrapper-0.1.38.dist-info/top_level.txt,sha256=QcnS4ocJygxcKE5eoOqriuja306oVu-zJRn6yjRRhBw,17
-database_wrapper-0.1.38.dist-info/RECORD,,
+database_wrapper-0.1.42.dist-info/METADATA,sha256=o8geerZ2YpCl8NWntuHcr-7e_AT2V4jWsv7-KOsKQV0,3370
+database_wrapper-0.1.42.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+database_wrapper-0.1.42.dist-info/top_level.txt,sha256=QcnS4ocJygxcKE5eoOqriuja306oVu-zJRn6yjRRhBw,17
+database_wrapper-0.1.42.dist-info/RECORD,,