]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
refactor: move setting autocommit on connection out of _connect_gen
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Wed, 25 Oct 2023 18:23:08 +0000 (20:23 +0200)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Sat, 11 Nov 2023 19:16:40 +0000 (19:16 +0000)
psycopg/psycopg/_connection_base.py
psycopg/psycopg/connection.py
psycopg/psycopg/connection_async.py

index fb8db5d91a2b8d4f3e78983e0bda165751394255..cf391998bd39ae16bb0900a67e65c7c9f2f5d869 100644 (file)
@@ -423,13 +423,10 @@ class BaseConnection(Generic[Row]):
     def _connect_gen(
         cls: Type[ConnectionType],
         conninfo: str = "",
-        *,
-        autocommit: bool = False,
     ) -> PQGenConn[ConnectionType]:
         """Generator to connect to the database and create a new instance."""
         pgconn = yield from generators.connect(conninfo)
         conn = cls(pgconn)
-        conn._autocommit = bool(autocommit)
         return conn
 
     def _exec_command(
index a5adf2a92b540816f7c3417ca5ceb2479a2146fe..7d2418d8163b7f33cf1507a5e1e4acc759f1901c 100644 (file)
@@ -123,12 +123,12 @@ class Connection(BaseConnection[Row]):
 
         try:
             rv = cls._wait_conn(
-                cls._connect_gen(conninfo, autocommit=autocommit),
-                timeout=params["connect_timeout"],
+                cls._connect_gen(conninfo), timeout=params["connect_timeout"]
             )
         except e._NO_TRACEBACK as ex:
             raise ex.with_traceback(None)
 
+        rv._autocommit = bool(autocommit)
         if row_factory:
             rv.row_factory = row_factory
         if cursor_factory:
index 862a1ebe04008ea095b3b0a45a78607d8a9e2383..868c22ee75cd154113e72ef336f25d65fca97110 100644 (file)
@@ -139,12 +139,12 @@ class AsyncConnection(BaseConnection[Row]):
 
         try:
             rv = await cls._wait_conn(
-                cls._connect_gen(conninfo, autocommit=autocommit),
-                timeout=params["connect_timeout"],
+                cls._connect_gen(conninfo), timeout=params["connect_timeout"]
             )
         except e._NO_TRACEBACK as ex:
             raise ex.with_traceback(None)
 
+        rv._autocommit = bool(autocommit)
         if row_factory:
             rv.row_factory = row_factory
         if cursor_factory: