Dropped Connection.status

It is almost a synonym of closed. Will add an object to get all the info
from the connection.

diff --git a/psycopg3/psycopg3/connection.py b/psycopg3/psycopg3/connection.py
index 3661989342cecfc14def095463f542a4e9ba8f6c..9ef0c9935972853ab584d43b82496b9dc94a150f 100644 (file)
--- a/psycopg3/psycopg3/connection.py
+++ b/psycopg3/psycopg3/connection.py
@@ -95,11 +95,7 @@ class BaseConnection:
     @property
     def closed(self) -> bool:
         """`true` if the connection is closed."""
-        return self.status == self.ConnStatus.BAD
-
-    @property
-    def status(self) -> pq.ConnStatus:
-        return self.pgconn.status
+        return self.pgconn.status == self.ConnStatus.BAD
 
     @property
     def autocommit(self) -> bool:

diff --git a/psycopg3/psycopg3/cursor.py b/psycopg3/psycopg3/cursor.py
index 995ba8124f7de37cb11fecba2eddd1645fb1262c..ef7d2bc0e8184a80346263c7cfe912d525e834be 100644 (file)
--- a/psycopg3/psycopg3/cursor.py
+++ b/psycopg3/psycopg3/cursor.py
@@ -222,10 +222,10 @@ class BaseCursor:
         if self.connection.closed:
             raise e.InterfaceError("the connection is closed")
 
-        if self.connection.status != self.connection.ConnStatus.OK:
+        if self.connection.pgconn.status != self.connection.ConnStatus.OK:
             raise e.InterfaceError(
                 f"cannot execute operations: the connection is"
-                f" in status {self.connection.status}"
+                f" in status {self.connection.pgconn.status}"
             )
 
         self._reset()

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 7f4503bf4f5f1d48a4c4b7854d1ffd771464b9ab..126865376e074eee33cf10750735a8ad06fff68a 100644 (file)
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -12,7 +12,8 @@ from psycopg3.conninfo import conninfo_to_dict
 
 def test_connect(dsn):
     conn = Connection.connect(dsn)
-    assert conn.status == conn.ConnStatus.OK
+    assert not conn.closed
+    assert conn.pgconn.status == conn.ConnStatus.OK
 
 
 def test_connect_str_subclass(dsn):
@@ -20,7 +21,8 @@ def test_connect_str_subclass(dsn):
         pass
 
     conn = Connection.connect(MyString(dsn))
-    assert conn.status == conn.ConnStatus.OK
+    assert not conn.closed
+    assert conn.pgconn.status == conn.ConnStatus.OK
 
 
 def test_connect_bad():
@@ -32,13 +34,13 @@ def test_close(conn):
     assert not conn.closed
     conn.close()
     assert conn.closed
-    assert conn.status == conn.ConnStatus.BAD
+    assert conn.pgconn.status == conn.ConnStatus.BAD
 
     cur = conn.cursor()
 
     conn.close()
     assert conn.closed
-    assert conn.status == conn.ConnStatus.BAD
+    assert conn.pgconn.status == conn.ConnStatus.BAD
 
     with pytest.raises(psycopg3.InterfaceError):
         cur.execute("select 1")

diff --git a/tests/test_connection_async.py b/tests/test_connection_async.py
index ca53b9788da32a4534b3f2d43c98d6eed3090bcc..86dc0345c9533ce1e3759a448602afb2cfa4fdfe 100644 (file)
--- a/tests/test_connection_async.py
+++ b/tests/test_connection_async.py
@@ -14,7 +14,8 @@ pytestmark = pytest.mark.asyncio
 
 async def test_connect(dsn):
     conn = await AsyncConnection.connect(dsn)
-    assert conn.status == conn.ConnStatus.OK
+    assert not conn.closed
+    assert conn.pgconn.status == conn.ConnStatus.OK
 
 
 @pytest.mark.asyncio
@@ -28,20 +29,21 @@ async def test_connect_str_subclass(dsn):
         pass
 
     conn = await AsyncConnection.connect(MyString(dsn))
-    assert conn.status == conn.ConnStatus.OK
+    assert not conn.closed
+    assert conn.pgconn.status == conn.ConnStatus.OK
 
 
 async def test_close(aconn):
     assert not aconn.closed
     await aconn.close()
     assert aconn.closed
-    assert aconn.status == aconn.ConnStatus.BAD
+    assert aconn.pgconn.status == aconn.ConnStatus.BAD
 
     cur = await aconn.cursor()
 
     await aconn.close()
     assert aconn.closed
-    assert aconn.status == aconn.ConnStatus.BAD
+    assert aconn.pgconn.status == aconn.ConnStatus.BAD
 
     with pytest.raises(psycopg3.InterfaceError):
         await cur.execute("select 1")