From: Denis Laxalde <denis.laxalde@dalibo.com>
Date: Wed, 5 May 2021 07:40:26 +0000 (+0200)
Subject: Build conninfo in *Connection.connect()
X-Git-Tag: 3.0.dev0~36^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee254d8a20916c4e329761ebd683fc597416bcf7;p=thirdparty%2Fpsycopg.git

Build conninfo in *Connection.connect()

We'll need to extract 'connect_timeout' from the connection string and
use it outside Connection._connect_gen() in the next commit.
---

diff --git a/psycopg3/psycopg3/connection.py b/psycopg3/psycopg3/connection.py
index 3e3a90e4a..22af61d43 100644
--- a/psycopg3/psycopg3/connection.py
+++ b/psycopg3/psycopg3/connection.py
@@ -358,10 +358,8 @@ class BaseConnection(AdaptContext, Generic[Row]):
         *,
         autocommit: bool = False,
         row_factory: Optional[RowFactory[Any]] = None,
-        **kwargs: Any,
     ) -> PQGenConn[ConnectionType]:
         """Generator to connect to the database and create a new instance."""
-        conninfo = make_conninfo(conninfo, **kwargs)
         pgconn = yield from connect(conninfo)
         if not row_factory:
             row_factory = tuple_row
@@ -488,12 +486,10 @@ class Connection(BaseConnection[Row]):
 
         TODO: connection_timeout to be implemented.
         """
+        conninfo = make_conninfo(conninfo, **kwargs)
         return cls._wait_conn(
             cls._connect_gen(
-                conninfo,
-                autocommit=autocommit,
-                row_factory=row_factory,
-                **kwargs,
+                conninfo, autocommit=autocommit, row_factory=row_factory
             )
         )
 
@@ -701,12 +697,10 @@ class AsyncConnection(BaseConnection[Row]):
         row_factory: Optional[RowFactory[Row]] = None,
         **kwargs: Any,
     ) -> "AsyncConnection[Any]":
+        conninfo = make_conninfo(conninfo, **kwargs)
         return await cls._wait_conn(
             cls._connect_gen(
-                conninfo,
-                autocommit=autocommit,
-                row_factory=row_factory,
-                **kwargs,
+                conninfo, autocommit=autocommit, row_factory=row_factory
             )
         )