firebird-wasm 0.7.0 → 0.9.0

package/dist/electric-server/where.js

@@ -0,0 +1,243 @@
+"use strict";
+/**
+ * where.ts – a shape's `where`, as Electric's clients write it (Postgres
+ * SQL), read and written again as Firebird SQL with every value bound.
+ *
+ * Only a small, closed part of SQL is taken: column names, literals,
+ * Electric's positional parameters (`$1`, given as `params[1]=…`),
+ * comparisons, `AND` / `OR` / `NOT`, `IS [NOT] NULL`, `[NOT] IN (…)`,
+ * `[NOT] LIKE` / `ILIKE`, `[NOT] BETWEEN … AND …`, and parentheses.  Anything
+ * else (a function, a subquery, a cast, a column of another table) is
+ * refused by name, never passed on: the text comes from a client, and the
+ * server runs what it writes.  Every literal and parameter is bound, so no
+ * text a client sends ever becomes SQL.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WhereError = void 0;
+exports.translateWhere = translateWhere;
+/** Thrown for a `where` this server does not take; the server answers 400. */
+class WhereError extends Error {
+}
+exports.WhereError = WhereError;
+function tokenize(text) {
+    const tokens = [];
+    let i = 0;
+    while (i < text.length) {
+        const ch = text[i];
+        if (/\s/.test(ch)) {
+            i++;
+        }
+        else if (/[A-Za-z_]/.test(ch)) {
+            const m = /^[A-Za-z_][A-Za-z0-9_$]*/.exec(text.slice(i));
+            tokens.push({ kind: 'word', text: m[0] });
+            i += m[0].length;
+        }
+        else if (/[0-9]/.test(ch) || (ch === '.' && /[0-9]/.test(text[i + 1] ?? ''))) {
+            const m = /^(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?/.exec(text.slice(i));
+            tokens.push({ kind: 'number', text: m[0] });
+            i += m[0].length;
+        }
+        else if (ch === "'" || ch === '"') {
+            // Doubled to escape, in both.
+            let value = '';
+            let j = i + 1;
+            for (;;) {
+                if (j >= text.length)
+                    throw new WhereError(`where: unterminated ${ch === "'" ? 'string' : 'name'}`);
+                if (text[j] === ch) {
+                    if (text[j + 1] === ch) {
+                        value += ch;
+                        j += 2;
+                        continue;
+                    }
+                    break;
+                }
+                value += text[j];
+                j++;
+            }
+            tokens.push(ch === "'" ? { kind: 'string', text: value } : { kind: 'quoted', text: value });
+            i = j + 1;
+        }
+        else if (ch === '$') {
+            const m = /^\$(\d+)/.exec(text.slice(i));
+            if (!m)
+                throw new WhereError('where: $ must be followed by a parameter number');
+            tokens.push({ kind: 'param', index: Number(m[1]) });
+            i += m[0].length;
+        }
+        else {
+            const m = /^(<>|!=|<=|>=|=|<|>|\(|\)|,|-)/.exec(text.slice(i));
+            if (!m)
+                throw new WhereError(`where: ${JSON.stringify(text.slice(i, i + 10))} is not supported`);
+            tokens.push({ kind: 'op', text: m[0] });
+            i += m[0].length;
+        }
+    }
+    return tokens;
+}
+const KEYWORDS = new Set(['AND', 'OR', 'NOT', 'IS', 'NULL', 'IN', 'LIKE', 'ILIKE', 'BETWEEN', 'TRUE', 'FALSE']);
+/**
+ * Translate `text` into Firebird SQL.
+ *
+ * `columns` maps the names a client writes (the shape's names: `title` for
+ * Firebird's `TITLE`) to the Firebird column, quoted.  `params` are the
+ * values of `$1`, `$2`…, as text.
+ */
+function translateWhere(text, columns, params) {
+    const tokens = tokenize(text);
+    const bound = [];
+    let pos = 0;
+    const peek = () => tokens[pos];
+    const isWord = (t, word) => t?.kind === 'word' && t.text.toUpperCase() === word;
+    const isOp = (t, op) => t?.kind === 'op' && t.text === op;
+    const expectOp = (op) => {
+        if (!isOp(peek(), op))
+            throw new WhereError(`where: expected ${op}`);
+        pos++;
+    };
+    const column = (name, quoted) => {
+        // Unquoted, Postgres folds to lower case, and the shape's names are lower
+        // case where Firebird's were upper.
+        const found = columns.get(quoted ? name : name.toLowerCase());
+        if (!found)
+            throw new WhereError(`where: ${name} is not a column of this shape's table`);
+        return found;
+    };
+    const bind = (value) => {
+        bound.push(value);
+        return '?';
+    };
+    // operand := column | literal | $n | '(' expr ')' | '-' number
+    const operand = () => {
+        const t = peek();
+        if (!t)
+            throw new WhereError('where: ends too soon');
+        if (isOp(t, '(')) {
+            pos++;
+            const inner = or();
+            expectOp(')');
+            return `(${inner})`;
+        }
+        if (isOp(t, '-')) {
+            pos++;
+            const n = peek();
+            if (n?.kind !== 'number')
+                throw new WhereError('where: - must be followed by a number');
+            pos++;
+            return bind(`-${n.text}`);
+        }
+        pos++;
+        switch (t.kind) {
+            case 'number': return bind(t.text);
+            case 'string': return bind(t.text);
+            case 'param': {
+                const value = params.get(t.index);
+                if (value === undefined)
+                    throw new WhereError(`where: $${t.index} has no value (params[${t.index}])`);
+                return bind(value);
+            }
+            case 'quoted': return column(t.text, true);
+            case 'word': {
+                const upper = t.text.toUpperCase();
+                if (upper === 'TRUE' || upper === 'FALSE')
+                    return upper;
+                if (upper === 'NULL')
+                    return 'NULL';
+                if (isOp(peek(), '('))
+                    throw new WhereError(`where: functions (${t.text}) are not supported`);
+                if (KEYWORDS.has(upper))
+                    throw new WhereError(`where: ${t.text} is out of place`);
+                return column(t.text, false);
+            }
+            default:
+                throw new WhereError(`where: ${'text' in t ? t.text : 'this'} is out of place`);
+        }
+    };
+    // predicate := operand [comparison | IS [NOT] NULL | [NOT] IN (…) | [NOT] LIKE … | [NOT] BETWEEN … AND …]
+    const predicate = () => {
+        const left = operand();
+        const t = peek();
+        if (t?.kind === 'op' && ['=', '<>', '!=', '<', '<=', '>', '>='].includes(t.text)) {
+            pos++;
+            return `${left} ${t.text === '!=' ? '<>' : t.text} ${operand()}`;
+        }
+        if (isWord(t, 'IS')) {
+            pos++;
+            const not = isWord(peek(), 'NOT');
+            if (not)
+                pos++;
+            if (!isWord(peek(), 'NULL'))
+                throw new WhereError('where: IS takes only [NOT] NULL');
+            pos++;
+            return `${left} IS ${not ? 'NOT ' : ''}NULL`;
+        }
+        const not = isWord(t, 'NOT') && (isWord(tokens[pos + 1], 'IN') || isWord(tokens[pos + 1], 'LIKE')
+            || isWord(tokens[pos + 1], 'ILIKE') || isWord(tokens[pos + 1], 'BETWEEN'));
+        if (not)
+            pos++;
+        const neg = not ? 'NOT ' : '';
+        if (isWord(peek(), 'IN')) {
+            pos++;
+            expectOp('(');
+            const items = [operand()];
+            while (isOp(peek(), ',')) {
+                pos++;
+                items.push(operand());
+            }
+            expectOp(')');
+            return `${left} ${neg}IN (${items.join(', ')})`;
+        }
+        if (isWord(peek(), 'LIKE')) {
+            pos++;
+            return `${left} ${neg}LIKE ${operand()}`;
+        }
+        if (isWord(peek(), 'ILIKE')) {
+            pos++;
+            return `UPPER(${left}) ${neg}LIKE UPPER(${operand()})`;
+        }
+        if (isWord(peek(), 'BETWEEN')) {
+            pos++;
+            const low = operand();
+            if (!isWord(peek(), 'AND'))
+                throw new WhereError('where: BETWEEN needs AND');
+            pos++;
+            return `${left} ${neg}BETWEEN ${low} AND ${operand()}`;
+        }
+        if (not)
+            throw new WhereError('where: NOT is out of place');
+        // A column or value on its own: a boolean.
+        return left;
+    };
+    const notExpr = () => {
+        if (isWord(peek(), 'NOT')) {
+            pos++;
+            return `NOT (${notExpr()})`;
+        }
+        return predicate();
+    };
+    const and = () => {
+        const parts = [notExpr()];
+        while (isWord(peek(), 'AND')) {
+            pos++;
+            parts.push(notExpr());
+        }
+        return parts.join(' AND ');
+    };
+    function or() {
+        const parts = [and()];
+        while (isWord(peek(), 'OR')) {
+            pos++;
+            parts.push(and());
+        }
+        return parts.length === 1 ? parts[0] : parts.map((p) => `(${p})`).join(' OR ');
+    }
+    if (tokens.length === 0)
+        throw new WhereError('where is empty');
+    const sql = or();
+    if (pos < tokens.length) {
+        const t = tokens[pos];
+        throw new WhereError(`where: ${'text' in t ? t.text : `$${t.index}`} is out of place`);
+    }
+    return { sql, params: bound };
+}
+//# sourceMappingURL=where.js.map

package/dist/electric-server/where.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"where.js","sourceRoot":"","sources":["../../src/electric-server/where.ts"],"names":[],"mappings":"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"}

package/dist/firebird.d.ts

@@ -60,7 +60,9 @@ export declare class FirebirdLite {
      * Execute a (parameterised) SQL statement and return the result rows.
      *
      * For SELECT queries the rows are returned as plain objects keyed by the
-     * (upper-cased) column name, mirroring the PGlite convention.
+     * column name as Firebird reports it, mirroring the PGlite convention: an
+     * unquoted name in upper case (`SELECT title` gives `TITLE`), a quoted alias
+     * as written (`SELECT title AS "title"` gives `title`).
      *
      * ```ts
      * await db.query('SELECT * FROM items WHERE id = ?', [id]);

package/dist/firebird.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firebird.d.ts","sourceRoot":"","sources":["../src/firebird.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"firebird.d.ts","sourceRoot":"","sources":["../src/firebird.ts"],"names":[],"mappings":"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"}

package/dist/firebird.js

@@ -144,7 +144,7 @@ class FirebirdLite {
             let failed = true;
             try {
                 const columnLabels = await stmt.columnLabels;
-                fields = columnLabels.map((label) => ({ name: label.toUpperCase() }));
+                fields = columnLabels.map((label) => ({ name: label }));
                 rows = shapeRows(await fetchRows(stmt, transaction, statement.params, fields.length), fields, rowMode);
                 failed = false;
             }
@@ -195,7 +195,7 @@ class FirebirdLite {
                 return undefined;
             }
             const fields = (await stmt.columnLabels).map((label) => ({
-                name: label.toUpperCase(),
+                name: label,
             }));
             const rawRows = await fetchRows(stmt, transaction, params, fields.length);
             return { rows: shapeRows(rawRows, fields, rowMode), fields };
@@ -265,7 +265,7 @@ class FirebirdLite {
                 const type = await stmt.type;
                 return {
                     params: undefined,
-                    fields: columnLabels.map((label) => ({ name: label.toUpperCase() })),
+                    fields: columnLabels.map((label) => ({ name: label })),
                     statementType: (0, statement_types_1.statementKind)(type),
                     hasResultSet: stmt.hasResultSet,
                 };
@@ -383,7 +383,7 @@ class FirebirdTransaction {
             const lease = await this.statements.acquire(this.transaction, statement.sql);
             let failed = true;
             try {
-                await lease.stmt.execute(this.transaction, statement.params);
+                await lease.stmt.execute(this.transaction, await bindParams(lease.stmt, this.transaction, statement.params));
                 failed = false;
             }
             finally {
@@ -415,7 +415,7 @@ class FirebirdTransaction {
             }
             else {
                 for (const row of rows) {
-                    await lease.stmt.execute(this.transaction, row);
+                    await lease.stmt.execute(this.transaction, await bindParams(lease.stmt, this.transaction, row));
                 }
             }
             failed = false;
@@ -463,7 +463,7 @@ class FirebirdTransaction {
             for (let at = 0; at < rows.length;) {
                 const chunk = rows.slice(at, at + size);
                 if (chunk.length === 1) {
-                    await single.execute(this.transaction, chunk[0]);
+                    await single.execute(this.transaction, await bindParams(single, this.transaction, chunk[0]));
                     at += 1;
                     continue;
                 }
@@ -482,11 +482,11 @@ class FirebirdTransaction {
                     }
                 }
                 try {
-                    await current.lease.stmt.execute(this.transaction, chunk.flat());
+                    await current.lease.stmt.execute(this.transaction, await bindParams(current.lease.stmt, this.transaction, chunk.flat()));
                 }
                 catch {
                     for (const row of chunk) {
-                        await single.execute(this.transaction, row);
+                        await single.execute(this.transaction, await bindParams(single, this.transaction, row));
                     }
                 }
                 at += chunk.length;
@@ -510,7 +510,7 @@ class FirebirdTransaction {
         try {
             const columnLabels = await stmt.columnLabels;
             const fields = columnLabels.map((label) => ({
-                name: label.toUpperCase(),
+                name: label,
             }));
             const rawRows = await fetchRows(stmt, this.transaction, statement.params, fields.length);
             failed = false;
@@ -528,14 +528,31 @@ exports.FirebirdTransaction = FirebirdTransaction;
 /** Rows per `EXECUTE BLOCK` in `execBatch`: a single-table statement uses
  * one of the engine's 256 contexts per row, so 200 leaves room. */
 const BLOCK_ROWS = 200;
+const bindings = new WeakMap();
+async function bindingOf(stmt) {
+    let binding = bindings.get(stmt);
+    if (!binding) {
+        // Read before anything here rewrites the message; a statement is used
+        // by one call at a time, so nothing else reads it meanwhile.
+        binding = { params: await readInputParams(stmt), variants: new Map(), current: '' };
+        bindings.set(stmt, binding);
+    }
+    return binding;
+}
 /**
- * The driver's description of a statement's `?` parameters: its input
- * metadata, after the driver's own rewrites (integers bound as doubles,
- * CHAR as VARCHAR). Not public API: read from the native statement's
- * fields, and `undefined` whenever they are not there, so a driver that
- * changes shape makes `execBatch` fall back to one execute per row.
+ * A statement's `?` parameters: its input metadata as the driver rewrote it
+ * (CHAR as VARCHAR, the zoned types in their `_EX` forms), except that an
+ * integer or NUMERIC parameter, which the driver binds as a double, is
+ * described as prepared: SMALLINT, INTEGER or BIGINT, with its scale. That is
+ * what `execBatch` declares a block's parameters as, and what tells a string
+ * to send as text. `undefined` whenever the internals are not there, so a
+ * driver that changes shape makes `execBatch` fall back to one execute per
+ * row and strings go to the driver as they are.
  */
 async function inputParams(stmt) {
+    return (await bindingOf(stmt)).params;
+}
+async function readInputParams(stmt) {
     const internal = stmt;
     const meta = internal.inMetadata;
     const client = internal.attachment?.client;
@@ -544,23 +561,242 @@ async function inputParams(stmt) {
     }
     try {
         return await client.statusAction(async (status) => {
+            const read = (m, i) => ({
+                type: m.getTypeSync(status, i),
+                subType: m.getSubTypeSync(status, i),
+                length: m.getLengthSync(status, i),
+                scale: m.getScaleSync(status, i),
+                charSet: m.getCharSetSync(status, i),
+            });
             const params = [];
-            for (let i = 0, n = meta.getCountSync(status); i < n; i++) {
-                params.push({
-                    type: meta.getTypeSync(status, i),
-                    subType: meta.getSubTypeSync(status, i),
-                    length: meta.getLengthSync(status, i),
-                    scale: meta.getScaleSync(status, i),
-                    charSet: meta.getCharSetSync(status, i),
+            for (let i = 0, n = meta.getCountSync(status); i < n; i++)
+                params.push(read(meta, i));
+            if (!params.some((p) => (p.type & ~1) === SQL_DOUBLE))
+                return params;
+            // The metadata as prepared, before the driver's rewrite.
+            const prepared = await internal.statementHandle?.getInputMetadataAsync?.(status);
+            if (!prepared)
+                return params;
+            try {
+                return params.map((p, i) => {
+                    if ((p.type & ~1) !== SQL_DOUBLE)
+                        return p;
+                    const as = read(prepared, i);
+                    return INTEGER_TYPES.has(as.type & ~1) ? as : p;
                 });
             }
-            return params;
+            finally {
+                prepared.releaseSync();
+            }
         });
     }
     catch {
         return undefined;
     }
 }
+/** `SQL_BLOB`, without the nullable bit. */
+const SQL_BLOB = 520;
+/** `SQL_DOUBLE`: what the driver binds every integer and NUMERIC as. */
+const SQL_DOUBLE = 480;
+/** SMALLINT, INTEGER, BIGINT, and NUMERIC / DECIMAL kept in them. */
+const INTEGER_TYPES = new Set([500, 496, 580]);
+/** `SQL_VARYING`. */
+const SQL_VARYING = 448;
+/** Character set id of UTF8. */
+const CS_UTF8 = 4;
+/**
+ * DATE, TIME, TIMESTAMP, and TIME / TIMESTAMP WITH TIME ZONE in both forms
+ * (the driver rewrites the zoned ones to their `_EX` forms).
+ */
+const DATE_TIME_TYPES = new Set([570, 560, 510, 32756, 32754, 32750, 32748]);
+/** The types a string is sent to as text, for Firebird to convert. */
+const TEXT_TYPES = new Set([...DATE_TIME_TYPES, ...INTEGER_TYPES]);
+/** Bytes a value takes as text: a timestamp with the longest zone name fits twice. */
+const TEXT_LENGTH = 128;
+/**
+ * The parameters as the driver will take them, the statement made ready to
+ * take them.
+ *
+ * A `Uint8Array` or `ArrayBuffer` goes on as a Buffer, the driver's bytes.
+ *
+ * A string or Buffer bound to a BLOB parameter is written to a new blob here,
+ * and the blob passed on. The driver takes a Buffer or a Blob there and
+ * refused a string ("Unrecognized type used as BLOB"); and given a Buffer,
+ * it writes the blob while encoding the other parameters, under a
+ * `Promise.all` that rejects as soon as one of them fails, with the blob's
+ * native calls still running. The transaction is then rolled back under
+ * them, and the process died with a segmentation fault: a date given as a
+ * string beside a BLOB did it, so did a string too long for its VARCHAR.
+ * Written first, the blob is done before the driver encodes anything, and
+ * nothing is in flight when a parameter fails.
+ *
+ * A string bound to a DATE, TIME or TIMESTAMP parameter (with or without a
+ * time zone) is sent as text, and Firebird converts it: the driver takes a
+ * JS `Date` there (`date.getFullYear is not a function` for a string),
+ * which holds milliseconds where Firebird keeps 1/10000 s, and is read in
+ * the process's time zone. The browser engine binds every parameter as text,
+ * so the same call now means the same there and here, to the last digit.
+ * A `Date` still goes the driver's way.
+ *
+ * So does a string bound to a SMALLINT, INTEGER, BIGINT or NUMERIC parameter:
+ * the driver binds those as doubles, and `'9007199254740993'` arrived as
+ * 9007199254740992, `'0.1'` in a NUMERIC(18,17) as 0.10000000000000001.
+ * A JS number still goes as a double (it is one); a string to a DOUBLE
+ * PRECISION or FLOAT parameter is still converted by JS, which rounds
+ * correctly.
+ */
+async function bindParams(stmt, transaction, given) {
+    // Bytes as the driver takes them: a Buffer (the browser engine takes a
+    // Uint8Array or an ArrayBuffer, so the same call works on both).
+    const params = given.some((p) => p instanceof Uint8Array || p instanceof ArrayBuffer)
+        ? given.map((p) => p instanceof ArrayBuffer
+            ? Buffer.from(p)
+            : p instanceof Uint8Array && !Buffer.isBuffer(p) ? Buffer.from(p.buffer, p.byteOffset, p.byteLength) : p)
+        : given;
+    const binding = bindings.get(stmt);
+    if (!params.some((p) => typeof p === 'string' || Buffer.isBuffer(p)) && (!binding || binding.current === '')) {
+        return params;
+    }
+    const described = (binding ?? (await bindingOf(stmt))).params;
+    if (!described)
+        return params;
+    const text = [];
+    const bound = [...params];
+    for (let i = 0; i < bound.length; i++) {
+        const p = bound[i];
+        const type = (described[i]?.type ?? 0) & ~1;
+        if (type === SQL_BLOB && (typeof p === 'string' || Buffer.isBuffer(p))) {
+            bound[i] = await writeBlob(stmt, transaction, typeof p === 'string' ? Buffer.from(p, 'utf8') : p);
+        }
+        else if (typeof p === 'string' && TEXT_TYPES.has(type)) {
+            text.push(i);
+        }
+    }
+    if (!(await useMessage(stmt, text)))
+        return params;
+    return bound;
+}
+/** A new blob holding `bytes`, in `transaction`; `bytes` itself where the driver's internals are not there. */
+async function writeBlob(stmt, transaction, bytes) {
+    const attachment = stmt.attachment;
+    if (typeof attachment?.createBlob !== 'function')
+        return bytes;
+    const stream = await attachment.createBlob(transaction);
+    try {
+        await stream.write(bytes);
+    }
+    catch (err) {
+        await stream.cancel().catch(() => undefined);
+        throw err;
+    }
+    await stream.close();
+    return stream.blob;
+}
+/**
+ * Put in place the input message that takes the parameters at `positions`
+ * as VARCHAR text and every other as the driver prepared it, making it the
+ * first time. False when that cannot be done: the driver's internals are not
+ * what this expects.
+ *
+ * The message is what the driver encodes into and what Firebird reads from;
+ * Firebird converts each value from the message's type to the parameter's,
+ * which is how the driver itself binds every integer as a double. A
+ * statement is used by one call at a time (the cache leases it), so the
+ * message in place is the one this call chose.
+ */
+async function useMessage(stmt, positions) {
+    const binding = await bindingOf(stmt);
+    const key = positions.join(',');
+    if (binding.current === key)
+        return true;
+    const internal = stmt;
+    let message = key === '' ? binding.original : binding.variants.get(key);
+    if (!message) {
+        const made = await makeTextMessage(internal, binding, positions);
+        if (!made)
+            return positions.length === 0;
+        if (!binding.original) {
+            binding.original = {
+                inMetadata: internal.inMetadata,
+                inBuffer: internal.inBuffer,
+                dataWriter: internal.dataWriter,
+            };
+            releaseMessagesOnDispose(internal, binding);
+        }
+        binding.variants.set(key, made);
+        message = made;
+    }
+    internal.inMetadata = message.inMetadata;
+    internal.inBuffer = message.inBuffer;
+    internal.dataWriter = message.dataWriter;
+    binding.current = key;
+    return true;
+}
+let driverUtil;
+async function makeTextMessage(internal, binding, positions) {
+    if (driverUtil === undefined) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            driverUtil = require('node-firebird-driver-native/dist/lib/fb-util');
+            if (typeof driverUtil?.createDataWriter !== 'function' || typeof driverUtil.createDescriptors !== 'function') {
+                driverUtil = null;
+            }
+        }
+        catch {
+            driverUtil = null;
+        }
+    }
+    const util = driverUtil;
+    // Made from the driver's own message, whichever is in place.
+    const base = binding.original?.inMetadata ?? internal.inMetadata;
+    const client = internal.attachment?.client;
+    if (!util || !base || typeof base.getBuilderSync !== 'function' || typeof client?.statusAction !== 'function') {
+        return undefined;
+    }
+    return client.statusAction(async (status) => {
+        const builder = base.getBuilderSync(status);
+        let inMetadata;
+        try {
+            for (const i of positions) {
+                builder.setTypeSync(status, i, SQL_VARYING);
+                builder.setSubTypeSync(status, i, 0);
+                builder.setLengthSync(status, i, TEXT_LENGTH);
+                builder.setCharSetSync(status, i, CS_UTF8);
+                builder.setScaleSync(status, i, 0);
+            }
+            inMetadata = builder.getMetadataSync(status);
+        }
+        finally {
+            builder.releaseSync();
+        }
+        return {
+            inMetadata,
+            inBuffer: new Uint8Array(inMetadata.getMessageLengthSync(status)),
+            dataWriter: util.createDataWriter(util.createDescriptors(status, inMetadata)),
+        };
+    });
+}
+/**
+ * Hand the driver back its own message when the statement is disposed, for
+ * it to release as it always does, and release the ones made here.
+ */
+function releaseMessagesOnDispose(internal, binding) {
+    const dispose = internal.internalDispose;
+    if (typeof dispose !== 'function')
+        return;
+    internal.internalDispose = async function () {
+        if (binding.original) {
+            internal.inMetadata = binding.original.inMetadata;
+            internal.inBuffer = binding.original.inBuffer;
+            internal.dataWriter = binding.original.dataWriter;
+        }
+        for (const message of binding.variants.values())
+            message.inMetadata.releaseSync();
+        binding.variants.clear();
+        binding.current = '';
+        return dispose.call(this);
+    };
+}
 /** Character sets by id, read once per connection. */
 const charsetCache = new WeakMap();
 async function characterSets(attachment, transaction) {
@@ -685,6 +921,7 @@ class StatementCache {
  * runs and returns nothing.
  */
 async function fetchRows(stmt, transaction, params, columnCount) {
+    params = await bindParams(stmt, transaction, params);
     if (stmt.hasResultSet) {
         const resultSet = await stmt.executeQuery(transaction, params);
         // A failing fetch must still close.