wcp-library 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

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

{wcp_library-1.0.6.dist-info → wcp_library-1.0.8.dist-info}/METADATA

@@ -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.dist-info → wcp_library-1.0.8.dist-info}/RECORD

@@ -4,7 +4,7 @@ wcp_library/async_credentials/api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 wcp_library/async_credentials/oracle.py,sha256=MvC7wsHnSyAyPGnRVlH0dvvW2xk5ap_IAByoHX4rUWY,5436
 wcp_library/async_credentials/postgres.py,sha256=3wjqtLH0Nc-U80iscYnz5DV-9M2X4IjPW51C5MI2_tI,5297
 wcp_library/async_sql/__init__.py,sha256=m4eWmUGYUEDomhhOp1ScB2uSIXFsNUNO589o5RwWdyM,1035
-wcp_library/async_sql/oracle.py,sha256=cqEWyCgyvAD0gwMUlXOhnW2hI02IPJfjwyyhs06pri8,7411
+wcp_library/async_sql/oracle.py,sha256=XBGE6PPzZbLcHBJghxu3rkK9ZZ5Fp42Sm0-ZWSpzsWA,7392
 wcp_library/async_sql/postgres.py,sha256=7ehET1l42gKnsOcqeWLcXBEdYfvvA1qVfdG0QJv57Vk,6593
 wcp_library/credentials/__init__.py,sha256=HRmg7mqcATeclIz3lZQjSR4nmK6aY6MK9-QXEYZoFrw,1857
 wcp_library/credentials/api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,6 +16,6 @@ wcp_library/logging.py,sha256=h8p_Ezo_QPSIKrPxzIlNVXddU4IXHyp1_2NqVDirfuk,1958
 wcp_library/sql/__init__.py,sha256=CLlBEBrWVAwE79bUxuQiwikSrYH8m9QRYSJ2l0-ofsY,1003
 wcp_library/sql/oracle.py,sha256=ur91kgds11M7xiGlDNkodxu2P7M-crqK0toYJcOHgdo,7285
 wcp_library/sql/postgres.py,sha256=hIw9ckxV_iRqZA0rSCMmbG82iil8mY4g-ajtHYVIq3I,6492
-wcp_library-1.0.6.dist-info/METADATA,sha256=c0TbPZ1rbmadB7lQ2Jdc2tR-7b7bPjkRMrsgfkUISaE,1338
-wcp_library-1.0.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-wcp_library-1.0.6.dist-info/RECORD,,
+wcp_library-1.0.8.dist-info/METADATA,sha256=8p_UNTEOGEJgW_Sro62or-pXb2Z2DGjJOKf5wow8U4Q,1338
+wcp_library-1.0.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wcp_library-1.0.8.dist-info/RECORD,,