database-wrapper 0.1.40__tar.gz → 0.1.42__tar.gz

{database_wrapper-0.1.40 → database_wrapper-0.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: database_wrapper
-Version: 0.1.40
+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)
@@ -33,13 +33,13 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: pgsql
-Requires-Dist: database_wrapper_pgsql==0.1.40; extra == "pgsql"
+Requires-Dist: database_wrapper_pgsql==0.1.42; extra == "pgsql"
 Provides-Extra: mysql
-Requires-Dist: database_wrapper_mysql==0.1.40; extra == "mysql"
+Requires-Dist: database_wrapper_mysql==0.1.42; extra == "mysql"
 Provides-Extra: mssql
-Requires-Dist: database_wrapper_mssql==0.1.40; extra == "mssql"
+Requires-Dist: database_wrapper_mssql==0.1.42; extra == "mssql"
 Provides-Extra: sqlite
-Requires-Dist: database_wrapper_sqlite==0.1.40; extra == "sqlite"
+Requires-Dist: database_wrapper_sqlite==0.1.42; extra == "sqlite"
 Provides-Extra: all
 Requires-Dist: database_wrapper[mssql,mysql,pgsql,sqlite]; extra == "all"
 Provides-Extra: dev

{database_wrapper-0.1.40 → database_wrapper-0.1.42}/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": "b2c4127c61167d1bb1e6ccdc23cf0b333f2f86a7",
-    "git_commit_date": "15.11.2024 00:32",
-    "app_version": "0.1.40",
+    "git_commit_hash": "365f062181488aa4bd2f56e694fce6b26a113b1b",
+    "git_commit_date": "15.11.2024 02:01",
+    "app_version": "0.1.42",
 }

{database_wrapper-0.1.40 → database_wrapper-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-0.1.40 → database_wrapper-0.1.42}/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-0.1.40 → database_wrapper-0.1.42}/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
 
 
@@ -277,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.40 → database_wrapper-0.1.42}/database_wrapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: database_wrapper
-Version: 0.1.40
+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)
@@ -33,13 +33,13 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: pgsql
-Requires-Dist: database_wrapper_pgsql==0.1.40; extra == "pgsql"
+Requires-Dist: database_wrapper_pgsql==0.1.42; extra == "pgsql"
 Provides-Extra: mysql
-Requires-Dist: database_wrapper_mysql==0.1.40; extra == "mysql"
+Requires-Dist: database_wrapper_mysql==0.1.42; extra == "mysql"
 Provides-Extra: mssql
-Requires-Dist: database_wrapper_mssql==0.1.40; extra == "mssql"
+Requires-Dist: database_wrapper_mssql==0.1.42; extra == "mssql"
 Provides-Extra: sqlite
-Requires-Dist: database_wrapper_sqlite==0.1.40; extra == "sqlite"
+Requires-Dist: database_wrapper_sqlite==0.1.42; extra == "sqlite"
 Provides-Extra: all
 Requires-Dist: database_wrapper[mssql,mysql,pgsql,sqlite]; extra == "all"
 Provides-Extra: dev

{database_wrapper-0.1.40 → database_wrapper-0.1.42}/database_wrapper.egg-info/requires.txt

@@ -15,13 +15,13 @@ mysqlclient>=2.2.2
 pymssql>=2.2.10
 
 [mssql]
-database_wrapper_mssql==0.1.40
+database_wrapper_mssql==0.1.42
 
 [mysql]
-database_wrapper_mysql==0.1.40
+database_wrapper_mysql==0.1.42
 
 [pgsql]
-database_wrapper_pgsql==0.1.40
+database_wrapper_pgsql==0.1.42
 
 [sqlite]
-database_wrapper_sqlite==0.1.40
+database_wrapper_sqlite==0.1.42

{database_wrapper-0.1.40 → database_wrapper-0.1.42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "database_wrapper"
-version = "0.1.40"
+version = "0.1.42"
 description = "A Different Approach to Database Wrappers in Python"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -45,10 +45,10 @@ Code = "https://github.com/gintsmurans/py_database_wrapper"
 Download = "https://pypi.org/project/database_wrapper/"
 
 [project.optional-dependencies]
-pgsql = ["database_wrapper_pgsql == 0.1.40"]
-mysql = ["database_wrapper_mysql == 0.1.40"]
-mssql = ["database_wrapper_mssql == 0.1.40"]
-sqlite = ["database_wrapper_sqlite == 0.1.40"]
+pgsql = ["database_wrapper_pgsql == 0.1.42"]
+mysql = ["database_wrapper_mysql == 0.1.42"]
+mssql = ["database_wrapper_mssql == 0.1.42"]
+sqlite = ["database_wrapper_sqlite == 0.1.42"]
 all = ["database_wrapper[pgsql,mysql,mssql,sqlite]"]
 dev = [
     # Development