wcp-library 1.0.6__tar.gz → 1.0.8__tar.gz

{wcp_library-1.0.6 → wcp_library-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.0.6
+Version: 1.0.8
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.0.6 → wcp_library-1.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.0.6"
+version = "1.0.8"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"

{wcp_library-1.0.6 → wcp_library-1.0.8}/wcp_library/async_sql/oracle.py

@@ -32,8 +32,7 @@ async def connect_warehouse(username: str, password: str, hostname: str, port: i
         dsn=dsn,
         min=min_connections,
         max=max_connections,
-        increment=1,
-        encoding="UTF-8"
+        increment=1
     )
     return session_pool
 
@@ -113,11 +112,10 @@ class AsyncOracleConnection(object):
         :return: None
         """
 
-        connection = self._session_pool.acquire()
-        cursor = connection.cursor()
-        await cursor.execute(query)
-        await connection.commit()
-        await self._session_pool.release(connection)
+        async with self._session_pool.acquire() as connection:
+            with connection.cursor() as cursor:
+                await cursor.execute(query)
+                await connection.commit()
 
     @retry
     async def safe_execute(self, query: str, packed_values: dict) -> None:
@@ -129,11 +127,10 @@ class AsyncOracleConnection(object):
         :return: None
         """
 
-        connection = self._session_pool.acquire()
-        cursor = connection.cursor()
-        await cursor.execute(query, packed_values)
-        await connection.commit()
-        await self._session_pool.release(connection)
+        async with self._session_pool.acquire() as connection:
+            with connection.cursor() as cursor:
+                await cursor.execute(query, packed_values)
+                await connection.commit()
 
     @retry
     async def execute_multiple(self, queries: list[list[str, dict]]) -> None:
@@ -144,17 +141,16 @@ class AsyncOracleConnection(object):
         :return: None
         """
 
-        connection = self._session_pool.acquire()
-        cursor = connection.cursor()
-        for item in queries:
-            query = item[0]
-            packed_values = item[1]
-            if packed_values:
-                await cursor.execute(query, packed_values)
-            else:
-                await cursor.execute(query)
-        await connection.commit()
-        await self._session_pool.release(connection)
+        async with self._session_pool.acquire() as connection:
+            with connection.cursor() as cursor:
+                for item in queries:
+                    query = item[0]
+                    packed_values = item[1]
+                    if packed_values:
+                        await cursor.execute(query, packed_values)
+                    else:
+                        await cursor.execute(query)
+                await connection.commit()
 
     @retry
     async def execute_many(self, query: str, dictionary: list[dict]) -> None:
@@ -166,11 +162,10 @@ class AsyncOracleConnection(object):
         :return: None
         """
 
-        connection = self._session_pool.acquire()
-        cursor = connection.cursor()
-        await cursor.executemany(query, dictionary)
-        await connection.commit()
-        await self._session_pool.release(connection)
+        async with self._session_pool.acquire() as connection:
+            with connection.cursor() as cursor:
+                await cursor.executemany(query, dictionary)
+                await connection.commit()
 
     @retry
     async def fetch_data(self, query: str, packed_data=None):
@@ -182,14 +177,13 @@ class AsyncOracleConnection(object):
         :return: rows
         """
 
-        connection = self._session_pool.acquire()
-        cursor = connection.cursor()
-        if packed_data:
-            await cursor.execute(query, packed_data)
-        else:
-            await cursor.execute(query)
-        rows = cursor.fetchall()
-        await self._session_pool.release(connection)
+        async with self._session_pool.acquire() as connection:
+            with connection.cursor() as cursor:
+                if packed_data:
+                    await cursor.execute(query, packed_data)
+                else:
+                    await cursor.execute(query)
+                rows = cursor.fetchall()
         return rows
 
     @retry