SQLPyHelper 0.1.9__py3-none-any.whl → 0.2.1__py3-none-any.whl

sqlpyhelper/__init__.py

@@ -1,5 +1,5 @@
 # Match the version in setup.py
-__version__ = "0.1.9"
+__version__ = "0.2.1"
 
 from sqlpyhelper.async_helper import (  # noqa: F401
     AsyncConnectionError,

sqlpyhelper/async_helper.py

@@ -28,7 +28,7 @@ Example usage::
 
 import logging
 import os
-from typing import Any, Optional
+from typing import Any, List, Optional, Tuple
 
 from dotenv import load_dotenv
 
@@ -190,7 +190,7 @@ class AsyncSQLPyHelper:
                 "No active connection. Call connect() or use async with."
             )
 
-    def _adapt_query(self, query: str, args: tuple) -> tuple[str, tuple]:
+    def _adapt_query(self, query: str, args: tuple) -> Tuple[str, tuple]:
         """
         Adapt a query and its arguments for the active database driver.
 
@@ -320,7 +320,7 @@ class AsyncSQLPyHelper:
         except Exception as e:
             raise AsyncQueryError(f"fetch_one failed: {e}") from e
 
-    async def fetch_all(self, query: str, *args: Any) -> list[Any]:
+    async def fetch_all(self, query: str, *args: Any) -> List[Any]:
         """
         Execute a SELECT query and return all rows.
 
@@ -409,7 +409,7 @@ class AsyncSQLPyHelper:
         except Exception as e:
             raise AsyncQueryError(f"fetch_val failed: {e}") from e
 
-    async def execute_many(self, query: str, args_list: list[tuple]) -> None:
+    async def execute_many(self, query: str, args_list: List[tuple]) -> None:
         """
         Execute a SQL statement multiple times with different parameters.
         Efficient for bulk inserts::

sqlpyhelper/db_helper.py

@@ -2,7 +2,7 @@ import csv
 import logging
 import os
 import re
-from typing import Any, Literal, Optional
+from typing import Any, Dict, List, Literal, Optional
 
 from dotenv import load_dotenv
 
@@ -80,6 +80,7 @@ class SQLPyHelper:
         self.port: Optional[str] = port or os.getenv("DB_PORT")
         self.oracle_sid: Optional[str] = oracle_sid or os.getenv("ORACLE_SID")
         self.pool: Any = None
+        self._in_transaction: bool = False
 
         if not self.db_type or not self.database:
             raise ValueError("Missing required database configuration.")
@@ -143,14 +144,14 @@ class SQLPyHelper:
                 self.cursor.execute(query, params)
             else:
                 self.cursor.execute(query)
-            self.connection.commit()
+            if not self._in_transaction:
+                self.connection.commit()
         except Exception as e:
-            if "server has gone away" in str(
-                e
-            ):  # Example check for MySQL lost connection
+            if "server has gone away" in str(e):
                 self.reconnect()
                 self.cursor.execute(query, params)  # type: ignore[arg-type]
-                self.connection.commit()
+                if not self._in_transaction:
+                    self.connection.commit()
             else:
                 raise QueryError(f"Query failed: {e}") from e
 
@@ -161,7 +162,7 @@ class SQLPyHelper:
         except Exception as e:
             raise QueryError(f"Failed to fetch row: {e}") from e
 
-    def fetch_all(self) -> list[tuple]:
+    def fetch_all(self) -> List[tuple]:
         """Fetches all rows from the last executed query"""
         try:
             return self.cursor.fetchall()
@@ -170,7 +171,7 @@ class SQLPyHelper:
 
     def fetch_by_param(
         self, table_name: str, column_name: str, value: Any
-    ) -> list[tuple]:
+    ) -> List[tuple]:
         """Fetches rows from a table where a column matches the given value."""
         try:
             table_name = _validate_identifier(table_name)
@@ -190,7 +191,7 @@ class SQLPyHelper:
         except Exception as e:
             raise ConnectionError(f"Failed to close connection: {e}") from e
 
-    def create_table(self, table_name: str, columns: dict[str, str]) -> None:
+    def create_table(self, table_name: str, columns: Dict[str, str]) -> None:
         """
         Creates a table dynamically using a dictionary format.
         Example:
@@ -209,7 +210,7 @@ class SQLPyHelper:
         except Exception as e:
             raise QueryError(f"Failed to create table: {e}") from e
 
-    def insert_bulk(self, table_name: str, data: list[dict[str, Any]]) -> None:
+    def insert_bulk(self, table_name: str, data: List[Dict[str, Any]]) -> None:
         """
         Inserts multiple rows at once.
         Example:
@@ -350,6 +351,7 @@ class SQLPyHelper:
                 self.execute_query("BEGIN TRANSACTION")
             elif self.db_type == "oracle":
                 pass  # Oracle starts transactions implicitly on first DML statement
+            self._in_transaction = True
             logger.info("Transaction started on %s database", self.db_type)
         except Exception as e:
             raise QueryError(f"Failed to begin transaction: {e}") from e
@@ -358,6 +360,7 @@ class SQLPyHelper:
         """Commit the current transaction."""
         try:
             self.connection.commit()
+            self._in_transaction = False
             logger.info("Transaction committed on %s database", self.db_type)
         except Exception as e:
             raise QueryError(f"Failed to commit transaction: {e}") from e
@@ -366,11 +369,12 @@ class SQLPyHelper:
         """Roll back the current transaction."""
         try:
             self.connection.rollback()
+            self._in_transaction = False
             logger.info("Transaction rolled back on %s database", self.db_type)
         except Exception as e:
             raise QueryError(f"Failed to rollback transaction: {e}") from e
 
-    def insert_dynamic(self, table: str, data: dict[str, Any]) -> None:
+    def insert_dynamic(self, table: str, data: Dict[str, Any]) -> None:
         """
         Dynamically constructs and executes an INSERT query with database-specific placeholders.
         """

sqlpyhelper/migration.py

@@ -24,7 +24,7 @@ Example usage::
 """
 
 import logging
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 logger = logging.getLogger("sqlpyhelper.migration")
 
@@ -41,7 +41,7 @@ class MigrationError(Exception):
 # Generic types are normalised from the source cursor description.
 
 
-_TYPE_MAP: dict[str, dict[str, str]] = {
+_TYPE_MAP: Dict[str, Dict[str, str]] = {
     "sqlite": {
         "integer": "INTEGER",
         "real": "REAL",
@@ -149,7 +149,7 @@ def _map_type(raw_type: Optional[str], target_db: str) -> str:
     return target_types.get(generic, "TEXT")
 
 
-def _get_column_info(source: Any, table: str) -> list[tuple[str, str]]:
+def _get_column_info(source: Any, table: str) -> List[Tuple[str, str]]:
     """
     Return a list of (column_name, raw_type_string) tuples
     by inspecting the source database schema.
@@ -216,7 +216,7 @@ def _get_column_info(source: Any, table: str) -> list[tuple[str, str]]:
 
 def _build_create_table_sql(
     table: str,
-    columns: list[tuple[str, str]],
+    columns: List[Tuple[str, str]],
     target_db: str,
 ) -> str:
     """Build a CREATE TABLE IF NOT EXISTS statement for the target database."""
@@ -228,7 +228,7 @@ def _build_create_table_sql(
 
 def _build_insert_sql(
     table: str,
-    column_names: list[str],
+    column_names: List[str],
     target_db: str,
 ) -> str:
     """Build a parameterised INSERT statement for the target database."""
@@ -250,7 +250,7 @@ def migrate_table(
     create_table: bool = True,
     batch_size: int = 500,
     truncate_target: bool = False,
-) -> dict[str, Any]:
+) -> Dict[str, Any]:
     """
     Migrate a table from one database to another.
 

{sqlpyhelper-0.1.9.dist-info → sqlpyhelper-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SQLPyHelper
-Version: 0.1.9
+Version: 0.2.1
 Summary: A simple SQL database helper package for Python.
 Home-page: https://github.com/adebayopeter/sqlpyhelper
 Author: Adebayo Olaonipekun

sqlpyhelper-0.2.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+sqlpyhelper/__init__.py,sha256=bQLc1BMk3n5DyZ_BlmBsZOzfCqdybgerRj85WKfV5Co,370
+sqlpyhelper/async_helper.py,sha256=iHQKhyZtfi4Dfg7ZTjQRGYKg5NCMbtWCVHZCS-V9348,21486
+sqlpyhelper/automation_utils.py,sha256=pC6pH6bJ-k8iPVeHJ4gUiwEe822dasmKg53ya9bMxyE,5381
+sqlpyhelper/cli.py,sha256=yj0kWJu3oh_JLnmi0L7a5ing2_0x4CQGOKSOhZLAtoY,5646
+sqlpyhelper/db_helper.py,sha256=vMNs8IIjNO6PdN9idcZGYWudF2AnnYm3OrE9YYzwc3Q,14421
+sqlpyhelper/migration.py,sha256=vsEnBIvhNWn0srzlcTj_uxUt7ZMxjDpU_s1CM4txy4U,11692
+sqlpyhelper/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sqlpyhelper-0.2.1.dist-info/licenses/LICENSE,sha256=9XzXxZ_8mWFM9-2TlqyE3L69zvRf4VPY_xIzSj5iU-g,1076
+sqlpyhelper-0.2.1.dist-info/METADATA,sha256=7SD-1XaGrh4bjC7VLbhzgn9ZokdUsR_D6j0jwj24Ogk,11607
+sqlpyhelper-0.2.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sqlpyhelper-0.2.1.dist-info/entry_points.txt,sha256=uAzSqwkAbbJqQUKHlPNwOebTJVA0FqkOvn2CRP6xSz8,52
+sqlpyhelper-0.2.1.dist-info/top_level.txt,sha256=FrLqTmqTGDa8jHnnf2ZVkYO-gFvLXX9QonpUCE6wKGs,12
+sqlpyhelper-0.2.1.dist-info/RECORD,,

sqlpyhelper-0.1.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-sqlpyhelper/__init__.py,sha256=8oatB3lhbYVLzbkCIDrlE1mTJVljs2GeNuUG34_vYd0,370
-sqlpyhelper/async_helper.py,sha256=beq0wKxDl7Qv-CW_qA1-h_DPhDpC1CQHdstnKO-4FSI,21473
-sqlpyhelper/automation_utils.py,sha256=pC6pH6bJ-k8iPVeHJ4gUiwEe822dasmKg53ya9bMxyE,5381
-sqlpyhelper/cli.py,sha256=yj0kWJu3oh_JLnmi0L7a5ing2_0x4CQGOKSOhZLAtoY,5646
-sqlpyhelper/db_helper.py,sha256=SrXro_-ki5AT_Yj6u1k5-aUZYq-d2QXeQPXURXqUMLk,14223
-sqlpyhelper/migration.py,sha256=byAn7ToVgIB8tl1N39DB0MbHigjH2l-qX7QSskgzzTg,11673
-sqlpyhelper/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlpyhelper-0.1.9.dist-info/licenses/LICENSE,sha256=9XzXxZ_8mWFM9-2TlqyE3L69zvRf4VPY_xIzSj5iU-g,1076
-sqlpyhelper-0.1.9.dist-info/METADATA,sha256=TTa0zKb4o_Zuf9x1j63Xg15vE9rUBbgDUnSjJHi0Hq0,11607
-sqlpyhelper-0.1.9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sqlpyhelper-0.1.9.dist-info/entry_points.txt,sha256=uAzSqwkAbbJqQUKHlPNwOebTJVA0FqkOvn2CRP6xSz8,52
-sqlpyhelper-0.1.9.dist-info/top_level.txt,sha256=FrLqTmqTGDa8jHnnf2ZVkYO-gFvLXX9QonpUCE6wKGs,12
-sqlpyhelper-0.1.9.dist-info/RECORD,,