make execute and executemany synchronous; update tests to reflect changes; add await_ adaptation

Author: Eugene Shershen

psqlpy_sqlalchemy/connection.py

@@ -45,6 +45,7 @@ def __init__(
     ) -> None:
         self._adapt_connection = adapt_connection
         self._connection = adapt_connection._connection
+        self.await_ = adapt_connection.await_
         self._rows: deque[t.Any] = deque()
         self._description: t.Optional[t.List[t.Tuple[t.Any, ...]]] = None
         self._arraysize = 1
@@ -350,19 +351,19 @@ async def _executemany(
             True,
         )
 
-    async def execute(
+    def execute(
         self,
         operation: t.Any,
         parameters: t.Union[
             t.Sequence[t.Any], t.Mapping[str, Any], None
         ] = None,
     ) -> None:
-        await self._prepare_execute(operation, parameters)
+        self.await_(self._prepare_execute(operation, parameters))
 
-    async def executemany(
+    def executemany(
         self, operation: t.Any, seq_of_parameters: t.Sequence[t.Any]
     ) -> None:
-        await self._executemany(operation, seq_of_parameters)
+        self.await_(self._executemany(operation, seq_of_parameters))
 
     def setinputsizes(self, *inputsizes: t.Any) -> None:
         raise NotImplementedError

tests/test_connection.py

@@ -51,6 +51,7 @@ def setUp(self):
             "connection_errors": 0,
         }
         self.mock_adapt_connection._connection_valid = True
+        self.mock_adapt_connection.await_ = Mock()
 
         self.cursor = AsyncAdapt_psqlpy_cursor(self.mock_adapt_connection)
 
@@ -216,10 +217,8 @@ def test_execute(self, mock_prepare_execute):
         operation = "SELECT * FROM table"
         parameters = {"id": 123}
 
-        # Since execute is now async, we need to run it in an async context
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation, parameters))
+        # Execute is now synchronous and uses await_ internally
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)
 
@@ -231,10 +230,8 @@ def test_executemany(self, mock_executemany):
         operation = "INSERT INTO table VALUES ($1, $2)"
         seq_of_parameters = [[1, "a"], [2, "b"]]
 
-        # Since executemany is now async, we need to run it in an async context
-        import asyncio
-
-        asyncio.run(self.cursor.executemany(operation, seq_of_parameters))
+        # Executemany is now synchronous and uses await_ internally
+        self.cursor.executemany(operation, seq_of_parameters)
 
         mock_executemany.assert_called_once_with(operation, seq_of_parameters)
 
@@ -306,10 +303,8 @@ def test_executemany_coverage(self, mock_executemany):
         operation = "INSERT INTO test VALUES ($1, $2)"
         seq_of_parameters = [[1, "a"], [2, "b"]]
 
-        # Since executemany is now async, we need to run it in an async context
-        import asyncio
-
-        asyncio.run(self.cursor.executemany(operation, seq_of_parameters))
+        # Executemany is now synchronous and uses await_ internally
+        self.cursor.executemany(operation, seq_of_parameters)
 
         mock_executemany.assert_called_once_with(operation, seq_of_parameters)
 
@@ -321,9 +316,7 @@ def test_execute_update_basic(self, mock_prepare_execute):
         """Test basic UPDATE operation with execute method"""
         operation = "UPDATE users SET name = 'John' WHERE id = 1"
 
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation))
+        self.cursor.execute(operation)
 
         mock_prepare_execute.assert_called_once_with(operation, None)
 
@@ -337,9 +330,7 @@ def test_execute_update_with_named_parameters(self, mock_prepare_execute):
         )
         parameters = {"name": "John Doe", "email": "[email protected]", "id": 1}
 
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation, parameters))
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)
 
@@ -353,9 +344,7 @@ def test_execute_update_with_positional_parameters(
         operation = "UPDATE users SET name = $1, email = $2 WHERE id = $3"
         parameters = ["John Doe", "[email protected]", 1]
 
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation, parameters))
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)
 
@@ -372,9 +361,7 @@ def test_execute_update_multiple_columns(self, mock_prepare_execute):
             "id": 2,
         }
 
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation, parameters))
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)
 
@@ -386,9 +373,7 @@ def test_execute_update_with_where_clause(self, mock_prepare_execute):
         operation = "UPDATE users SET status = :status WHERE age > :min_age AND created_at < :date"
         parameters = {"status": "active", "min_age": 18, "date": "2023-01-01"}
 
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation, parameters))
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)
 
@@ -404,9 +389,7 @@ def test_executemany_update_operations(self, mock_executemany):
             ["Bob Johnson", "[email protected]", 3],
         ]
 
-        import asyncio
-
-        asyncio.run(self.cursor.executemany(operation, seq_of_parameters))
+        self.cursor.executemany(operation, seq_of_parameters)
 
         mock_executemany.assert_called_once_with(operation, seq_of_parameters)
 
@@ -421,9 +404,7 @@ def test_executemany_update_with_dict_parameters(self, mock_executemany):
             {"name": "Jane Updated", "id": 2},
         ]
 
-        import asyncio
-
-        asyncio.run(self.cursor.executemany(operation, seq_of_parameters))
+        self.cursor.executemany(operation, seq_of_parameters)
 
         mock_executemany.assert_called_once_with(operation, seq_of_parameters)
 
@@ -436,9 +417,7 @@ def test_execute_update_with_uuid_parameter(self, mock_prepare_execute):
         operation = "UPDATE users SET profile_id = :profile_id WHERE id = :id"
         parameters = {"profile_id": test_uuid, "id": 1}
 
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation, parameters))
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)
 
@@ -455,7 +434,7 @@ def test_execute_update_async_greenlet_fix(self, mock_prepare_execute):
         import asyncio
 
         # This should not raise any greenlet-related errors
-        asyncio.run(self.cursor.execute(operation, parameters))
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)
 
@@ -472,9 +451,7 @@ def test_execute_update_with_null_values(self, mock_prepare_execute):
         )
         parameters = {"email": None, "phone": None, "id": 1}
 
-        import asyncio
-
-        asyncio.run(self.cursor.execute(operation, parameters))
+        self.cursor.execute(operation, parameters)
 
         mock_prepare_execute.assert_called_once_with(operation, parameters)