Respect mixed-case SPOG org-id headers

Signed-off-by: Madhavendra Rathore <madhavendra.rathore@databricks.com>

Author: msrathore-db

src/databricks/sql/session.py

@@ -73,10 +73,10 @@ def __init__(
         base_headers = [("User-Agent", self.useragent_header)]
         all_headers = (http_headers or []) + base_headers
 
-        # Extract ?o=<workspaceId> from http_path for SPOG routing.
-        # On SPOG hosts, the httpPath contains ?o=<workspaceId> which routes Thrift
-        # requests via the URL. For SEA, telemetry, and feature flags (which use
-        # separate endpoints), we inject x-databricks-org-id as an HTTP header.
+        # Extract workspace context from http_path for SPOG routing.
+        # On SPOG hosts, the http_path can contain either ?o=<workspaceId> or an
+        # all-purpose-compute /o/<workspaceId>/ path segment. For SEA, telemetry,
+        # and feature flags, we inject x-databricks-org-id as an HTTP header.
         self._spog_headers = self._extract_spog_headers(http_path, all_headers)
         if self._spog_headers:
             all_headers = all_headers + list(self._spog_headers.items())
@@ -197,8 +197,8 @@ def _extract_spog_headers(http_path, existing_headers):
         if not http_path:
             return {}
 
-        # Caller already set the header — never override.
-        if any(k == "x-databricks-org-id" for k, _ in existing_headers):
+        # Caller already set the header; never override. Header names are case-insensitive.
+        if any(k.lower() == "x-databricks-org-id" for k, _ in existing_headers):
             logger.debug(
                 "SPOG header extraction: x-databricks-org-id already set by caller, "
                 "not extracting from http_path"
@@ -239,7 +239,7 @@ def _extract_spog_headers(http_path, existing_headers):
         return {"x-databricks-org-id": org_id}
 
     def get_spog_headers(self):
-        """Returns SPOG routing headers (x-databricks-org-id) if ?o= was in http_path."""
+        """Returns extracted SPOG routing headers (x-databricks-org-id), if any."""
         return dict(self._spog_headers)
 
     def open(self):

tests/unit/test_session.py

@@ -268,6 +268,13 @@ def test_explicit_header_takes_precedence(self):
         )
         assert result == {}
 
+    def test_explicit_header_takes_precedence_case_insensitively(self):
+        existing = [("X-Databricks-Org-Id", "explicit-value")]
+        result = Session._extract_spog_headers(
+            "/sql/1.0/warehouses/abc123?o=6051921418418893", existing
+        )
+        assert result == {}
+
     def test_multiple_query_params(self):
         result = Session._extract_spog_headers(
             "/sql/1.0/warehouses/abc123?o=12345&extra=val", []