fix: thrift_backend->backend, ResultSet -> ThriftResultSet

Signed-off-by: varun-edachali-dbx <[email protected]>

Author: varun-edachali-dbx

src/databricks/sql/client.py

@@ -1092,7 +1092,7 @@ def close(self) -> None:
         # Close active operation handle if it exists
         if self.active_op_handle:
             try:
-                self.thrift_backend.close_command(self.active_op_handle)
+                self.backend.close_command(self.active_op_handle)
             except RequestError as e:
                 if isinstance(e.args[1], CursorAlreadyClosedError):
                     logger.info("Operation was canceled by a prior request")

tests/unit/test_client.py

@@ -612,9 +612,9 @@ def mock_close_normal():
 
     def test_resultset_close_handles_cursor_already_closed_error(self):
         """Test that ResultSet.close() handles CursorAlreadyClosedError properly."""
-        result_set = client.ResultSet.__new__(client.ResultSet)
-        result_set.thrift_backend = Mock()
-        result_set.thrift_backend.CLOSED_OP_STATE = 'CLOSED'
+        result_set = client.ThriftResultSet.__new__(client.ThriftResultSet)
+        result_set.backend = Mock()
+        result_set.backend.CLOSED_OP_STATE = 'CLOSED'
         result_set.connection = Mock()
         result_set.connection.open = True
         result_set.op_state = 'RUNNING'
@@ -625,29 +625,29 @@ class MockRequestError(Exception):
             def __init__(self):
                 self.args = ["Error message", CursorAlreadyClosedError()]
 
-        result_set.thrift_backend.close_command.side_effect = MockRequestError()
+        result_set.backend.close_command.side_effect = MockRequestError()
 
         original_close = client.ResultSet.close
         try:
             try:
                 if (
-                    result_set.op_state != result_set.thrift_backend.CLOSED_OP_STATE
+                    result_set.op_state != result_set.backend.CLOSED_OP_STATE
                     and not result_set.has_been_closed_server_side
                     and result_set.connection.open
                 ):
-                    result_set.thrift_backend.close_command(result_set.command_id)
+                    result_set.backend.close_command(result_set.command_id)
             except MockRequestError as e:
                 if isinstance(e.args[1], CursorAlreadyClosedError):
                     pass
             finally:
                 result_set.has_been_closed_server_side = True
-                result_set.op_state = result_set.thrift_backend.CLOSED_OP_STATE
+                result_set.op_state = result_set.backend.CLOSED_OP_STATE
 
-            result_set.thrift_backend.close_command.assert_called_once_with(result_set.command_id)
+            result_set.backend.close_command.assert_called_once_with(result_set.command_id)
 
             assert result_set.has_been_closed_server_side is True
 
-            assert result_set.op_state == result_set.thrift_backend.CLOSED_OP_STATE
+            assert result_set.op_state == result_set.backend.CLOSED_OP_STATE
         finally:
             pass