@m2k-5f/pgtx 2.7.3 → 2.8.1

package/dist/protocol/connection-request-writer.d.ts

@@ -1,11 +1,17 @@
-import { ParameterDescription } from "../types";
-import { DescribeType, RequestType } from "./constants";
+import { PostgresError } from "../error";
+import { StatementMeta } from "../types";
+import { DataTypeOid, DescribeType, RequestType } from "./constants";
 export declare class ConnectionRequestBuffer {
     private buffer;
     private offset;
     private lastRequestLenByteOffset;
+    private _markedCaret;
     private constructor();
     static new(capacity: number): ConnectionRequestBuffer;
+    get isEmpty(): boolean;
+    get hasMore(): boolean;
+    mark(): this;
+    rollback(): this;
     private ensureCapacity;
     writeCString(string: string): this;
     writeString(string: string): this;
@@ -37,6 +43,7 @@ export declare class ConnectionRequestBuffer {
     writeSaslInitial(mechanism: string, clientFirstMessage: string): this;
     writeSaslResponse(clientFinalMessage: string): this;
     writeBinaryBool(value: boolean): this;
+    writeBinaryString(value: string): this;
     writeBinaryInt2(value: number): this;
     writeBinaryInt4(value: number): this;
     writeBinaryInt8(value: number): this;
@@ -45,8 +52,84 @@ export declare class ConnectionRequestBuffer {
     writeBinaryFloat8(value: number): this;
     writeBinaryBytea(value: Uint8Array): this;
     writeBinaryTimestamp(value: Date): this;
+    writeBinaryPoint(value: {
+        x: number;
+        y: number;
+    }): this;
+    writeBinaryNumeric(value: string): this;
+    writeBinaryDate(value: Date): this;
+    writeBinaryTime(value: string): this;
+    writeBinaryTimetz(value: string): this;
+    writeBinaryInterval(value: {
+        months: number;
+        days: number;
+        microseconds: number | bigint;
+    }): this;
+    writeBinaryJson(value: unknown): this;
+    writeBinaryJsonb(value: unknown): this;
+    writeBinaryUuid(value: string): this;
+    private static readonly PGSQL_AF_INET;
+    private static readonly PGSQL_AF_INET6;
+    private ipv4ToBytes;
+    private ipv6ToBytes;
+    writeBinaryInet(value: string, isCidr?: boolean): this;
+    writeBinaryCidr(value: string): this;
+    writeBinaryMacaddr(value: string): this;
+    writeBinaryOid(value: number): this;
+    writeBinaryXid(value: number): this;
+    writeBinaryCid(value: number): this;
+    writeBinaryRegproc(value: number): this;
+    writeBinaryLseg(value: {
+        a: {
+            x: number;
+            y: number;
+        };
+        b: {
+            x: number;
+            y: number;
+        };
+    }): this;
+    writeBinaryPath(value: {
+        closed: boolean;
+        points: {
+            x: number;
+            y: number;
+        }[];
+    }): this;
+    writeBinaryBox(value: {
+        high: {
+            x: number;
+            y: number;
+        };
+        low: {
+            x: number;
+            y: number;
+        };
+    }): this;
+    writeBinaryPolygon(value: {
+        points: {
+            x: number;
+            y: number;
+        }[];
+    }): this;
+    writeBinaryLine(value: {
+        a: number;
+        b: number;
+        c: number;
+    }): this;
+    private writeLengthPrefixed;
+    writeBinaryArray(arr: unknown[], elementOid: DataTypeOid, elementWriter: (val: any) => void): this;
+    writeBinaryBoolArray(value: (boolean | null | undefined)[]): this;
+    writeBinaryInt2Array(value: (number | null | undefined)[]): this;
+    writeBinaryInt4Array(value: (number | null | undefined)[]): this;
+    writeBinaryInt8Array(value: (number | bigint | null | undefined)[]): this;
+    writeBinaryTextArray(value: (string | null | undefined)[]): this;
+    writeBinaryVarcharArray(value: (string | null | undefined)[]): this;
+    writeBinaryJsonArray(value: (unknown | null | undefined)[]): this;
+    writeBinaryJsonbArray(value: (unknown | null | undefined)[]): this;
+    writeBinaryUuidArray(value: (string | null | undefined)[]): this;
+    writeBinaryNumericArray(value: (number | string | null | undefined)[]): this;
     writeNull(): this;
-    private canWriteBinary;
-    writeBind(portName: string | "", statementName: string | "", params: unknown[], parameterTypes?: ParameterDescription): this;
+    writeBind(portName: string | "", meta: StatementMeta, params: unknown[]): PostgresError | null;
 }
 //# sourceMappingURL=connection-request-writer.d.ts.map

package/dist/protocol/connection-request-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-request-writer.d.ts","sourceRoot":"","sources":["../../src/protocol/connection-request-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAE/C,OAAO,EAA6B,YAAY,EAAE,WAAW,EAAgB,MAAM,aAAa,CAAA;AAMhG,qBAAa,uBAAuB;IAE5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,wBAAwB;IAHpC,OAAO;IAOP,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM;IAK3B,OAAO,CAAC,cAAc;IAoBtB,YAAY,CAAC,MAAM,EAAE,MAAM;IAY3B,WAAW,CAAC,MAAM,EAAE,MAAM;IAS1B,UAAU,CAAC,MAAM,EAAE,MAAM;IAUzB,UAAU,CAAC,MAAM,EAAE,MAAM;IAUzB,SAAS,CAAC,IAAI,EAAE,MAAM;IAStB,SAAS,CAAC,IAAI,EAAE,MAAM;IAQtB,aAAa,CAAC,KAAK,EAAE,MAAM;IAS3B,WAAW,CAAC,KAAK,EAAE,MAAM;IASzB,WAAW,CAAC,KAAK,EAAE,MAAM;IASzB,UAAU,CAAC,KAAK,EAAE,UAAU;IAa5B,UAAU,CAAC,MAAM,EAAE,MAAM;IAQzB,YAAY,CAAC,MAAM,EAAE,MAAM;IAQ3B,YAAY,CAAC,MAAM,EAAE,MAAM;IAQ3B,YAAY,CAAC,WAAW,EAAE,WAAW;IAQrC,YAAY;IAMZ,UAAU;IAYV,QAAQ;IAKR,KAAK;IAKL,UAAU,CAAC,IAAI,EAAE,MAAM;IASvB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM;IAW1C,aAAa,CACT,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,GAAG,EAAE;IAWrB,UAAU,CAAC,IAAI,EAAE,MAAM;IAUvB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAY3C,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,EAAE;IAUlC,SAAS;IAOT,eAAe;IASf,aAAa,CAAC,QAAQ,EAAE,MAAM;IAS9B,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM;IAW9D,iBAAiB,CAAC,kBAAkB,EAAE,MAAM;IAS5C,eAAe,CAAC,KAAK,EAAE,OAAO;IAO9B,eAAe,CAAC,KAAK,EAAE,MAAM;IAO7B,eAAe,CAAC,KAAK,EAAE,MAAM;IAQ7B,eAAe,CAAC,KAAK,EAAE,MAAM;IAO7B,kBAAkB,CAAC,KAAK,EAAE,MAAM;IAOhC,iBAAiB,CAAC,KAAK,EAAE,MAAM;IAO/B,iBAAiB,CAAC,KAAK,EAAE,MAAM;IAO/B,gBAAgB,CAAC,KAAK,EAAE,UAAU;IAOlC,oBAAoB,CAAC,KAAK,EAAE,IAAI;IAWhC,SAAS;IAMT,OAAO,CAAC,cAAc;IAkEtB,SAAS,CACL,QAAQ,EAAE,MAAM,GAAG,EAAE,EACrB,aAAa,EAAE,MAAM,GAAG,EAAE,EAC1B,MAAM,EAAE,OAAO,EAAE,EACjB,cAAc,CAAC,EAAE,oBAAoB;CAoF5C"}
+{"version":3,"file":"connection-request-writer.d.ts","sourceRoot":"","sources":["../../src/protocol/connection-request-writer.ts"],"names":[],"mappings":"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"}

package/dist/protocol/connection-request-writer.js

@@ -1,15 +1,31 @@
-import { prepareValue } from "../utils";
+import { createBindTypeError } from "../error";
 import { DataTypeOids, RequestTypes } from "./constants";
+import { handlers } from "./types";
 const POSTGRES_EPOCH = Date.UTC(2000, 0, 1);
 export class ConnectionRequestBuffer {
-    constructor(buffer, offset = 0, lastRequestLenByteOffset = 0) {
+    constructor(buffer, offset = 0, lastRequestLenByteOffset = 0, _markedCaret = 0) {
         this.buffer = buffer;
         this.offset = offset;
         this.lastRequestLenByteOffset = lastRequestLenByteOffset;
+        this._markedCaret = _markedCaret;
     }
     static new(capacity) {
         return new ConnectionRequestBuffer(Buffer.allocUnsafe(capacity));
     }
+    get isEmpty() {
+        return !this.buffer.length;
+    }
+    get hasMore() {
+        return !!this.buffer.length;
+    }
+    mark() {
+        this._markedCaret = this.offset;
+        return this;
+    }
+    rollback() {
+        this.offset = this._markedCaret;
+        return this;
+    }
     ensureCapacity(needed) {
         const required = needed + this.offset;
         if (required <= this.buffer.length)
@@ -195,11 +211,17 @@ export class ConnectionRequestBuffer {
             .endRequest();
         return this;
     }
+    // ------ Binary writers of js values into Bind parameters ------
     writeBinaryBool(value) {
         this.writeInt32(1);
         this.writeByte(value ? 1 : 0);
         return this;
     }
+    writeBinaryString(value) {
+        this.writeInt32(Buffer.byteLength(value));
+        this.writeString(value);
+        return this;
+    }
     writeBinaryInt2(value) {
         this.writeInt32(2);
         this.writeInt16(value);
@@ -241,107 +263,309 @@ export class ConnectionRequestBuffer {
         this.writeBigInt64(micros);
         return this;
     }
-    writeNull() {
-        this.writeInt32(-1);
+    writeBinaryPoint(value) {
+        this.writeInt32(16);
+        this.writeFloat64(value.x);
+        this.writeFloat64(value.y);
+        return this;
+    }
+    writeBinaryNumeric(value) {
+        const negative = value.startsWith('-');
+        const unsigned = negative ? value.slice(1) : value;
+        const [intPartRaw, fracPartRaw = ''] = unsigned.split('.');
+        const intPart = intPartRaw === '' ? '0' : intPartRaw;
+        const fracPart = fracPartRaw;
+        const dscale = fracPart.length;
+        const intPad = (4 - (intPart.length % 4)) % 4;
+        const paddedInt = '0'.repeat(intPad) + intPart;
+        const fracPad = (4 - (fracPart.length % 4)) % 4;
+        const paddedFrac = fracPart + '0'.repeat(fracPad);
+        const digitsStr = paddedInt + paddedFrac;
+        const digits = [];
+        for (let i = 0; i < digitsStr.length; i += 4) {
+            digits.push(parseInt(digitsStr.slice(i, i + 4), 10));
+        }
+        let weight = paddedInt.length / 4 - 1;
+        let start = 0;
+        while (start < digits.length && digits[start] === 0) {
+            start++;
+            weight--;
+        }
+        let end = digits.length;
+        while (end > start && digits[end - 1] === 0) {
+            end--;
+        }
+        const trimmed = digits.slice(start, end);
+        const isZero = trimmed.length === 0;
+        this.writeInt32(8 + trimmed.length * 2);
+        this.writeInt16(trimmed.length);
+        this.writeInt16(isZero ? 0 : weight);
+        this.writeUInt16(negative && !isZero ? 0x4000 : 0x0000);
+        this.writeUInt16(dscale);
+        for (const digit of trimmed) {
+            this.writeInt16(digit);
+        }
+        return this;
+    }
+    writeBinaryDate(value) {
+        const days = Math.round((Date.UTC(value.getUTCFullYear(), value.getUTCMonth(), value.getUTCDate()) - POSTGRES_EPOCH)
+            / 86400000);
+        this.writeInt32(4);
+        this.writeInt32(days);
+        return this;
+    }
+    writeBinaryTime(value) {
+        const [time, ms] = value.split('.');
+        const [hours, minutes, seconds] = time.split(':').map(Number);
+        const micros = (hours * 3600000 +
+            minutes * 60000 +
+            seconds * 1000 +
+            Number(ms)) *
+            1000;
+        this.writeInt32(8);
+        this.writeBigInt64(BigInt(micros));
+        return this;
+    }
+    writeBinaryTimetz(value) {
+        const time = value.slice(0, 12);
+        const offset = value.slice(12);
+        const [hours, minutes, seconds] = time
+            .slice(0, 8)
+            .split(':')
+            .map(Number);
+        const ms = Number(time.slice(9, 12));
+        const sign = offset[0];
+        const offHours = Number(offset.slice(1, 3));
+        const offMinutes = Number(offset.slice(4, 6));
+        const micros = (hours * 3600000 +
+            minutes * 60000 +
+            seconds * 1000 +
+            ms) *
+            1000;
+        const offsetSeconds = (offHours * 60 + offMinutes) * 60 * (sign === '+' ? -1 : 1);
+        this.writeInt32(12);
+        this.writeBigInt64(BigInt(micros));
+        this.writeInt32(offsetSeconds);
+        return this;
+    }
+    writeBinaryInterval(value) {
+        this.writeInt32(16);
+        this.writeBigInt64(typeof value.microseconds === 'bigint'
+            ? value.microseconds
+            : BigInt(value.microseconds));
+        this.writeInt32(value.days);
+        this.writeInt32(value.months);
+        return this;
+    }
+    writeBinaryJson(value) {
+        const json = typeof value === 'string' ? value : JSON.stringify(value);
+        this.writeInt32(Buffer.byteLength(json));
+        this.writeString(json);
+        return this;
+    }
+    writeBinaryJsonb(value) {
+        const json = typeof value === 'string' ? value : JSON.stringify(value);
+        const byteLen = Buffer.byteLength(json);
+        this.writeInt32(byteLen + 1);
+        this.writeByte(1);
+        this.writeString(json);
+        return this;
+    }
+    writeBinaryUuid(value) {
+        const hex = value.replace(/-/g, '');
+        this.writeInt32(16);
+        this.writeBytes(Buffer.from(hex, 'hex'));
+        return this;
+    }
+    ipv4ToBytes(addr) {
+        return Uint8Array.from(addr.split('.').map(Number));
+    }
+    ipv6ToBytes(addr) {
+        const [head, tail] = addr.split('::');
+        const headParts = head ? head.split(':') : [];
+        const tailParts = tail !== undefined ? (tail ? tail.split(':') : []) : [];
+        const missing = 8 - headParts.length - tailParts.length;
+        const groups = [...headParts, ...Array(Math.max(missing, 0)).fill('0'), ...tailParts];
+        const bytes = new Uint8Array(16);
+        groups.forEach((g, i) => {
+            const val = parseInt(g || '0', 16);
+            bytes[i * 2] = (val >> 8) & 0xff;
+            bytes[i * 2 + 1] = val & 0xff;
+        });
+        return bytes;
+    }
+    writeBinaryInet(value, isCidr = false) {
+        const [addr, prefixStr] = value.split('/');
+        const isIPv6 = addr.includes(':');
+        const family = isIPv6 ? ConnectionRequestBuffer.PGSQL_AF_INET6 : ConnectionRequestBuffer.PGSQL_AF_INET;
+        const addrBytes = isIPv6 ? this.ipv6ToBytes(addr) : this.ipv4ToBytes(addr);
+        const bits = prefixStr !== undefined ? parseInt(prefixStr, 10) : (isIPv6 ? 128 : 32);
+        this.writeInt32(4 + addrBytes.length);
+        this.writeByte(family);
+        this.writeByte(bits);
+        this.writeByte(isCidr ? 1 : 0);
+        this.writeByte(addrBytes.length);
+        this.writeBytes(addrBytes);
+        return this;
+    }
+    writeBinaryCidr(value) {
+        return this.writeBinaryInet(value, true);
+    }
+    writeBinaryMacaddr(value) {
+        const bytes = Uint8Array.from(value.split(':').map(h => parseInt(h, 16)));
+        this.writeInt32(6);
+        this.writeBytes(bytes);
+        return this;
+    }
+    writeBinaryOid(value) {
+        this.writeInt32(4);
+        this.writeUInt32(value);
         return this;
     }
-    canWriteBinary(value, oid) {
-        if (value == null || !oid) {
-            return false;
+    writeBinaryXid(value) {
+        return this.writeBinaryOid(value);
+    }
+    writeBinaryCid(value) {
+        return this.writeBinaryOid(value);
+    }
+    writeBinaryRegproc(value) {
+        return this.writeBinaryOid(value);
+    }
+    writeBinaryLseg(value) {
+        this.writeInt32(32);
+        this.writeFloat64(value.a.x);
+        this.writeFloat64(value.a.y);
+        this.writeFloat64(value.b.x);
+        this.writeFloat64(value.b.y);
+        return this;
+    }
+    writeBinaryPath(value) {
+        this.writeInt32(1 + 4 + value.points.length * 16);
+        this.writeByte(value.closed ? 1 : 0);
+        this.writeInt32(value.points.length);
+        for (const p of value.points) {
+            this.writeFloat64(p.x);
+            this.writeFloat64(p.y);
         }
-        switch (oid) {
-            case DataTypeOids.Bool:
-                return typeof value === "boolean";
-            case DataTypeOids.Int2:
-                return (typeof value === "number" &&
-                    Number.isInteger(value) &&
-                    value >= -32768 &&
-                    value <= 32767);
-            case DataTypeOids.Int4:
-                return (typeof value === "number" &&
-                    Number.isInteger(value) &&
-                    value >= -2147483648 &&
-                    value <= 2147483647);
-            case DataTypeOids.Int8:
-                return (typeof value === "bigint" ||
-                    (typeof value === "number" &&
-                        Number.isSafeInteger(value)));
-            case DataTypeOids.Float4:
-            case DataTypeOids.Float8:
-                return (typeof value === "number" &&
-                    Number.isFinite(value));
-            case DataTypeOids.Bytea:
-                return (Buffer.isBuffer(value) ||
-                    value instanceof Uint8Array);
-            case DataTypeOids.Timestamp:
-            case DataTypeOids.Timestamptz:
-                return value instanceof Date;
-            default:
-                return false;
+        return this;
+    }
+    writeBinaryBox(value) {
+        this.writeInt32(32);
+        this.writeFloat64(value.high.x);
+        this.writeFloat64(value.high.y);
+        this.writeFloat64(value.low.x);
+        this.writeFloat64(value.low.y);
+        return this;
+    }
+    writeBinaryPolygon(value) {
+        this.writeInt32(4 + value.points.length * 16);
+        this.writeInt32(value.points.length);
+        for (const p of value.points) {
+            this.writeFloat64(p.x);
+            this.writeFloat64(p.y);
         }
+        return this;
+    }
+    writeBinaryLine(value) {
+        this.writeInt32(24);
+        this.writeFloat64(value.a);
+        this.writeFloat64(value.b);
+        this.writeFloat64(value.c);
+        return this;
+    }
+    writeLengthPrefixed(writeContent) {
+        this.ensureCapacity(4);
+        const lengthOffset = this.offset;
+        this.writeInt32(0);
+        const contentStart = this.offset;
+        writeContent();
+        const length = this.offset - contentStart;
+        this.buffer.writeInt32BE(length, lengthOffset);
+        return this;
+    }
+    writeBinaryArray(arr, elementOid, elementWriter) {
+        const hasNull = arr.some(v => v == null);
+        this.writeLengthPrefixed(() => {
+            this.writeInt32(1);
+            this.writeInt32(hasNull ? 1 : 0);
+            this.writeInt32(elementOid);
+            this.writeInt32(arr.length);
+            this.writeInt32(1);
+            for (const val of arr) {
+                if (val == null) {
+                    this.writeNull();
+                }
+                else {
+                    elementWriter(val);
+                }
+            }
+        });
+        return this;
+    }
+    writeBinaryBoolArray(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Bool, v => this.writeBinaryBool(v));
+    }
+    writeBinaryInt2Array(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Int2, v => this.writeBinaryInt2(v));
+    }
+    writeBinaryInt4Array(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Int4, v => this.writeBinaryInt4(v));
+    }
+    writeBinaryInt8Array(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Int8, v => typeof v === 'bigint' ? this.writeBinaryBigInt8(v) : this.writeBinaryInt8(v));
+    }
+    writeBinaryTextArray(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Text, v => this.writeBinaryString(v));
+    }
+    writeBinaryVarcharArray(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Varchar, v => this.writeBinaryString(v));
     }
-    writeBind(portName, statementName, params, parameterTypes) {
-        const binary = params.map((value, i) => this.canWriteBinary(value, parameterTypes?.[i]));
-        const request = this.startRequest(RequestTypes.Bind)
+    writeBinaryJsonArray(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Json, v => this.writeBinaryJson(v));
+    }
+    writeBinaryJsonbArray(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Jsonb, v => this.writeBinaryJsonb(v));
+    }
+    writeBinaryUuidArray(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Uuid, v => this.writeBinaryUuid(v));
+    }
+    writeBinaryNumericArray(value) {
+        return this.writeBinaryArray(value, DataTypeOids.Numeric, v => this.writeBinaryNumeric(v));
+    }
+    writeNull() {
+        this.writeInt32(-1);
+        return this;
+    }
+    writeBind(portName, meta, params) {
+        this.mark();
+        this.startRequest(RequestTypes.Bind)
             .writeCString(portName)
-            .writeCString(statementName)
+            .writeCString(meta.statement)
             .writeInt16(params.length);
-        for (const isBinary of binary) {
-            request.writeInt16(isBinary ? 1 : 0);
+        for (let i = 0; i < params.length; i++) {
+            this.writeInt16(1);
         }
-        request.writeInt16(params.length);
+        this.writeInt16(params.length);
         for (let i = 0; i < params.length; i++) {
             const value = params[i];
+            const oid = meta.parameters[i];
             if (value == null) {
-                request.writeNull();
+                this.writeNull();
                 continue;
             }
-            if (binary[i]) {
-                switch (parameterTypes[i]) {
-                    case DataTypeOids.Bool:
-                        request.writeBinaryBool(value);
-                        break;
-                    case DataTypeOids.Int2:
-                        request.writeBinaryInt2(value);
-                        break;
-                    case DataTypeOids.Int4:
-                        request.writeBinaryInt4(value);
-                        break;
-                    case DataTypeOids.Int8:
-                        typeof value === "bigint"
-                            ? request.writeBinaryBigInt8(value)
-                            : request.writeBinaryInt8(value);
-                        break;
-                    case DataTypeOids.Float4:
-                        request.writeBinaryFloat4(value);
-                        break;
-                    case DataTypeOids.Float8:
-                        request.writeBinaryFloat8(value);
-                        break;
-                    case DataTypeOids.Bytea:
-                        request.writeBinaryBytea(value);
-                        break;
-                    case DataTypeOids.Timestamp:
-                    case DataTypeOids.Timestamptz:
-                        request.writeBinaryTimestamp(value);
-                        break;
-                }
-                continue;
-            }
-            const prepared = prepareValue(value);
-            if (prepared === null) {
-                request.writeNull();
-            }
-            else {
-                request
-                    .writeInt32(Buffer.byteLength(prepared))
-                    .writeString(prepared);
+            const handler = handlers[oid];
+            if (!handler || !handler.validate(value)) {
+                this.rollback();
+                return createBindTypeError(i, oid, value);
             }
+            handler.write(this, value);
         }
-        request
+        this
             .writeInt16(1)
             .writeInt16(1)
             .endRequest();
-        return this;
+        return null;
     }
 }
+ConnectionRequestBuffer.PGSQL_AF_INET = 2;
+ConnectionRequestBuffer.PGSQL_AF_INET6 = 3;

package/dist/protocol/connection-response-reader.d.ts

@@ -6,29 +6,24 @@ export declare class ConnectionResponseBuffer {
     private caret;
     private constructor();
     static from(buffer: Buffer): ConnectionResponseBuffer;
+    hasMore(): boolean;
+    skipBytes(byteCount: number): void;
+    hasFullPacket(): boolean;
+    getResidualBuffer(): Buffer<ArrayBufferLike>;
     readChar(): string;
     readInt32(): number;
     readInt16(): number;
     readCString(): string;
     readRawString(length: number): string;
-    hasMore(): boolean;
-    readBinaryDate(): Date;
+    readUInt16(): number;
+    readUInt32(): number;
+    readFloat32(): number;
+    readFloat64(): number;
     readByte(): number;
-    readBinaryTimestamp(): Date;
-    readBinaryTime(): string;
-    skipBytes(byteCount: number): void;
-    hasFullPacket(): boolean;
-    getResidualBuffer(): Buffer<ArrayBufferLike>;
+    readBytes(length: number): Buffer<ArrayBuffer>;
     readBool(): boolean;
     readBigInt64(): bigint;
     readInt64(): number;
-    readNumeric(): string;
-    readBinaryTimetz(): string;
-    readFloat32(): number;
-    readFloat64(): number;
-    readUuid(): string;
-    readBytes(length: number): Buffer<ArrayBuffer>;
-    getBufferHash(length: number): number;
     readType(): {
         type: ResponseType;
         length: number;
@@ -48,12 +43,74 @@ export declare class ConnectionResponseBuffer {
     readSaslMechanisms(): string[];
     readSaslMessage(length: number): string;
     readRowDescription(): ColumnDescription[];
-    readDataRow(descriptions: ColumnDescription[], int8toBigint: boolean): Record<string, any>;
     readNotificationResponse(): {
         name: ChannelName;
         payload: string;
     };
     readCommandComplete(): string;
     readParameterDescription(): ParameterDescription;
+    readBinaryDate(): Date;
+    readBinaryTimestamp(): Date;
+    readBinaryTime(): string;
+    readBinaryTimetz(): string;
+    readBinaryNumeric(): string;
+    readBinaryInterval(): {
+        months: number;
+        days: number;
+        microseconds: bigint;
+    };
+    readBinaryJson(fieldLength: number): unknown;
+    readBinaryJsonb(fieldLength: number): unknown;
+    readBinaryMacaddr(): string;
+    readBinaryOid(): number;
+    readBinaryXid(): number;
+    readBinaryCid(): number;
+    readBinaryRegproc(): number;
+    readBinaryLseg(): {
+        a: {
+            x: number;
+            y: number;
+        };
+        b: {
+            x: number;
+            y: number;
+        };
+    };
+    readBinaryPath(): {
+        closed: boolean;
+        points: {
+            x: number;
+            y: number;
+        }[];
+    };
+    readBinaryBox(): {
+        high: {
+            x: number;
+            y: number;
+        };
+        low: {
+            x: number;
+            y: number;
+        };
+    };
+    readBinaryPolygon(): {
+        points: {
+            x: number;
+            y: number;
+        }[];
+    };
+    readBinaryLine(): {
+        a: number;
+        b: number;
+        c: number;
+    };
+    readBinaryUuid(): string;
+    readBinaryArray(fieldLength: number, elementParser: (length: number) => any): any[];
+    readBinaryInet(fieldLength: number): string;
+    readBinaryPoint(): {
+        x: number;
+        y: number;
+    };
+    readDataRow(descriptions: ColumnDescription[], int8toBigint: boolean): Record<string, any>;
 }
 //# sourceMappingURL=connection-response-reader.d.ts.map