feat: support geospatial results on the kernel path

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Add the default-enabled `enableGeoSpatialSupport` option for kernel-backed GEOMETRY / GEOGRAPHY results. Enabled mode returns the canonical `{ srid, wkb }` Arrow value; disabled mode returns WKT / EWKT.
+- Pin transitive `brace-expansion` 1.x / 2.x and `ip-address` dependencies to patched releases for GHSA-6j4f-fj2g-mc7p, GHSA-qhr7-859c-m2p7, GHSA-j6r3-76f7-8jcv, and GHSA-h3mg-xc3c-68pw.
 - Fix Thrift `getFunctions()` to report the requested `FUNCTION_CAT`, matching JDBC and kernel.
 
 ## 2.2.0

CONNECTION_PARAMETERS.md

@@ -98,11 +98,12 @@ disabling verification.
 
 ## Results and type rendering
 
-| Option                        | Type      | Thrift | Kernel | Default Value | Note                                                                                                                                   |
-| ----------------------------- | --------- | :----: | :----: | ------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
-| `preserveBigNumericPrecision` | `boolean` |   ✅   |   ✅   | `false`       | Returns DECIMAL as an exact string and BIGINT as `bigint` on both.                                                                     |
-| `disableRowMaterialization`   | `boolean` |   ✅   |   ✅   | `false`       | Fetches and parses Arrow batches but returns `null` row placeholders instead of converting cells. Intended for fetch-throughput tests. |
-| `enableMetricViewMetadata`    | `boolean` |   ✅   |   ⚠️   | `false`       | Injected into session configuration on both paths. Kernel may drop its non-allowlisted configuration key.                              |
+| Option                        | Type      | Thrift | Kernel | Default Value | Note                                                                                                                                                                               |
+| ----------------------------- | --------- | :----: | :----: | ------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `preserveBigNumericPrecision` | `boolean` |   ✅   |   ✅   | `false`       | Returns DECIMAL as an exact string and BIGINT as `bigint` on both.                                                                                                                 |
+| `disableRowMaterialization`   | `boolean` |   ✅   |   ✅   | `false`       | Fetches and parses Arrow batches but returns `null` row placeholders instead of converting cells. Intended for fetch-throughput tests.                                             |
+| `enableGeoSpatialSupport`     | `boolean` |   ❌   |   ✅   | `true`        | Returns GEOMETRY / GEOGRAPHY as canonical `{ srid: number, wkb: Buffer }` values when `true`, or WKT / EWKT strings when `false`. The choice is local and is not forwarded to SEA. |
+| `enableMetricViewMetadata`    | `boolean` |   ✅   |   ⚠️   | `false`       | Injected into session configuration on both paths. Kernel may drop its non-allowlisted configuration key.                                                                          |
 
 ## Session defaults (`openSession(request)`)
 

KERNEL_REV

@@ -1 +1 @@
-4278294a0392cf138c170b071b855b03e29efe79
+b7e9310b27be16a6c42490e58c4b5c4a525320bc

lib/contracts/IDBSQLClient.ts

@@ -157,6 +157,17 @@ export type ConnectionOptions = {
    */
   disableRowMaterialization?: boolean;
 
+  /**
+   * Enable native kernel-backed `GEOMETRY` and `GEOGRAPHY` results. `true`
+   * (the default) returns the canonical Arrow value as
+   * `{ srid: number, wkb: Buffer }`; `false` returns WKT / EWKT strings.
+   * This is a client-side conversion choice and is never forwarded to the SQL
+   * Execution API.
+   *
+   * Only the kernel backend uses this option.
+   */
+  enableGeoSpatialSupport?: boolean;
+
   /**
    * Extra HTTP headers attached to driver-owned out-of-band requests
    * (telemetry POSTs and feature-flag GETs). Not applied to the primary

lib/kernel/KernelAuth.ts

@@ -115,6 +115,12 @@ export interface KernelSessionDefaults {
    * remove one.
    */
   complexTypesAsJson?: boolean;
+  /**
+   * Enable native GEOMETRY / GEOGRAPHY values. `true` (the default) returns
+   * canonical `struct<srid:int32,wkb:binary>` values; `false` returns WKT /
+   * EWKT strings. Applied locally by the kernel and never sent to SEA.
+   */
+  enableGeoSpatialSupport?: boolean;
   /**
    * Per-session kernel connection-pool size
    * (kernel `ConnectionOptions.max_connections`). Validated as a positive
@@ -819,6 +825,7 @@ export function buildKernelConnectionOptions(options: ConnectionOptions): Kernel
     hostName: string;
     httpPath: string;
     intervalsAsString: boolean;
+    enableGeoSpatialSupport: boolean;
     maxConnections?: number;
   } & KernelTlsOptions &
     KernelHttpOptions &
@@ -833,6 +840,9 @@ export function buildKernelConnectionOptions(options: ConnectionOptions): Kernel
     // (native Arrow) — they already decode identically to Thrift via the
     // shared Arrow converter, so `complexTypesAsJson` is not forced on.
     intervalsAsString: true,
+    // Match the public driver contract and the kernel default: geospatial
+    // support is enabled unless the caller explicitly requests WKT / EWKT.
+    enableGeoSpatialSupport: true,
     // TLS knobs (server-cert verification toggle + custom CA + mTLS client
     // identity). Validated and normalised (string PEM → Buffer) here so the
     // napi shape only sees a Buffer.
@@ -843,6 +853,15 @@ export function buildKernelConnectionOptions(options: ConnectionOptions): Kernel
     ...buildKernelProxyOptions(options),
   };
 
+  if (options.enableGeoSpatialSupport !== undefined) {
+    if (typeof options.enableGeoSpatialSupport !== 'boolean') {
+      throw new HiveDriverError(
+        `kernel backend: \`enableGeoSpatialSupport\` must be a boolean; got ${typeof options.enableGeoSpatialSupport}.`,
+      );
+    }
+    base.enableGeoSpatialSupport = options.enableGeoSpatialSupport;
+  }
+
   // kernel-only pool sizing; read via cast to match how this function reads the
   // other kernel-specific options (TLS) — they live on the internal options
   // surface, not the published public `ConnectionOptions` `.d.ts`.

package.json

@@ -104,9 +104,11 @@
     "basic-ftp": "^6.2.1",
     "@75lb/deep-merge": "^1.1.2",
     "ws": "^8.18.0",
-    "ip-address": "^10.1.1",
+    "ip-address": "^10.7.1",
     "form-data": "^4.0.4",
     "uuid": "^11.1.1",
-    "serialize-javascript": "^7.0.5"
+    "serialize-javascript": "^7.0.5",
+    "brace-expansion@1": "1.1.21",
+    "brace-expansion@2": "2.1.7"
   }
 }

tests/unit/kernel/KernelOperationBackend.test.ts

@@ -257,6 +257,47 @@ describe('KernelOperationBackend — M0 datatype round-trip via napi → ArrowRe
     expect(row.s).to.deep.equal({ a: 1, b: 'hi' });
   });
 
+  it('surfaces geospatial string and binary values in idiomatic JS shapes', async () => {
+    const wkb = new Uint8Array([
+      0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x40,
+    ]);
+    const geoType = new Struct([
+      new Field('srid', new Int32(), false),
+      new Field(
+        'wkb',
+        new Binary(),
+        false,
+        new Map([
+          ['geometry', 'true'],
+          ['srid', '-1'],
+        ]),
+      ),
+    ]);
+    const schema = new Schema([
+      withTypeName(new Field('geom_text', new Utf8(), true), 'GEOMETRY'),
+      withTypeName(new Field('geom_binary', geoType, true), 'GEOMETRY'),
+    ]);
+    const stub = new StatementStub(ipcSchemaOnly(schema), [
+      ipcFromColumns(schema, {
+        geom_text: ['SRID=4326;POINT(1 2)', null],
+        geom_binary: [{ srid: 4326, wkb }, null],
+      }),
+    ]);
+    const backend = new KernelOperationBackend({
+      statement: stub,
+      context: new ClientContextStub(),
+    });
+
+    const rows = (await backend.fetchChunk({ limit: 100 })) as Array<Record<string, unknown>>;
+    expect(rows[0].geom_text).to.equal('SRID=4326;POINT(1 2)');
+    expect(rows[0].geom_binary).to.deep.equal({
+      srid: 4326,
+      wkb: Buffer.from(wkb),
+    });
+    expect(rows[1]).to.deep.equal({ geom_text: null, geom_binary: null });
+  });
+
   it('streams multiple batches and reports hasMore correctly', async () => {
     const schema = new Schema([withTypeName(new Field('x', new Int32(), true), 'INT')]);
     const schemaIpc = ipcSchemaOnly(schema);

tests/unit/kernel/_helpers/nativeOptions.ts

@@ -81,7 +81,7 @@ export default function expectNativeConnectionOptions(actual: unknown, expectedR
   ]) {
     delete rest[key];
   }
-  expect(rest).to.deep.equal(expectedRest);
+  expect(rest).to.deep.equal({ enableGeoSpatialSupport: true, ...expectedRest });
   expect(customHeaders, 'customHeaders').to.be.an('array').with.lengthOf(1);
   expect(customHeaders?.[0].name).to.equal('User-Agent');
   expect(customHeaders?.[0].value).to.match(/NodejsDatabricksSqlConnector\//);

tests/unit/kernel/connectionOptions.test.ts

@@ -40,6 +40,29 @@ describe('KernelAuth connection options — intervalsAsString default', () => {
   });
 });
 
+describe('KernelAuth connection options — geospatial result representation', () => {
+  it('enables native geospatial support by default', () => {
+    const native = buildKernelConnectionOptions(opts({})) as { enableGeoSpatialSupport?: boolean };
+    expect(native.enableGeoSpatialSupport).to.equal(true);
+  });
+
+  for (const value of [true, false]) {
+    it(`forwards enableGeoSpatialSupport=${value}`, () => {
+      const native = buildKernelConnectionOptions(opts({ enableGeoSpatialSupport: value })) as {
+        enableGeoSpatialSupport?: boolean;
+      };
+      expect(native.enableGeoSpatialSupport).to.equal(value);
+    });
+  }
+
+  it('rejects non-boolean values at runtime', () => {
+    expect(() => buildKernelConnectionOptions(opts({ enableGeoSpatialSupport: 'false' }))).to.throw(
+      HiveDriverError,
+      /must be a boolean/,
+    );
+  });
+});
+
 describe('KernelAuth connection options — maxConnections', () => {
   it('forwards a valid positive integer', () => {
     const native = buildKernelConnectionOptions(opts({ maxConnections: 10 })) as { maxConnections?: number };

tests/unit/kernel/execution.test.ts

@@ -534,6 +534,7 @@ describe('KernelBackend', () => {
       host: 'workspace.example',
       path: '/sql/1.0/warehouses/xyz',
       token: 'dapi-token',
+      enableGeoSpatialSupport: false,
     } as ConnectionOptions);
 
     await backend.openSession({});
@@ -550,6 +551,7 @@ describe('KernelBackend', () => {
       authMode: 'Pat',
       token: 'dapi-token',
       intervalsAsString: true,
+      enableGeoSpatialSupport: false,
     });
   });