database-wrapper-pgsql 0.2.17__tar.gz → 0.2.24__tar.gz

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: database_wrapper_pgsql
-Version: 0.2.17
+Version: 0.2.24
 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.2.17
+Requires-Dist: database_wrapper==0.2.24
 Requires-Dist: psycopg[binary]>=3.2.0
 Requires-Dist: psycopg[pool]>=3.2.0
 

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/database_wrapper_pgsql/__init__.py

@@ -10,20 +10,21 @@ import logging
 
 from .connector import (
     # Basics
-    PgConfig,
-    # Connection and Cursor types
+    PgConnection,
     PgConnectionType,
     PgConnectionTypeAsync,
+    PgCursor,
     PgCursorType,
     PgCursorTypeAsync,
-    # Connectors
-    PgSQL,
-    PgSQLAsync,
-    PgSQLWithPooling,
-    PgSQLWithPoolingAsync,
+    PgDictRow,
+    Pgsql,
+    PgsqlAsync,
+    PgsqlConfig,
+    PgsqlWithPooling,
+    PgsqlWithPoolingAsync,
 )
-from .db_wrapper_pgsql import DBWrapperPgSQL
-from .db_wrapper_pgsql_async import DBWrapperPgSQLAsync
+from .db_wrapper_pgsql import DBWrapperPgsql
+from .db_wrapper_pgsql_async import DBWrapperPgsqlAsync
 from .pg_introspector import PostgresIntrospector
 
 # Set the logger to a quiet default, can be enabled if needed
@@ -34,19 +35,22 @@ if logger.level == logging.NOTSET:
 
 __all__ = [
     # Wrappers
-    "DBWrapperPgSQL",
-    "DBWrapperPgSQLAsync",
+    DBWrapperPgsql,
+    DBWrapperPgsqlAsync,
     # Connectors
-    "PgSQL",
-    "PgSQLAsync",
-    "PgSQLWithPooling",
-    "PgSQLWithPoolingAsync",
+    Pgsql,
+    PgsqlAsync,
+    PgsqlWithPooling,
+    PgsqlWithPoolingAsync,
     # Connection and Cursor types
-    "PgConnectionType",
-    "PgCursorType",
-    "PgConnectionTypeAsync",
-    "PgCursorTypeAsync",
+    PgConnection,
+    PgConnectionType,
+    PgConnectionTypeAsync,
+    PgCursor,
+    PgCursorType,
+    PgCursorTypeAsync,
+    PgDictRow,
     # Helpers
-    "PgConfig",
-    "PostgresIntrospector",
+    PgsqlConfig,
+    PostgresIntrospector,
 ]

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/database_wrapper_pgsql/connector.py

@@ -21,7 +21,7 @@ PgConnectionTypeAsync = PgConnectionAsync[PgDictRow]
 PgCursorTypeAsync = PgCursorAsync[PgDictRow]
 
 
-class PgConfig(TypedDict):
+class PgsqlConfig(TypedDict):
     hostname: str
     port: NotRequired[int]
     username: str
@@ -35,7 +35,7 @@ class PgConfig(TypedDict):
     pool_kwargs: NotRequired[dict[str, Any]]
 
 
-class PgSQL(DatabaseBackend):
+class Pgsql(DatabaseBackend):
     """
     PostgreSQL database implementation.
 
@@ -45,7 +45,7 @@ class PgSQL(DatabaseBackend):
     Close is called automatically when class is destroyed.
 
     :param config: Configuration for PostgreSQL
-    :type config: PgConfig
+    :type config: PgsqlConfig
 
     Defaults:
         port = 5432
@@ -53,7 +53,7 @@ class PgSQL(DatabaseBackend):
 
     """
 
-    config: PgConfig
+    config: PgsqlConfig
 
     connection: PgConnectionType
     cursor: PgCursorType
@@ -152,7 +152,7 @@ class PgSQL(DatabaseBackend):
         self.connection.rollback()
 
 
-class PgSQLAsync(DatabaseBackend):
+class PgsqlAsync(DatabaseBackend):
     """
     PostgreSQL database async implementation.
 
@@ -163,7 +163,7 @@ class PgSQLAsync(DatabaseBackend):
     ! You need to call it manually in async environment.
 
     :param config: Configuration for PostgreSQL
-    :type config: PgConfig
+    :type config: PgsqlConfig
 
     Defaults:
         port = 5432
@@ -171,7 +171,7 @@ class PgSQLAsync(DatabaseBackend):
 
     """
 
-    config: PgConfig
+    config: PgsqlConfig
 
     connection: PgConnectionTypeAsync
     cursor: PgCursorTypeAsync
@@ -220,13 +220,23 @@ class PgSQLAsync(DatabaseBackend):
 
     async def close(self) -> Any:
         """Close connections"""
-        if self.cursor:
-            self.logger.debug("Closing cursor")
-            await self.cursor.close()
+        try:
+            if hasattr(self, "cursor") and self.cursor:
+                self.logger.debug("Closing cursor")
+                await self.cursor.close()
+        except Exception as e:
+            self.logger.debug(f"Error while closing cursor: {e}")
+        finally:
+            self.cursor = None
 
-        if self.connection:
-            self.logger.debug("Closing connection")
-            await self.connection.close()
+        try:
+            if hasattr(self, "connection") and self.connection:
+                self.logger.debug("Closing connection")
+                await self.connection.close()
+        except Exception as e:
+            self.logger.debug(f"Error while closing connection: {e}")
+        finally:
+            self.connection = None
 
     async def ping(self) -> bool:
         try:
@@ -280,7 +290,7 @@ class PgSQLAsync(DatabaseBackend):
         await self.connection.rollback()
 
 
-class PgSQLWithPooling(DatabaseBackend):
+class PgsqlWithPooling(DatabaseBackend):
     """
     PostgreSQL database implementation with connection pooling.
 
@@ -292,13 +302,13 @@ class PgSQLWithPooling(DatabaseBackend):
     Or use context manager to get connection and return it back automatically,
     for example:
 
-        pool = PgSQLWithPooling(config)
+        pool = PgsqlWithPooling(config)
         pool.open_pool()
         with pool as (connection, cursor):
             cursor.execute("SELECT 1")
 
     :param config: Configuration for PostgreSQL
-    :type config: PgConfig
+    :type config: PgsqlConfig
     :param connection_timeout: Connection timeout
     :type connection_timeout: int
     :param instance_name: Name of the instance
@@ -310,7 +320,7 @@ class PgSQLWithPooling(DatabaseBackend):
         maxconnections = 5
     """
 
-    config: PgConfig
+    config: PgsqlConfig
     """ Configuration """
 
     pool: ConnectionPool[PgConnectionType]
@@ -331,7 +341,7 @@ class PgSQLWithPooling(DatabaseBackend):
 
     def __init__(
         self,
-        db_config: PgConfig,
+        db_config: PgsqlConfig,
         connection_timeout: int = 5,
         instance_name: str = "postgresql_pool",
     ) -> None:
@@ -541,7 +551,7 @@ class PgSQLWithPooling(DatabaseBackend):
         self.connection.rollback()
 
 
-class PgSQLWithPoolingAsync(DatabaseBackend):
+class PgsqlWithPoolingAsync(DatabaseBackend):
     """
     PostgreSQL database implementation with async connection pooling.
 
@@ -554,7 +564,7 @@ class PgSQLWithPoolingAsync(DatabaseBackend):
     Or use context manager to get connection and return it back automatically,
     for example:
 
-        pool = PgSQLWithPoolingAsync(config)
+        pool = PgsqlWithPoolingAsync(config)
         await pool.open_pool()
         async with pool as (connection, cursor):
             await cursor.execute("SELECT 1")
@@ -564,7 +574,7 @@ class PgSQLWithPoolingAsync(DatabaseBackend):
     ! You need to call `await close_pool()` manually in async environment.
 
     :param config: Configuration for PostgreSQL
-    :type config: PgConfig
+    :type config: PgsqlConfig
     :param connection_timeout: Connection timeout
     :type connection_timeout: int
     :param instance_name: Name of the instance
@@ -576,7 +586,7 @@ class PgSQLWithPoolingAsync(DatabaseBackend):
         maxconnections = 5
     """
 
-    config: PgConfig
+    config: PgsqlConfig
     """ Configuration """
 
     pool_async: AsyncConnectionPool[PgConnectionTypeAsync]
@@ -597,7 +607,7 @@ class PgSQLWithPoolingAsync(DatabaseBackend):
 
     def __init__(
         self,
-        db_config: PgConfig,
+        db_config: PgsqlConfig,
         connection_timeout: int = 5,
         instance_name: str = "async_postgresql",
     ) -> None:

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/database_wrapper_pgsql/db_wrapper_pgsql.py

@@ -6,13 +6,11 @@ from psycopg import Cursor, sql
 from database_wrapper import DBWrapper
 
 from .connector import PgCursorType
-from .db_wrapper_pgsql_mixin import DBWrapperPgSQLMixin
+from .db_wrapper_pgsql_mixin import DBWrapperPgsqlMixin
 
 
-class DBWrapperPgSQL(DBWrapperPgSQLMixin, DBWrapper):
-    """
-    Sync database wrapper for postgres
-    """
+class DBWrapperPgsql(DBWrapperPgsqlMixin, DBWrapper):
+    """Wrapper for PostgreSQL database"""
 
     db_cursor: PgCursorType | None
     """ PostgreSQL cursor object """

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/database_wrapper_pgsql/db_wrapper_pgsql_async.py

@@ -6,10 +6,10 @@ from psycopg import sql
 from database_wrapper import DBWrapperAsync
 
 from .connector import PgCursorTypeAsync
-from .db_wrapper_pgsql_mixin import DBWrapperPgSQLMixin
+from .db_wrapper_pgsql_mixin import DBWrapperPgsqlMixin
 
 
-class DBWrapperPgSQLAsync(DBWrapperPgSQLMixin, DBWrapperAsync):
+class DBWrapperPgsqlAsync(DBWrapperPgsqlMixin, DBWrapperAsync):
     """
     Async database wrapper for postgres
 

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/database_wrapper_pgsql/db_wrapper_pgsql_mixin.py

@@ -5,9 +5,9 @@ from psycopg import sql
 from database_wrapper import NoParam, OrderByItem
 
 
-class DBWrapperPgSQLMixin:
+class DBWrapperPgsqlMixin:
     """
-    Mixin for providing methods that can be used by both sync and async versions of the DBWrapperPgSQL class.
+    Mixin for providing methods that can be used by both sync and async versions of the DBWrapperPgsql class.
     """
 
     ######################

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/database_wrapper_pgsql.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: database_wrapper_pgsql
-Version: 0.2.17
+Version: 0.2.24
 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.2.17
+Requires-Dist: database_wrapper==0.2.24
 Requires-Dist: psycopg[binary]>=3.2.0
 Requires-Dist: psycopg[pool]>=3.2.0
 

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/database_wrapper_pgsql.egg-info/requires.txt

@@ -1,3 +1,3 @@
-database_wrapper==0.2.17
+database_wrapper==0.2.24
 psycopg[binary]>=3.2.0
 psycopg[pool]>=3.2.0

{database_wrapper_pgsql-0.2.17 → database_wrapper_pgsql-0.2.24}/pyproject.toml

@@ -4,14 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "database_wrapper_pgsql"
-version = "0.2.17"
+version = "0.2.24"
 description = "database_wrapper for PostgreSQL database"
 readme = "README.md"
 requires-python = ">=3.8"
-license = {text = "GNU General Public License v3.0 (GPL-3.0)"}
-authors = [
-    {name = "Gints Murans", email = "gm@gm.lv"}
-]
+license = { text = "GNU General Public License v3.0 (GPL-3.0)" }
+authors = [{ name = "Gints Murans", email = "gm@gm.lv" }]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -31,11 +29,11 @@ classifiers = [
     "Topic :: Database",
     "Topic :: Database :: Front-Ends",
     "Topic :: Software Development",
-    "Topic :: Software Development :: Libraries :: Python Modules"
+    "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 keywords = ["database", "wrapper", "python", "postgresql", "pgsql"]
 dependencies = [
-    "database_wrapper == 0.2.17",
+    "database_wrapper == 0.2.24",
     "psycopg[binary] >= 3.2.0",
     "psycopg[pool] >= 3.2.0",
 ]