[ES-402013] Check that closing the connection also closes any active cursors.

Signed-off-by: Jesse Whitehouse <[email protected]>

Author: susodapop

src/databricks/sql/client.py

@@ -181,13 +181,14 @@ def close(self) -> None:
         self._close()
 
     def _close(self, close_cursors=True) -> None:
-        self.thrift_backend.close_session(self._session_handle)
-        self.open = False
-
         if close_cursors:
             for cursor in self._cursors:
                 cursor.close()
 
+        self.thrift_backend.close_session(self._session_handle)
+        self.open = False
+
+
     def commit(self):
         """No-op because Databricks does not support transactions"""
         pass

tests/e2e/driver_tests.py

@@ -544,6 +544,17 @@ def test_decimal_not_returned_as_strings_arrow(self):
                 decimal_type = arrow_df.field(0).type
                 self.assertTrue(pyarrow.types.is_decimal(decimal_type))
 
+    def test_close_connection_closes_cursors(self):
+        with self.connection() as conn:
+            cursor = conn.cursor()
+            cursor.execute('SELECT id, id `id2`, id `id3` FROM RANGE(1000000) order by RANDOM()')
+            ars = cursor.active_result_set
+            assert not bool(ars.has_been_closed_server_side)
+            conn.close()
+            assert bool(ars.has_been_closed_server_side)
+            cursor.close()
+
+
 
 # use a RetrySuite to encapsulate these tests which we'll typically want to run together; however keep
 # the 429/503 subsuites separate since they execute under different circumstances.