wcp-library 1.3.8__py3-none-any.whl → 1.3.9__py3-none-any.whl

wcp_library/sql/postgres.py

@@ -3,6 +3,7 @@ from typing import Optional
 
 import numpy as np
 import pandas as pd
+from psycopg.conninfo import make_conninfo
 from psycopg.sql import SQL
 from psycopg_pool import AsyncConnectionPool, ConnectionPool
 
@@ -26,10 +27,11 @@ def _connect_warehouse(username: str, password: str, hostname: str, port: int, d
     :return: session_pool
     """
 
-    url = f"postgres://{username}:{password}@{hostname}:{port}/{database}"
+    conn_string = f"dbname={database} user={username} password={password} host={hostname} port={port}"
+    conninfo = make_conninfo(conn_string)
 
     session_pool = ConnectionPool(
-        conninfo=url,
+        conninfo=conninfo,
         min_size=min_connections,
         max_size=max_connections,
         open=True
@@ -52,14 +54,14 @@ async def _async_connect_warehouse(username: str, password: str, hostname: str,
     :return: session_pool
     """
 
-    url = f"postgres://{username}:{password}@{hostname}:{port}/{database}"
+    conn_string = f"dbname={database} user={username} password={password} host={hostname} port={port}"
+    conninfo = make_conninfo(conn_string)
 
     session_pool = AsyncConnectionPool(
-        conninfo=url,
+        conninfo=conninfo,
         min_size=min_connections,
-        max_size=max_connections,
+        max_size=max_connections
     )
-    await session_pool.open()
     return session_pool
 
 
@@ -319,6 +321,7 @@ class AsyncPostgresConnection(object):
 
         self._session_pool = await _async_connect_warehouse(self._username, self._password, self._hostname, self._port,
                                                             self._database, self.min_connections, self.max_connections)
+        await self._session_pool.open()
 
     async def set_user(self, credentials_dict: dict) -> None:
         """
@@ -413,6 +416,7 @@ class AsyncPostgresConnection(object):
 
         async with self._session_pool.connection() as connection:
             cursor = connection.cursor()
+            # await cursor.execute("set datestyle = 'SQL, DMY'")
             if packed_data:
                 await cursor.execute(query, packed_data)
             else:

{wcp_library-1.3.8.dist-info → wcp_library-1.3.9.dist-info}/METADATA

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

{wcp_library-1.3.8.dist-info → wcp_library-1.3.9.dist-info}/RECORD

@@ -16,8 +16,8 @@ wcp_library/logging.py,sha256=e6gG7HFgUrMajUZs4Gs0atFfOJJmdmxN0GerfynNWlY,2061
 wcp_library/selenium_helper.py,sha256=w8YUC0pq7TkWiobc2ri4QR5fcHrrZgB5RAEfAdxZiuk,3780
 wcp_library/sql/__init__.py,sha256=s2psmwkq_ZU23iGWvXjJrLu0hD1fB6CDv6RHcK7y828,1917
 wcp_library/sql/oracle.py,sha256=TGiTC5L5UcM5QcHFajgn43NI8HygOGIEAtLmLbVFp2I,15772
-wcp_library/sql/postgres.py,sha256=ZgnRICggYvBohuRjscgemIqmHP8treqHppa1kqWXvZ0,14545
+wcp_library/sql/postgres.py,sha256=hyvENlOMyE1vcfPIy94KvtD67lCs5c4BMCKJbbIHNEY,14812
 wcp_library/time.py,sha256=ktSzhK7SZnGPNXobFexnhFGQAcriLCJQKxnO0fed8fQ,1740
-wcp_library-1.3.8.dist-info/METADATA,sha256=p981HggFHJEBYts10G30OCP82PZHINUl82iPP-8tZnc,1552
-wcp_library-1.3.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-wcp_library-1.3.8.dist-info/RECORD,,
+wcp_library-1.3.9.dist-info/METADATA,sha256=8pXOreCzBh0TyYAKe_zSRIMHkl0eEQWCvbJn76HupCA,1552
+wcp_library-1.3.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wcp_library-1.3.9.dist-info/RECORD,,