consequent changes

Signed-off-by: Vikrant Puppala <vikrant.puppala@databricks.com>

Author: vikrantpuppala

src/databricks/sql/client.py

@@ -335,15 +335,8 @@ def get_session_id(self):
     @staticmethod
     def get_protocol_version(openSessionResp):
         """
-        Since the sessionHandle will sometimes have a serverProtocolVersion, it takes
-        precedence over the serverProtocolVersion defined in the OpenSessionResponse.
+        Return the serverProtocolVersion from the OpenSessionResponse.
         """
-        if (
-            openSessionResp.sessionHandle
-            and hasattr(openSessionResp.sessionHandle, "serverProtocolVersion")
-            and openSessionResp.sessionHandle.serverProtocolVersion
-        ):
-            return openSessionResp.sessionHandle.serverProtocolVersion
         return openSessionResp.serverProtocolVersion
 
     @staticmethod
@@ -754,7 +747,6 @@ def execute(
         self,
         operation: str,
         parameters: Optional[TParameterCollection] = None,
-        enforce_embedded_schema_correctness=False,
     ) -> "Cursor":
         """
         Execute a query and wait for execution to complete.
@@ -819,7 +811,6 @@ def execute(
             use_cloud_fetch=self.connection.use_cloud_fetch,
             parameters=prepared_params,
             async_op=False,
-            enforce_embedded_schema_correctness=enforce_embedded_schema_correctness,
         )
         self.active_result_set = ResultSet(
             self.connection,
@@ -841,7 +832,6 @@ def execute_async(
         self,
         operation: str,
         parameters: Optional[TParameterCollection] = None,
-        enforce_embedded_schema_correctness=False,
     ) -> "Cursor":
         """
 
@@ -882,7 +872,6 @@ def execute_async(
             use_cloud_fetch=self.connection.use_cloud_fetch,
             parameters=prepared_params,
             async_op=True,
-            enforce_embedded_schema_correctness=enforce_embedded_schema_correctness,
         )
 
         return self

src/databricks/sql/thrift_backend.py

@@ -884,7 +884,6 @@ def execute_command(
         use_cloud_fetch=True,
         parameters=[],
         async_op=False,
-        enforce_embedded_schema_correctness=False,
     ):
         assert session_handle is not None
 
@@ -916,7 +915,6 @@ def execute_command(
             },
             useArrowNativeTypes=spark_arrow_types,
             parameters=parameters,
-            enforceEmbeddedSchemaCorrectness=enforce_embedded_schema_correctness,
         )
         resp = self.make_request(self._client.ExecuteStatement, req)
 

tests/unit/test_parameters.py

@@ -42,17 +42,15 @@ class TestSessionHandleChecks(object):
             (
                 TOpenSessionResp(
                     serverProtocolVersion=ttypes.TProtocolVersion.SPARK_CLI_SERVICE_PROTOCOL_V7,
-                    sessionHandle=TSessionHandle(1, None),
+                    sessionHandle=TSessionHandle(1),
                 ),
                 ttypes.TProtocolVersion.SPARK_CLI_SERVICE_PROTOCOL_V7,
             ),
-            # Ensure that protocol version inside sessionhandle takes precedence.
+            # This test no longer tests serverProtocolVersion precedence since TSessionHandle was changed
             (
                 TOpenSessionResp(
-                    serverProtocolVersion=ttypes.TProtocolVersion.SPARK_CLI_SERVICE_PROTOCOL_V7,
-                    sessionHandle=TSessionHandle(
-                        1, ttypes.TProtocolVersion.SPARK_CLI_SERVICE_PROTOCOL_V8
-                    ),
+                    serverProtocolVersion=ttypes.TProtocolVersion.SPARK_CLI_SERVICE_PROTOCOL_V8,
+                    sessionHandle=TSessionHandle(1),
                 ),
                 ttypes.TProtocolVersion.SPARK_CLI_SERVICE_PROTOCOL_V8,
             ),