node-firebird 2.10.0 → 2.12.0

package/lib/sql-template.js

@@ -0,0 +1,162 @@
+"use strict";
+/***************************************
+ *
+ *   Tagged-template query API (Postgres.js-style)
+ *
+ *   db.sql`SELECT * FROM EMP WHERE ID = ${id}`   →  lazy thenable query
+ *   db.sql('COLUMN NAME')                        →  quoted identifier
+ *
+ *   Interpolated values become positional `?` parameters — never string
+ *   concatenation — so the API is injection-safe by construction. A query
+ *   embedded inside another tag is treated as a fragment: its text and
+ *   parameters are spliced in place. Arrays expand to `?, ?, ?` lists for
+ *   IN clauses. Execution is lazy (on await/then) and happens exactly once.
+ *
+ ***************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SqlQuery = exports.SqlIdentifier = void 0;
+exports.quoteIdentifier = quoteIdentifier;
+exports.makeSqlTag = makeSqlTag;
+/** A dynamically quoted identifier produced by sql('name'). */
+class SqlIdentifier {
+    constructor(name) {
+        this.name = name;
+    }
+}
+exports.SqlIdentifier = SqlIdentifier;
+/**
+ * Quote a (possibly dot-qualified) identifier for dialect 3: each part is
+ * wrapped in double quotes with embedded quotes doubled, so user input can
+ * never break out of the identifier position.
+ */
+function quoteIdentifier(name) {
+    return String(name)
+        .split('.')
+        .map((part) => '"' + part.replace(/"/g, '""') + '"')
+        .join('.');
+}
+function compile(strings, values, active) {
+    let text = '';
+    const params = [];
+    for (let i = 0; i < strings.length; i++) {
+        text += strings[i];
+        if (i >= values.length) {
+            continue;
+        }
+        const value = values[i];
+        if (value instanceof SqlIdentifier) {
+            text += quoteIdentifier(value.name);
+        }
+        else if (value instanceof SqlQuery) {
+            // embedded fragment: splice its text and params in place. The
+            // same fragment may appear several times (a DAG), but a fragment
+            // containing itself would recurse forever — track the expansion
+            // stack and reject cycles with a diagnosable error.
+            active = active || new Set();
+            if (active.has(value)) {
+                throw new Error('circular sql fragment: a query is embedded (transitively) inside itself');
+            }
+            active.add(value);
+            const inner = compile(value.strings, value.values, active);
+            active.delete(value);
+            text += inner.text;
+            params.push(...inner.params);
+        }
+        else if (Array.isArray(value)) {
+            // IN (${[1, 2, 3]}) → IN (?, ?, ?)
+            if (!value.length) {
+                // '' would compile to `IN ()` — invalid SQL raising a server
+                // syntax error the caller never wrote; fail early instead
+                throw new Error('cannot interpolate an empty array (would compile to invalid SQL like "IN ()")');
+            }
+            text += value.map(() => '?').join(', ');
+            params.push(...value);
+        }
+        else {
+            text += '?';
+            params.push(value);
+        }
+    }
+    return { text, params };
+}
+/**
+ * A lazily executed tagged query. Awaiting it (or calling then/catch/
+ * finally) runs it through the owning Database/Transaction exactly once;
+ * embedding it in another tag uses it as a fragment instead and never
+ * executes it.
+ */
+class SqlQuery {
+    constructor(executor, strings, values) {
+        this.executor = executor;
+        this.strings = strings;
+        this.values = values;
+    }
+    /** The compiled SQL text (`?` placeholders) and parameter array. */
+    toQuery() {
+        return compile(this.strings, this.values);
+    }
+    /**
+     * Attach per-query options (timeout, signal, nestTables, …). Must be
+     * called before the query executes — options attached afterwards would
+     * be silently ignored, so that throws instead.
+     */
+    options(queryOptions) {
+        if (this.executed) {
+            throw new Error('sql query already executed — call .options() before awaiting it');
+        }
+        this.queryOptions = { ...this.queryOptions, ...queryOptions };
+        return this;
+    }
+    /** Execute resolving the full { rows, fields, affectedRows, … } result. */
+    withMeta() {
+        return this.run(true);
+    }
+    /**
+     * A query executes exactly once, in the shape of its first consumer
+     * (plain rows via then/await, or the full result via withMeta).
+     * Consuming it again in the OTHER shape cannot be honoured from the
+     * cached promise, so it throws rather than silently returning the
+     * wrong shape.
+     */
+    run(withMeta) {
+        if (this.executed) {
+            if (withMeta !== this.executedMeta) {
+                throw new Error(this.executedMeta
+                    ? 'sql query already executed via .withMeta() — await that result instead of the query'
+                    : 'sql query already executed as plain rows — call .withMeta() first, or build a new query');
+            }
+            return this.executed;
+        }
+        this.executedMeta = withMeta;
+        const { text, params } = compile(this.strings, this.values);
+        const options = withMeta ? { ...this.queryOptions, withMeta: true } : this.queryOptions;
+        this.executed = this.executor(text, params, options);
+        return this.executed;
+    }
+    then(onfulfilled, onrejected) {
+        return this.run(false).then(onfulfilled, onrejected);
+    }
+    catch(onrejected) {
+        return this.then(undefined, onrejected);
+    }
+    finally(onfinally) {
+        return this.run(false).finally(onfinally);
+    }
+}
+exports.SqlQuery = SqlQuery;
+/**
+ * Build the `sql` tag for a Database/Transaction. `executor` receives the
+ * compiled text, params and per-query options and must return a promise
+ * (Database/Transaction pass their queryAsync).
+ */
+function makeSqlTag(executor) {
+    return function sql(first, ...values) {
+        if (Array.isArray(first) && Object.prototype.hasOwnProperty.call(first, 'raw')) {
+            return new SqlQuery(executor, first, values);
+        }
+        if (typeof first === 'string') {
+            return new SqlIdentifier(first);
+        }
+        throw new Error('sql must be used as a template tag (sql`...`) or called with an identifier string (sql(\'NAME\'))');
+    };
+}

package/lib/types.d.ts

@@ -1,4 +1,6 @@
 import type { Readable } from 'stream';
+import type { SqlTag } from './sql-template';
+export type { SqlTag, SqlQuery, SqlIdentifier, CompiledQuery } from './sql-template';
 export type DatabaseCallback = (err: any, db: Database) => void;
 export type TransactionCallback = (err: any, transaction: Transaction) => void;
 export type QueryCallback = (err: any, result: any[]) => void;
@@ -115,7 +117,82 @@ export type QueryOptions = {
      * it cancels whatever is currently executing on the connection.
      */
     signal?: AbortSignal;
+    /**
+     * Per-query override of the `nestTables` connection option (mysql2
+     * semantics). `true` nests each object row by source table:
+     * `row[table][column]` — the table key is the query's relation alias
+     * when one is used (`FROM emp e` → `row.E`), the table name otherwise,
+     * and `''` for expression columns. A string separator flattens keys
+     * instead: `nestTables: '_'` → `row.EMP_NAME`; expression columns get
+     * the bare separator prefix (`row._ANSWER`, as in mysql2). Keys honour
+     * `lowercase_keys`. Object rows only — `db.execute` array rows are
+     * unaffected.
+     */
+    nestTables?: boolean | string;
+    /**
+     * Per-query override of the `transformKeys` connection option: rewrite
+     * object-row keys — `'camel'` turns `FIRST_NAME` into `firstName`, or
+     * pass a custom `(key) => key` mapper. Applied after `lowercase_keys`
+     * and to both parts of `nestTables` keys. Column metadata (`fields`,
+     * typeCast) keeps the raw server aliases.
+     */
+    transformKeys?: 'camel' | ((key: string) => string);
+    /**
+     * Deliver a full result object `{ rows, fields, affectedRows,
+     * recordCounts, warnings }` instead of the bare rows (callback and
+     * promise APIs). For DML, `affectedRows` is what the server actually
+     * changed (`isc_info_sql_records`, one extra lightweight info request
+     * per statement — hence opt-in) and `recordCounts` breaks it down per
+     * verb; for SELECT it is the number of rows returned (pg's `rowCount`
+     * convention) with no extra round-trip. `warnings` carries any
+     * `isc_arg_warning` entries from the execute response. Honoured by
+     * query/execute and their *Async wrappers only — ignored by the
+     * streaming APIs (sequentially/queryStream, where rows bypass the
+     * result) and executeBatch (which has its own completion shape).
+     */
+    withMeta?: boolean;
 };
+/** Column metadata delivered in withMeta results (`fields`) — the same
+ *  vocabulary the typeCast hook receives, plus nullable and the relation
+ *  alias/schema. */
+export interface FieldMetadata {
+    type: number;
+    typeName: string;
+    subType?: number;
+    scale?: number;
+    length?: number;
+    nullable?: boolean;
+    field?: string;
+    relation?: string;
+    relationAlias?: string;
+    relationSchema?: string;
+    alias?: string;
+}
+/** Per-verb server row counts of an executed DML statement. */
+export interface RecordCounts {
+    selectCount: number;
+    insertCount: number;
+    updateCount: number;
+    deleteCount: number;
+}
+/** An isc_arg_warning entry from a server response ('warning' driver event
+ *  and withMeta `warnings`). */
+export interface ServerWarning {
+    gdscode: number;
+    params?: (string | number)[];
+    message: string;
+}
+/** Full result shape delivered when `withMeta: true` is set. */
+export interface QueryResult<T = any> {
+    /** Rows array (SELECT), single row object (RETURNING / procedures), or undefined (plain DML). */
+    rows: T[] | T | undefined;
+    fields: FieldMetadata[];
+    /** DML: rows the server changed; SELECT: rows returned. */
+    affectedRows: number;
+    /** Set for DML statements only. */
+    recordCounts?: RecordCounts;
+    warnings: ServerWarning[];
+}
 export type QueryStreamOptions = QueryOptions & {
     /**
      * Rows buffered internally before fetching pauses (object-mode
@@ -126,6 +203,13 @@ export type QueryStreamOptions = QueryOptions & {
     asObject?: boolean;
 };
 export interface Database {
+    /**
+     * Tagged-template query API (Postgres.js-style): interpolated values
+     * become positional parameters, `sql('NAME')` quotes an identifier,
+     * embedded `sql` fragments compose, arrays expand to `?, ?, ?` lists.
+     * The returned query is a lazy thenable — it executes once, on await.
+     */
+    sql: SqlTag;
     detach(callback?: SimpleCallback): Database;
     transaction(options: TransactionOptions | Isolation | TransactionCallback, callback?: TransactionCallback): Database;
     newStatement(query: string, callback: (err: Error | null, statement: Statement) => void): Database;
@@ -148,7 +232,13 @@ export interface Database {
     alterTablespace(name: string, filePath: string, callback?: QueryCallback): Database;
     dropTablespace(name: string, callback?: QueryCallback): Database;
     createSchema(schemaName: string, tablespaceName?: string | QueryCallback, callback?: QueryCallback): Database;
+    queryAsync<T = any>(query: string, params: QueryParams | undefined, options: QueryOptions & {
+        withMeta: true;
+    }): Promise<QueryResult<T>>;
     queryAsync<T = any>(query: string, params?: QueryParams, options?: QueryOptions): Promise<T[]>;
+    executeAsync<T = any>(query: string, params: QueryParams | undefined, options: QueryOptions & {
+        withMeta: true;
+    }): Promise<QueryResult<T>>;
     executeAsync<T = any>(query: string, params?: QueryParams, options?: QueryOptions): Promise<T[]>;
     executeBatchAsync(query: string, rows: QueryParams[], options?: BatchOptions): Promise<BatchResult>;
     sequentiallyAsync(query: string, params: QueryParams | undefined, rowCallback: SequentialCallback, options?: QueryOptions | boolean): Promise<void>;
@@ -171,6 +261,14 @@ export interface Database {
     cancelAsync(kind?: number): Promise<void>;
 }
 export interface Transaction {
+    /** Tagged-template query API running inside this transaction (see Database.sql). */
+    sql: SqlTag;
+    /**
+     * Run `work` inside a savepoint: released on resolve, rolled back TO
+     * (undoing only work's changes) on reject — the transaction stays
+     * usable either way. Nestable.
+     */
+    savepoint<T>(work: (transaction: Transaction) => Promise<T> | T): Promise<T>;
     newStatement(query: string, callback: (err: Error | null, statement: Statement) => void): void;
     query(query: string, params: QueryParams, callback: QueryCallback, options?: QueryOptions): void;
     execute(query: string, params: QueryParams, callback: QueryCallback, options?: QueryOptions): void;
@@ -187,7 +285,13 @@ export interface Transaction {
     commitRetaining(callback?: SimpleCallback): void;
     rollback(callback?: SimpleCallback): void;
     rollbackRetaining(callback?: SimpleCallback): void;
+    queryAsync<T = any>(query: string, params: QueryParams | undefined, options: QueryOptions & {
+        withMeta: true;
+    }): Promise<QueryResult<T>>;
     queryAsync<T = any>(query: string, params?: QueryParams, options?: QueryOptions): Promise<T[]>;
+    executeAsync<T = any>(query: string, params: QueryParams | undefined, options: QueryOptions & {
+        withMeta: true;
+    }): Promise<QueryResult<T>>;
     executeAsync<T = any>(query: string, params?: QueryParams, options?: QueryOptions): Promise<T[]>;
     executeBatchAsync(query: string, rows: QueryParams[], options?: BatchOptions): Promise<BatchResult>;
     sequentiallyAsync(query: string, params: QueryParams | undefined, rowCallback: SequentialCallback, options?: QueryOptions | boolean): Promise<void>;
@@ -254,6 +358,24 @@ export interface Options {
      * per-query `namedPlaceholders: false` override.
      */
     namedPlaceholders?: boolean;
+    /**
+     * Qualify object-row keys by source table (same option as mysql2), so
+     * JOINed columns with the same name stop overwriting each other:
+     * `true` nests each row as `row[table][column]`; a string separator
+     * flattens to `row['table' + sep + 'column']`. See
+     * `QueryOptions.nestTables` for the exact key rules. Applies wherever
+     * object rows are produced (query / sequentially / queryStream);
+     * array rows (execute) are unaffected. Overridable per query.
+     */
+    nestTables?: boolean | string;
+    /**
+     * Rewrite object-row keys (Postgres.js `transform` counterpart):
+     * `'camel'` turns `FIRST_NAME` into `firstName`, or pass a custom
+     * `(key) => key` mapper. Applied after `lowercase_keys` and to both
+     * parts of `nestTables` keys; column metadata keeps raw aliases.
+     * Overridable per query.
+     */
+    transformKeys?: 'camel' | ((key: string) => string);
     /**
      * TCP keepalive probing to detect dead/stale connections (same option
      * names as mysql2). On by default; set false to disable.
@@ -292,6 +414,20 @@ export interface Options {
      * Default 0 (idle connections are kept forever).
      */
     idleTimeoutMillis?: number;
+    /**
+     * Pool only: retire a physical connection after this many checkouts
+     * (pg's `maxUses`) — it is closed for good when returned to the pool
+     * and replaced on demand. Bounds server-side resource drift on
+     * long-lived connections. Default 0 (unlimited uses).
+     */
+    maxUses?: number;
+    /**
+     * Pool only: retire a physical connection this many milliseconds after
+     * it was created (Postgres.js's `max_lifetime`), on return to the pool
+     * or by the idle sweep — even below `min`; replacements are created on
+     * demand. Default 0 (unlimited lifetime).
+     */
+    maxLifetimeMillis?: number;
     /**
      * **Firebird 6.0+ only (Protocol 20+)**
      *

package/lib/uri.js

@@ -187,7 +187,58 @@ function parseConnectionString(str) {
  */
 function normalizeOptions(options) {
     if (typeof options === 'string') {
-        return parseConnectionString(options);
+        options = parseConnectionString(options);
     }
-    return options;
+    return applyEnvDefaults(options);
+}
+/**
+ * Fall back to environment variables for connection settings the caller
+ * did not provide — the pg-style convention using Firebird's own names:
+ * ISC_USER / ISC_PASSWORD (honoured by isql and every official tool) plus
+ * FIREBIRD_HOST / FIREBIRD_PORT / FIREBIRD_DATABASE / FIREBIRD_ROLE.
+ * Explicit options always win; the driver's built-in defaults (SYSDBA /
+ * masterkey / 127.0.0.1) still apply when neither is set. A fresh object
+ * is returned so caller-owned options objects are never mutated.
+ */
+const ENV_FALLBACKS = [
+    ['user', 'ISC_USER'],
+    ['password', 'ISC_PASSWORD'],
+    ['host', 'FIREBIRD_HOST'],
+    ['port', 'FIREBIRD_PORT'],
+    ['database', 'FIREBIRD_DATABASE'],
+    ['role', 'FIREBIRD_ROLE'],
+];
+function applyEnvDefaults(options) {
+    let out = options;
+    for (const [key, envName] of ENV_FALLBACKS) {
+        const value = process.env[envName];
+        // empty-string env vars (common in CI: `export ISC_PASSWORD=`)
+        // count as unset
+        if (value === undefined || value === '') {
+            continue;
+        }
+        // a service-manager connection's `database` selects the TARGET of
+        // backup/restore — never let a leftover env var pick that silently
+        if (key === 'database' && options.manager) {
+            continue;
+        }
+        if (out[key] === undefined || out[key] === null || out[key] === '') {
+            if (out === options) {
+                out = { ...options };
+            }
+            if (key === 'port') {
+                const port = Number(value);
+                if (!Number.isFinite(port) || port <= 0) {
+                    // NaN is falsy: it would silently fall back to 3050
+                    // downstream instead of surfacing the typo
+                    throw new Error('Invalid FIREBIRD_PORT environment variable: ' + value);
+                }
+                out[key] = port;
+            }
+            else {
+                out[key] = value;
+            }
+        }
+    }
+    return out;
 }

package/lib/wire/connection.d.ts

@@ -132,6 +132,12 @@ declare class Connection {
     /** `count` may be the callback itself when no fetch size is given. */
     fetch(statement: Statement, transaction: Transaction, count: any, callback?: QueueCallback): void;
     fetchScroll(statement: Statement, transaction: Transaction, direction: string | number, offset: any, count: any, callback?: QueueCallback): void;
+    /**
+     * Query runtime information about a prepared statement via op_info_sql
+     * (e.g. Const.RECORDS_INFO for the per-verb DML row counts). The
+     * response is a plain op_response whose buffer holds the info clusters.
+     */
+    statementInfo(statement: Statement, items: number[], callback?: QueueCallback): this | undefined;
     fetchAll(statement: Statement, transaction: Transaction, callback: Callback<any[]>): void;
     openBlob(blob: Quad, transaction: Transaction, callback: QueueCallback): void;
     closeBlob(blob: any, callback?: QueueCallback, defer?: boolean): void;
@@ -150,6 +156,6 @@ declare function decodeResponse(data: XdrReader, callback: QueueCallback | undef
     error: Error;
 };
 declare function describe(buff: Buffer, statement: Statement): void;
-declare function fetch_blob_async_transaction(statement: Statement, id: Quad, column: string | number, row: number, meta?: Xsql.SQLVarBase): (transactionArg: any) => Promise<unknown>;
+declare function fetch_blob_async_transaction(statement: Statement, id: Quad, column: string | number, row: number, meta?: Xsql.SQLVarBase, table?: string): (transactionArg: any) => Promise<unknown>;
 declare function fetch_blob_async(statement: Statement, id: Quad, name: string | number, row: number): (transaction: Transaction, callback: any) => void;
 export = Connection;

package/lib/wire/connection.js

@@ -107,31 +107,8 @@ function statementCacheLimit(options) {
     }
     return 0;
 }
-const SQL_TYPE_NAMES = {
-    [const_1.default.SQL_TEXT]: 'TEXT',
-    [const_1.default.SQL_VARYING]: 'VARYING',
-    [const_1.default.SQL_SHORT]: 'SHORT',
-    [const_1.default.SQL_LONG]: 'LONG',
-    [const_1.default.SQL_FLOAT]: 'FLOAT',
-    [const_1.default.SQL_DOUBLE]: 'DOUBLE',
-    [const_1.default.SQL_D_FLOAT]: 'D_FLOAT',
-    [const_1.default.SQL_TIMESTAMP]: 'TIMESTAMP',
-    [const_1.default.SQL_BLOB]: 'BLOB',
-    [const_1.default.SQL_ARRAY]: 'ARRAY',
-    [const_1.default.SQL_QUAD]: 'QUAD',
-    [const_1.default.SQL_TYPE_TIME]: 'TIME',
-    [const_1.default.SQL_TYPE_DATE]: 'DATE',
-    [const_1.default.SQL_INT64]: 'INT64',
-    [const_1.default.SQL_INT128]: 'INT128',
-    [const_1.default.SQL_TIMESTAMP_TZ]: 'TIMESTAMP_TZ',
-    [const_1.default.SQL_TIMESTAMP_TZ_EX]: 'TIMESTAMP_TZ_EX',
-    [const_1.default.SQL_TIME_TZ]: 'TIME_TZ',
-    [const_1.default.SQL_TIME_TZ_EX]: 'TIME_TZ_EX',
-    [const_1.default.SQL_DEC16]: 'DEC16',
-    [const_1.default.SQL_DEC34]: 'DEC34',
-    [const_1.default.SQL_BOOLEAN]: 'BOOLEAN',
-    [const_1.default.SQL_NULL]: 'NULL',
-};
+// SQL type-code names live in xsqlvar.ts alongside the descriptors
+const SQL_TYPE_NAMES = Xsql.SQL_TYPE_NAMES;
 /**
  * Run the user's typeCast hook (options.typeCast) for one column value.
  * The hook receives the column metadata and a next() returning the value
@@ -145,16 +122,7 @@ function applyTypeCast(options, meta, defaultValue) {
     if (typeof typeCast !== 'function') {
         return defaultValue;
     }
-    const column = {
-        type: meta.type,
-        typeName: SQL_TYPE_NAMES[meta.type] || 'UNKNOWN',
-        subType: meta.subType,
-        scale: meta.scale,
-        length: meta.length,
-        field: meta.field,
-        relation: meta.relation,
-        alias: meta.alias,
-    };
+    const column = Xsql.describeField(meta);
     // A hook exception must never escape into the row-decode loop: there it
     // would be mistaken for an incomplete packet and desync the response
     // queue (the same failure mode as issue #341). Fall back to the default
@@ -396,6 +364,30 @@ class Connection {
                     if (process.env.FIREBIRD_DEBUG) {
                         console.log('[fb-debug] response dispatched: queue remaining=%d pending remaining=%d xdr.pos=%d', self._queue.length, self._pending.length, xdr.pos);
                     }
+                    // Surface isc_arg_warning entries (parsed since 2.10.0 but
+                    // dropped here): resolve their message text and emit them on
+                    // the Database on the next tick, so a listener registered
+                    // inside this very response's callback (e.g. right after
+                    // attach) still receives them.
+                    if (obj && obj.warnings && obj.warnings.length && self.db && typeof self.db.emit === 'function') {
+                        const warnings = obj.warnings;
+                        for (const w of warnings) {
+                            if (w.message === undefined) {
+                                w.message = (0, utils_1.lookupMessages)([w]);
+                                if (!w.message || w.message === 'Unknow error') {
+                                    // codes newer than the bundled firebird.msg:
+                                    // still say something actionable
+                                    w.message = 'Firebird warning ' + w.gdscode +
+                                        (w.params && w.params.length ? ': ' + w.params.join(', ') : '');
+                                }
+                            }
+                        }
+                        process.nextTick(function () {
+                            for (const w of warnings) {
+                                self.db.emit('warning', w);
+                            }
+                        });
+                    }
                     if (obj && obj.status) {
                         obj.message = (0, utils_1.lookupMessages)(obj.status);
                         (0, callback_1.doCallback)(obj, cb);
@@ -1670,6 +1662,27 @@ class Connection {
         callback.statement = statement;
         this._queueEvent(callback);
     }
+    /**
+     * Query runtime information about a prepared statement via op_info_sql
+     * (e.g. Const.RECORDS_INFO for the per-verb DML row counts). The
+     * response is a plain op_response whose buffer holds the info clusters.
+     */
+    statementInfo(statement, items, callback) {
+        if (this._isClosed)
+            return this.throwClosed(callback);
+        this._pending.push('statementInfo');
+        var msg = this._msg;
+        var blr = this._blr;
+        msg.pos = 0;
+        blr.pos = 0;
+        blr.addBytes(items);
+        msg.addInt(const_1.default.op_info_sql);
+        msg.addInt(statement.handle);
+        msg.addInt(0); // incarnation
+        msg.addBlr(blr);
+        msg.addInt(65535); // buffer_length
+        this._queueEvent(callback);
+    }
     fetchAll(statement, transaction, callback) {
         const self = this;
         const custom = statement.options || {};
@@ -1699,7 +1712,9 @@ class Connection {
                 readBlobsSequentially(0, []).then((arrBlob) => {
                     for (let i = 0; i < arrBlob.length; i++) {
                         const blob = arrBlob[i];
-                        ret.data[blob.row][blob.column] = applyTypeCast(statement.connection.options, blob.meta || {}, parseValueIfJson(blob.value, statement.connection.options));
+                        // nestTables === true rows: the value lives in the
+                        // per-table sub-object, not on the row itself
+                        Xsql.nestCell(ret.data[blob.row], blob.table)[blob.column] = applyTypeCast(statement.connection.options, blob.meta || {}, parseValueIfJson(blob.value, statement.connection.options));
                     }
                     doSynchronousLoop(ret.data, (row, _i, next) => {
                         const pos = asStream ? streamIndex++ : (data.push(row) - 1);
@@ -2085,6 +2100,7 @@ function decodeResponse(data, callback, cnx, lowercase_keys, cb) {
                 delete data.frow;
                 delete data.frows;
                 delete data.fcols;
+                delete data.ftables;
                 if (isOpFetch && data.fop) { // could be set when a packet is not complete
                     data.readBuffer(68); // ??
                     op = data.readInt(); // ??
@@ -2102,11 +2118,13 @@ function decodeResponse(data, callback, cnx, lowercase_keys, cb) {
                 data.frow = data.frow || (custom.asObject ? {} : new Array(output.length));
                 data.frows = data.frows || [];
                 if (custom.asObject && !data.fcols) {
-                    if (lowercase_keys) {
-                        data.fcols = output.map((column) => column.alias.toLowerCase());
-                    }
-                    else {
-                        data.fcols = output.map((column) => column.alias);
+                    const nest = Xsql.resolveNestTables(custom, cnx.options);
+                    const transform = Xsql.resolveKeyTransform(custom, cnx.options);
+                    const columnKeys = Xsql.computeColumnKeys(output, nest, lowercase_keys, transform);
+                    data.fcols = columnKeys.map((k) => k.key);
+                    if (nest === true) {
+                        // computeColumnKeys always sets table when nesting
+                        data.ftables = columnKeys.map((k) => k.table);
                     }
                 }
                 const arrBlob = [];
@@ -2129,7 +2147,10 @@ function decodeResponse(data, callback, cnx, lowercase_keys, cb) {
                         item = output[data.fcolumn];
                         if (!lowerV13 && nullBitSet.get(data.fcolumn)) {
                             const nullKey = custom.asObject ? data.fcols[data.fcolumn] : data.fcolumn;
-                            data.frow[nullKey] = applyTypeCast(cnx.options, item, null);
+                            // ftables is only set when nestTables === true, so
+                            // the default path writes straight into the row
+                            (data.ftables ? Xsql.nestCell(data.frow, data.ftables[data.fcolumn]) : data.frow)[nullKey] =
+                                applyTypeCast(cnx.options, item, null);
                             continue;
                         }
                         try {
@@ -2143,7 +2164,7 @@ function decodeResponse(data, callback, cnx, lowercase_keys, cb) {
                             let pendingTextBlob = false;
                             if (item.type === const_1.default.SQL_BLOB && value !== null) {
                                 if (item.subType === const_1.default.isc_blob_text && cnx.options.blobAsText) {
-                                    value = fetch_blob_async_transaction(statement, value, key, row, item);
+                                    value = fetch_blob_async_transaction(statement, value, key, row, item, data.ftables && data.ftables[data.fcolumn]);
                                     arrBlob.push(value);
                                     pendingTextBlob = true;
                                 }
@@ -2151,7 +2172,7 @@ function decodeResponse(data, callback, cnx, lowercase_keys, cb) {
                                     value = fetch_blob_async(statement, value, key, row);
                                 }
                             }
-                            data.frow[key] = pendingTextBlob
+                            (data.ftables ? Xsql.nestCell(data.frow, data.ftables[data.fcolumn]) : data.frow)[key] = pendingTextBlob
                                 ? value
                                 : applyTypeCast(cnx.options, item, parseValueIfJson(value, cnx.options));
                         }
@@ -3019,8 +3040,8 @@ function CalcBlr(blr, xsqlda) {
     blr.addByte(const_1.default.blr_end);
     blr.addByte(const_1.default.blr_eoc);
 }
-function fetch_blob_async_transaction(statement, id, column, row, meta) {
-    const infoValue = { row, column, value: '', meta };
+function fetch_blob_async_transaction(statement, id, column, row, meta, table) {
+    const infoValue = { row, column, value: '', meta, table };
     return (transactionArg) => {
         const cacheKey = `${id.high}:${id.low}`;
         if (statement.connection._inlineBlobs && statement.connection._inlineBlobs.has(cacheKey)) {

package/lib/wire/const.d.ts

@@ -404,6 +404,10 @@ declare const Const: Readonly<{
     isc_info_sql_stmt_type: number;
     isc_info_sql_get_plan: number;
     isc_info_sql_records: number;
+    isc_info_req_select_count: number;
+    isc_info_req_insert_count: number;
+    isc_info_req_update_count: number;
+    isc_info_req_delete_count: number;
     isc_info_sql_batch_fetch: number;
     isc_info_sql_relation_alias: number;
     isc_info_sql_explain_plan: number;
@@ -589,6 +593,7 @@ declare const Const: Readonly<{
     isc_spb_trc_cfg: number;
     DESCRIBE: number[];
     DESCRIBE_WITH_SCHEMA: number[];
+    RECORDS_INFO: number[];
     SUPPORTED_PROTOCOL: number[][];
 }>;
 export = Const;