database-wrapper-pgsql 0.1.38__tar.gz → 0.1.42__tar.gz

{database_wrapper_pgsql-0.1.38 → database_wrapper_pgsql-0.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: database_wrapper_pgsql
-Version: 0.1.38
+Version: 0.1.42
 Summary: database_wrapper for PostgreSQL database
 Author-email: Gints Murans <gm@gm.lv>
 License: GNU General Public License v3.0 (GPL-3.0)
@@ -32,7 +32,7 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: database_wrapper==0.1.38
+Requires-Dist: database_wrapper==0.1.42
 Requires-Dist: psycopg[binary]>=3.2.0
 Requires-Dist: psycopg[pool]>=3.2.0
 

{database_wrapper_pgsql-0.1.38 → database_wrapper_pgsql-0.1.42}/database_wrapper_pgsql/db_wrapper_pgsql.py

@@ -21,7 +21,7 @@ class DBWrapperPgSQL(DBWrapperPgSQLMixin, DBWrapper):
     """
 
     # Override db instance
-    db: PgSQL
+    db: PgSQL | None = None
     """ PostgreSQL database connector """
 
     dbConn: PgConnectionType | None = None
@@ -53,23 +53,23 @@ class DBWrapperPgSQL(DBWrapperPgSQLMixin, DBWrapper):
     ### Setters ###
     ###############
 
-    def updateDb(self, db: PgSQL) -> None:
+    def setDb(self, db: PgSQL | None) -> None:
         """
         Updates the database backend object.
 
         Args:
-            db (DatabaseBackend): The new database backend object.
+            db (PgSQL | None): The new database backend object.
         """
-        self.db = db
+        super().setDb(db)
 
-    def updateDbConn(self, dbConn: PgConnectionType) -> None:
+    def setDbConn(self, dbConn: PgConnectionType | None) -> None:
         """
         Updates the database connection object.
 
         Args:
-            dbConn (Any): The new database connection object.
+            dbConn (PgConnectionType | None): The new database connection object.
         """
-        self.dbConn = dbConn
+        super().setDbConn(dbConn)
 
     ######################
     ### Helper methods ###
@@ -98,10 +98,13 @@ class DBWrapperPgSQL(DBWrapperPgSQLMixin, DBWrapper):
         Returns:
             PgAsyncCursorType | AsyncCursor[DBDataModel]: 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"
+            )
 
         # First we need connection
-        if self.dbConn is None:
+        if self.dbConn is None and self.db is not None:
             self.dbConn = self.db.connection
 
         # Lets make sure we have a connection

{database_wrapper_pgsql-0.1.38 → database_wrapper_pgsql-0.1.42}/database_wrapper_pgsql/db_wrapper_pgsql_async.py

@@ -24,7 +24,7 @@ class DBWrapperPgSQLAsync(DBWrapperPgSQLMixin, DBWrapperAsync):
     """
 
     # Override db instance
-    db: PgSQLWithPoolingAsync
+    db: PgSQLWithPoolingAsync | None = None
     """ Async PostgreSQL database connector """
 
     dbConn: PgAsyncConnectionType | None = None
@@ -62,23 +62,23 @@ class DBWrapperPgSQLAsync(DBWrapperPgSQLMixin, DBWrapperAsync):
     ### Setters ###
     ###############
 
-    def updateDb(self, db: PgSQLWithPoolingAsync) -> None:
+    def setDb(self, db: PgSQLWithPoolingAsync | None) -> None:
         """
         Updates the database backend object.
 
         Args:
-            db (DatabaseBackend): The new database backend object.
+            db (PgSQLWithPoolingAsync | None): The new database backend object.
         """
-        self.db = db
+        super().setDb(db)
 
-    def updateDbConn(self, dbConn: PgAsyncConnectionType) -> None:
+    def setDbConn(self, dbConn: PgAsyncConnectionType | None) -> None:
         """
         Updates the database connection object.
 
         Args:
-            dbConn (Any): The new database connection object.
+            dbConn (PgAsyncConnectionType | None): The new database connection object.
         """
-        self.dbConn = dbConn
+        super().setDbConn(dbConn)
 
     ######################
     ### Helper methods ###
@@ -107,10 +107,13 @@ class DBWrapperPgSQLAsync(DBWrapperPgSQLMixin, DBWrapperAsync):
         Returns:
             PgAsyncCursorType | AsyncCursor[DBDataModel]: 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"
+            )
 
         # First we need connection
-        if self.dbConn is None:
+        if self.dbConn is None and self.db is not None:
             status = await self.db.newConnection()
             if not status:
                 raise Exception("Failed to create new connection")
@@ -118,6 +121,9 @@ class DBWrapperPgSQLAsync(DBWrapperPgSQLMixin, DBWrapperAsync):
             (pgConn, _pgCur) = status
             self.dbConn = pgConn
 
+        if self.dbConn is None:
+            raise Exception("Failed to get connection")
+
         if emptyDataClass is None:
             return self.dbConn.cursor()
 

{database_wrapper_pgsql-0.1.38 → database_wrapper_pgsql-0.1.42}/database_wrapper_pgsql/db_wrapper_pgsql_mixin.py

@@ -2,7 +2,7 @@ from typing import Any, cast
 
 from psycopg import sql
 
-from database_wrapper import OrderByItem, DataModelType
+from database_wrapper import OrderByItem, DataModelType, NoParam
 
 
 class DBWrapperPgSQLMixin:
@@ -106,6 +106,25 @@ class DBWrapperPgSQLMixin:
 
         return sql.SQL("LIMIT {} OFFSET {}").format(limit, offset)
 
+    def formatFilter(self, key: str, filter: Any) -> tuple[Any, ...]:
+        # TODO: For now we assume that we have that method from DBWrapperMixin
+        # TODO: Its 5am and I am tired, I will fix this later
+        return super().formatFilter(key, filter)  # type: ignore
+
+    def createFilter(
+        self, filter: dict[str, Any] | None
+    ) -> tuple[sql.Composed | None, tuple[Any, ...]]:
+        if filter is None or len(filter) == 0:
+            return (None, tuple())
+
+        raw = [self.formatFilter(key, filter[key]) for key in filter]
+
+        _queryItems = sql.SQL(" AND ").join([sql.SQL(tup[0]) for tup in raw])
+        _query = sql.SQL("WHERE {queryItems}").format(queryItems=_queryItems)
+        _params = tuple([val for tup in raw for val in tup[1:] if val is not NoParam])
+
+        return (_query, _params)
+
     def _formatFilterQuery(
         self,
         query: sql.SQL | sql.Composed | str,
@@ -119,6 +138,8 @@ class DBWrapperPgSQLMixin:
 
         queryParts: list[sql.Composable] = [query]
         if qFilter is not None:
+            # if isinstance(qFilter, str):
+            #     qFilter = sql.SQL(qFilter)
             queryParts.append(qFilter)
         if order is not None:
             queryParts.append(order)

{database_wrapper_pgsql-0.1.38 → database_wrapper_pgsql-0.1.42}/database_wrapper_pgsql.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: database_wrapper_pgsql
-Version: 0.1.38
+Version: 0.1.42
 Summary: database_wrapper for PostgreSQL database
 Author-email: Gints Murans <gm@gm.lv>
 License: GNU General Public License v3.0 (GPL-3.0)
@@ -32,7 +32,7 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: database_wrapper==0.1.38
+Requires-Dist: database_wrapper==0.1.42
 Requires-Dist: psycopg[binary]>=3.2.0
 Requires-Dist: psycopg[pool]>=3.2.0
 

{database_wrapper_pgsql-0.1.38 → database_wrapper_pgsql-0.1.42}/database_wrapper_pgsql.egg-info/requires.txt

@@ -1,3 +1,3 @@
-database_wrapper==0.1.38
+database_wrapper==0.1.42
 psycopg[binary]>=3.2.0
 psycopg[pool]>=3.2.0

{database_wrapper_pgsql-0.1.38 → database_wrapper_pgsql-0.1.42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "database_wrapper_pgsql"
-version = "0.1.38"
+version = "0.1.42"
 description = "database_wrapper for PostgreSQL database"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -35,7 +35,7 @@ classifiers = [
 ]
 keywords = ["database", "wrapper", "python", "postgresql", "pgsql"]
 dependencies = [
-    "database_wrapper == 0.1.38",
+    "database_wrapper == 0.1.42",
     "psycopg[binary] >= 3.2.0",
     "psycopg[pool] >= 3.2.0",
 ]