diff --git a/src/snowflake/snowpark/_internal/server_connection.py b/src/snowflake/snowpark/_internal/server_connection.py index aae3f71b07..4dcbeb0463 100644 --- a/src/snowflake/snowpark/_internal/server_connection.py +++ b/src/snowflake/snowpark/_internal/server_connection.py @@ -54,6 +54,7 @@ get_plan_telemetry_metrics, ) from snowflake.snowpark._internal.utils import ( + IS_V5_DRIVER, create_rlock, create_thread_local, escape_quotes, @@ -462,7 +463,9 @@ def execute_and_notify_query_listener( ) raise ex - notify_kwargs["requestId"] = str(results_cursor._request_id) + notify_kwargs["requestId"] = str( + results_cursor.request_id if IS_V5_DRIVER else results_cursor._request_id + ) self.notify_query_listeners( QueryRecord(results_cursor.sfqid, results_cursor.query), **notify_kwargs ) diff --git a/tests/unit/test_server_connection.py b/tests/unit/test_server_connection.py index a53d42dc16..824d0e3e66 100644 --- a/tests/unit/test_server_connection.py +++ b/tests/unit/test_server_connection.py @@ -13,6 +13,7 @@ from snowflake.connector.network import ReauthenticationRequest from snowflake.snowpark import Session from snowflake.snowpark._internal.analyzer.snowflake_plan import Query, SnowflakePlan +from snowflake.snowpark._internal.utils import IS_V5_DRIVER from snowflake.snowpark.exceptions import ( SnowparkFetchDataException, SnowparkQueryCancelledException, @@ -95,7 +96,10 @@ def test_run_query_exceptions(mock_server_connection, caplog): mock_server_connection._cursor.execute.return_value = mock_server_connection._cursor mock_server_connection._cursor.sfqid = "fake id" mock_server_connection._cursor.query = "fake query" - mock_server_connection._cursor._request_id = "1234" + if IS_V5_DRIVER: + mock_server_connection._cursor.request_id = "1234" + else: + mock_server_connection._cursor._request_id = "1234" with mock.patch.object( mock_server_connection._cursor, "fetch_pandas_all",