- Fix: Reverted change in cursor close handling which led to errors impacting users (databricks/databricks-sql-python#613 by@madhav-db)

- Update thrift client library after cleaning up unused fields and structs (databricks/databricks-sql-python#553 by@vikrantpuppala)

[tool.poetry]

name ="databricks-sql-connector"

version ="4.0.4"

version ="4.0.5"

description ="Databricks SQL Connector for Python"

authors = ["Databricks <databricks-sql-connector-maintainers@databricks.com>"]

license ="Apache-2.0"

DATE=DBAPITypeObject("date")

ROWID=DBAPITypeObject()

def__exit__(self,exc_type,exc_value,traceback):

try:

self.close()

exceptBaseExceptionase:

logger.warning(f"Exception during connection close in __exit__:{e}")

ifexc_typeisNone:

self.close()

def__del__(self):

ifself.open:

def__exit__(self,exc_type,exc_value,traceback):

try:

logger.debug("Cursor context manager exiting, calling close()")

self.close()

exceptBaseExceptionase:

logger.warning(f"Exception during cursor close in __exit__:{e}")

ifexc_typeisNone:

self.close()

def__iter__(self):

ifself.active_result_set:

defclose(self)->None:

self.open=False

ifself.active_command_id:

try:

self.backend.close_command(self.active_command_id)

exceptRequestErrorase:

ifisinstance(e.args[1],CursorAlreadyClosedError):

logger.info("Operation was canceled by a prior request")

else:

logging.warning(f"Error closing operation handle:{e}")

exceptExceptionase:

logging.warning(f"Error closing operation handle:{e}")

finally:

self.active_command_id=None

self.active_op_handle=None

ifself.active_result_set:

self._close_and_clear_active_result_set()

assertrow[0]==row_id

deftest_long_running_query(self):

duration=time.time()-start

print("Took {} s with scale factor={}".format(duration,scale_factor))

scale_factor=math.ceil(1.5*scale_factor/current_fraction)

)asconn:

cursor=conn.cursor()

cursor.execute(query)

extra_params={"staging_allowed_local_path":new_temp_path}

)asconn:

cursor=conn.cursor()

cursor.execute(query)

withopen(new_fh,"rb")asfp:

withself.connection(extra_params={"staging_allowed_local_path":"/"})asconn:

cursor=conn.cursor()

Error,match="Staging operation over HTTP was unsuccessful: 404"

):

cursor=conn.cursor()

cursor.execute(query)

os.remove(temp_path)

fromtests.e2e.common.uc_volume_testsimportPySQLUCVolumeTestSuiteMixin

fromdatabricks.sql.excimportSessionAlreadyClosedError,CursorAlreadyClosedError

fromdatabricks.sql.excimportSessionAlreadyClosedError

log=logging.getLogger(__name__)

results=cursor.fetchall_arrow()

assertisinstance(results,pyarrow.Table)

deftest_close_connection_closes_cursors(self):

fromdatabricks.sql.thrift_api.TCLIServiceimportttypes

withself.connection()asconn:

cursor=conn.cursor()

cursor.execute(

)

ars=cursor.active_result_set

status_request=ttypes.TGetOperationStatusReq(

operationHandle=ars.command_id.to_thrift_handle(),

getProgressUpdate=False,

)

op_status_at_server=ars.backend._client.GetOperationStatus(status_request)

assertop_status_at_server.operationState!=CommandState.CLOSED

conn.close()

withpytest.raises(SessionAlreadyClosedError)ascm:

op_status_at_server=ars.backend._client.GetOperationStatus(

)

deftest_closing_a_closed_connection_doesnt_fail(self,caplog):

caplog.set_level(logging.DEBUG)

withself.connection()asconn:

conn.close()

assert"Session appears to have been closed already"incaplog.text

try:

withpytest.raises(KeyboardInterrupt):

withself.connection()asc:

raiseKeyboardInterrupt("Simulated interrupt")

finally:

ifconnisnotNone:

assert (

notconn.open

),"Connection should be closed after KeyboardInterrupt"

deftest_cursor_close_properly_closes_operation(self):

withself.connection()asconn:

cursor=conn.cursor()

try:

cursor.execute("SELECT 1 AS test")

assertcursor.active_command_idisnotNone

cursor.close()

assertcursor.active_command_idisNone

assertnotcursor.open

finally:

ifcursor.open:

cursor.close()

try:

withself.connection()asc:

withpytest.raises(KeyboardInterrupt):

withconn.cursor()ascur:

raiseKeyboardInterrupt("Simulated interrupt")

finally:

ifcursorisnotNone:

assert (

notcursor.open

),"Cursor should be closed after KeyboardInterrupt"

deftest_nested_cursor_context_managers(self):

withself.connection()asconn:

withconn.cursor()ascursor1:

cursor1.execute("SELECT 1 AS test1")

assertcursor1.active_command_idisnotNone

withconn.cursor()ascursor2:

cursor2.execute("SELECT 2 AS test2")

assertcursor2.active_command_idisnotNone

assertnotcursor2.open

assertcursor2.active_command_idisNone

assertnotcursor1.open

assertcursor1.active_command_idisNone

deftest_cursor_error_handling(self):

withself.connection()asconn:

cursor=conn.cursor()

cursor.execute("SELECT 1 AS test")

op_handle=cursor.active_command_id

conn.session.backend.close_command(op_handle)

cursor.close()

assertnotcursor.open

deftest_result_set_close(self):

withself.connection()asconn:

cursor=conn.cursor()

try:

cursor.execute("SELECT * FROM RANGE(10)")

result_set=cursor.active_result_set

initial_op_state=result_set.status

result_set.close()

assertresult_set.status==CommandState.CLOSED

assertresult_set.status!=initial_op_state

result_set.close()

finally:

cursor.close()