correct some merge artifacts

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

Author: varun-edachali-dbx

src/databricks/sql/client.py

@@ -782,14 +782,6 @@ def execute(
             async_op=False,
             enforce_embedded_schema_correctness=enforce_embedded_schema_correctness,
         )
-        self.active_result_set = ResultSet(
-            self.connection,
-            execute_response,
-            self.backend,
-            self.buffer_size_bytes,
-            self.arraysize,
-            self.connection.use_cloud_fetch,
-        )
 
         if self.active_result_set.is_staging_operation:
             self._handle_staging_operation(

tests/unit/test_client.py

@@ -102,10 +102,8 @@ def test_closing_connection_closes_commands(self, mock_result_set_class):
                 # Close the connection
                 connection.close()
 
-                self.assertTrue(
-                    mock_result_set_class.return_value.has_been_closed_server_side
-                )
-                mock_result_set_class.return_value.close.assert_called_once_with()
+                # Check that the manually created mock result set's close method was called
+                mock_result_set.close.assert_called_once_with()
 
     @patch("%s.session.ThriftDatabricksClient" % PACKAGE_NAME)
     def test_cant_open_cursor_on_closed_connection(self, mock_client_class):