From 3cb197de5b071e58ddcd3f712fa5bf155a880132 Mon Sep 17 00:00:00 2001 From: Przemek Denkiewicz Date: Thu, 21 Dec 2023 11:16:34 +0100 Subject: [PATCH] Fix closing cursor with no previously running query --- tests/integration/test_dbapi_integration.py | 10 ---------- trino/dbapi.py | 4 +--- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/tests/integration/test_dbapi_integration.py b/tests/integration/test_dbapi_integration.py index cdb28043..e424d12d 100644 --- a/tests/integration/test_dbapi_integration.py +++ b/tests/integration/test_dbapi_integration.py @@ -1343,11 +1343,6 @@ def test_cancel_query(trino_connection): cur.fetchone() cur.cancel() # would raise an exception if cancel fails - cur = trino_connection.cursor() - with pytest.raises(Exception) as cancel_error: - cur.cancel() - assert "Cancel query failed; no running query" in str(cancel_error.value) - def test_close_cursor(trino_connection): cur = trino_connection.cursor() @@ -1355,11 +1350,6 @@ def test_close_cursor(trino_connection): cur.fetchone() cur.close() # would raise an exception if cancel fails - cur = trino_connection.cursor() - with pytest.raises(Exception) as cancel_error: - cur.close() - assert "Cancel query failed; no running query" in str(cancel_error.value) - def test_session_properties(run_trino): _, host, port = run_trino diff --git a/trino/dbapi.py b/trino/dbapi.py index c660772c..5ff68d22 100644 --- a/trino/dbapi.py +++ b/trino/dbapi.py @@ -694,9 +694,7 @@ def fetchall(self) -> List[List[Any]]: def cancel(self): if self._query is None: - raise trino.exceptions.OperationalError( - "Cancel query failed; no running query" - ) + return self._query.cancel() def close(self):