@m2k-5f/pgtx 2.3.2 → 2.3.3

package/dist/connection.d.ts

@@ -69,8 +69,10 @@ export declare class Connection {
     private _isReconnecting;
     private _socket;
     private _writer;
+    private _activeQuery;
     private _pipelinesQueue;
     private _described;
+    private _rowMappers;
     private _describingPending;
     private _parsed;
     private _parsingPending;
@@ -78,6 +80,7 @@ export declare class Connection {
     private _stmtCounter;
     private _logLevel;
     private _nextStatement;
+    private _getRowMapper;
     private _checkOpened;
     private constructor();
     /**

package/dist/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAK3C,OAAO,EAAQ,MAAM,EAAU,MAAM,eAAe,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,KAAK,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAA;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAMD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;IACzB,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;IAC7B,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;IAC5B,aAAa,EAAE,aAAa,CAAA;CAC/B,CAAA;AAGD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,OAAO,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAA;IAC/C,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC9B,IAAI,EAAE,SAAS,CAAA;IACf,aAAa,EAAE,aAAa,CAAA;CAC/B,CAAA;AAGD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAA;IAC7C,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC9B,aAAa,EAAE,aAAa,CAAA;CAC/B,CAAA;AAKD,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAE5D,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;AAEpD,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAGxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,OAAO,CAAyB;IAExC,OAAO,CAAC,eAAe,CAAwB;IAE/C,OAAO,CAAC,UAAU,CAAgD;IAClE,OAAO,CAAC,kBAAkB,CAA2B;IACrD,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,eAAe,CAAsC;IAE7D,OAAO,CAAC,mBAAmB,CAAyD;IACpF,OAAO,CAAC,YAAY,CAAI;IACxB,OAAO,CAAC,SAAS,CAAU;IAG3B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,YAAY;IAKpB,OAAO;IAgBP;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB;IAOnC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAsBtF;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;IAmB7D;;;;;;;;;;OAUG;IACH,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,MAAW;IAMhD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI;IAc/D;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC;IAmB7F,OAAO,CAAC,YAAY;IAuDpB,OAAO,CAAC,WAAW;IAwBnB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,MAAM;IAsBd,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,qBAAqB;YAWf,UAAU;IAmBxB,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,aAAa;IAoJrB;;;OAGG;IACH,IAAI,QAAQ,YAEX;IAGD;;;;;;;;;OASG;IACH,KAAK;CAQR"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}

package/dist/connection.js

@@ -46,6 +46,15 @@ export class Connection {
     _nextStatement() {
         return `s-${this._stmtCounter++}`;
     }
+    _getRowMapper(statementName, descriptions) {
+        let mapper = this._rowMappers.get(statementName);
+        if (mapper)
+            return mapper;
+        const fields = descriptions.map((desc, i) => `"${desc.name}": values[${i}]`).join(',\n        ');
+        mapper = new Function('values', `return ${fields}`)();
+        this._rowMappers.set(statementName, mapper);
+        return mapper;
+    }
     _checkOpened() {
         if (!this.isOpened)
             throw ErrConnectionClosed;
@@ -54,8 +63,10 @@ export class Connection {
         this._isFlushing = false;
         this._isOpened = true;
         this._isReconnecting = false;
+        this._activeQuery = null;
         this._pipelinesQueue = new Queue();
         this._described = new Map();
+        this._rowMappers = new Map();
         this._describingPending = new Set();
         this._parsed = new Map();
         this._parsingPending = new Map();
@@ -387,11 +398,15 @@ export class Connection {
                 break;
             case ResponseTypes.DataRow:
                 {
-                    const query = this._getCurrentQuery();
+                    let query = this._activeQuery;
+                    if (!query) {
+                        query = this._getCurrentQuery();
+                        this._activeQuery = query;
+                    }
                     if (!query.columns) {
                         query.columns = this._described.get(query.statementName);
                     }
-                    query.rows.push(reader.readDataRow(query.columns, this.params.int8toBigint));
+                    query.push(reader.readDataRow(query.columns, this.params.int8toBigint));
                 }
                 break;
             case ResponseTypes.ComandComplete:
@@ -401,7 +416,7 @@ export class Connection {
                         this.close();
                         break;
                     }
-                    const query = this._getCurrentQuery();
+                    const query = this._activeQuery || this._getCurrentQuery();
                     if (!query) {
                         this.close();
                         break;
@@ -411,7 +426,8 @@ export class Connection {
                     }
                     query.state = QueryState.Completed;
                     this._pipelinesQueue.get().next();
-                    query.resolve(query.toObjects());
+                    this._activeQuery = null;
+                    query.resolve();
                 }
                 break;
             case ResponseTypes.ErrorResponse:

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

@@ -22,8 +22,10 @@ export declare class ConnectionResponseBuffer {
     hasFullPacket(): boolean;
     getResidualBuffer(): Buffer<ArrayBufferLike>;
     readBool(): boolean;
-    readInt64(): bigint;
+    readBigInt64(): bigint;
+    readInt64(): number;
     readFloat64(): number;
+    getBufferHash(length: number): number;
 }
 export declare class ConnectionResponseReader {
     private buffer;
@@ -46,7 +48,7 @@ export declare class ConnectionResponseReader {
     readSaslMechanisms(): string[];
     readSaslMessage(): string;
     readRowDescription(): ColumnDescription[];
-    readDataRow(descriptions: ColumnDescription[], int8toBigint?: boolean): any[];
+    readDataRow(descriptions: ColumnDescription[], int8toBigint?: boolean): Record<string, any>;
     readNotificationResponse(): {
         name: ChannelName;
         payload: string;

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

@@ -1 +1 @@
-{"version":3,"file":"connection-response-reader.d.ts","sourceRoot":"","sources":["../../src/protocol/connection-response-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA6B,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC5G,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAM3C,qBAAa,wBAAwB;IAI7B,OAAO,CAAC,MAAM;IAHlB,OAAO,CAAC,KAAK,CAAI;IAEjB,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ,IAAI,MAAM;IAOlB,SAAS,IAAI,MAAM;IAOnB,SAAS,IAAI,MAAM;IAOnB,WAAW,IAAI,MAAM;IAQrB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAOrC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAOjC,OAAO,IAAI,OAAO;IAKlB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAO3C,cAAc,IAAI,IAAI;IAOtB,mBAAmB,IAAI,IAAI;IAO3B,cAAc,IAAI,MAAM;IAaxB,SAAS,CAAC,SAAS,EAAE,MAAM;IAK3B,aAAa,IAAI,OAAO;IAaxB,iBAAiB;IAIjB,QAAQ;IAMR,SAAS,IAAI,MAAM;IAMnB,WAAW,IAAI,MAAM;CAKxB;AAGD,qBAAa,wBAAwB;IAI7B,OAAO,CAAC,MAAM;IAHlB,OAAO,CAAC,mBAAmB,CAAK;IAEhC,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ,IAC6B,YAAY;IAIjD,kBAAkB,IAGoB,kBAAkB;IAIxD,WAAW;IAKX,mBAAmB;;;;IAUnB,kBAAkB;;;;IAUlB,iBAAiB,IAAI,aAAa;IA8ClC,iBAAiB,IAEoB,iBAAiB;IAItD,kBAAkB,IAAI,MAAM,EAAE;IAa9B,eAAe,IAAI,MAAM;IAOzB,kBAAkB;IAuBlB,WAAW,CAAC,YAAY,EAAE,iBAAiB,EAAE,EAAE,YAAY,GAAE,OAAe,GAAG,GAAG,EAAE;IAwGpF,wBAAwB;;;;IAUxB,mBAAmB,IAAI,MAAM;IAM7B,OAAO;IAKP,aAAa;IAKb,iBAAiB;IAKjB,iBAAiB;IAKjB,gBAAgB;IAKhB,wBAAwB;IAQxB,UAAU;CAGb"}
+{"version":3,"file":"connection-response-reader.d.ts","sourceRoot":"","sources":["../../src/protocol/connection-response-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA6B,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC5G,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAM3C,qBAAa,wBAAwB;IAI7B,OAAO,CAAC,MAAM;IAHlB,OAAO,CAAC,KAAK,CAAI;IAEjB,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ,IAAI,MAAM;IAOlB,SAAS,IAAI,MAAM;IAOnB,SAAS,IAAI,MAAM;IAOnB,WAAW,IAAI,MAAM;IAQrB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAOrC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAOjC,OAAO,IAAI,OAAO;IAKlB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAO3C,cAAc,IAAI,IAAI;IAOtB,mBAAmB,IAAI,IAAI;IAO3B,cAAc,IAAI,MAAM;IAaxB,SAAS,CAAC,SAAS,EAAE,MAAM;IAK3B,aAAa,IAAI,OAAO;IAaxB,iBAAiB;IAIjB,QAAQ;IAMR,YAAY,IAAI,MAAM;IAOtB,SAAS;IAST,WAAW,IAAI,MAAM;IAMrB,aAAa,CAAC,MAAM,EAAE,MAAM;CAW/B;AAGD,qBAAa,wBAAwB;IAI7B,OAAO,CAAC,MAAM;IAHlB,OAAO,CAAC,mBAAmB,CAAK;IAEhC,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ,IAC6B,YAAY;IAIjD,kBAAkB,IAGoB,kBAAkB;IAIxD,WAAW;IAKX,mBAAmB;;;;IAUnB,kBAAkB;;;;IAUlB,iBAAiB,IAAI,aAAa;IA8ClC,iBAAiB,IAEoB,iBAAiB;IAItD,kBAAkB,IAAI,MAAM,EAAE;IAa9B,eAAe,IAAI,MAAM;IAOzB,kBAAkB;IAuBlB,WAAW,CAAC,YAAY,EAAE,iBAAiB,EAAE,EAAE,YAAY,GAAE,OAAe,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IA8FlG,wBAAwB;;;;IAUxB,mBAAmB,IAAI,MAAM;IAM7B,OAAO;IAKP,aAAa;IAKb,iBAAiB;IAKjB,iBAAiB;IAKjB,gBAAgB;IAKhB,wBAAwB;IAQxB,UAAU;CAGb"}

package/dist/protocol/connection-response-reader.js

@@ -56,12 +56,12 @@ export class ConnectionResponseBuffer {
     }
     readBinaryTimestamp() {
         const microSecondsSince2000 = this.readInt64();
-        const msSince2000 = Number(microSecondsSince2000 / 1000n);
+        const msSince2000 = Number(microSecondsSince2000 / 1000);
         return new Date(POSTGRES_EPOCH_MS + msSince2000);
     }
     readBinaryTime() {
         const microSecondsSinceMidnight = this.readInt64();
-        const totalMs = Number(microSecondsSinceMidnight / 1000n);
+        const totalMs = Number(microSecondsSinceMidnight / 1000);
         const seconds = Math.floor(totalMs / 1000);
         const ms = totalMs % 1000;
         const minutes = Math.floor(seconds / 60);
@@ -88,16 +88,31 @@ export class ConnectionResponseBuffer {
         this.caret++;
         return value;
     }
-    readInt64() {
+    readBigInt64() {
         const value = this.buffer.readBigInt64BE(this.caret);
         this.caret += 8;
         return value;
     }
+    readInt64() {
+        const hi = this.buffer.readInt32BE(this.caret);
+        const lo = this.buffer.readUInt32BE(this.caret + 4);
+        this.caret += 8;
+        return (hi * 4294967296) + lo;
+    }
     readFloat64() {
         const value = this.buffer.readDoubleBE(this.caret);
         this.caret += 8;
         return value;
     }
+    getBufferHash(length) {
+        let hash = 2166136261;
+        const end = this.caret + length;
+        for (let i = this.caret; i < end; i++) {
+            hash ^= this.buffer[i];
+            hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
+        }
+        return hash >>> 0;
+    }
 }
 export class ConnectionResponseReader {
     constructor(buffer) {
@@ -217,81 +232,23 @@ export class ConnectionResponseReader {
     readDataRow(descriptions, int8toBigint = false) {
         this.buffer.skipBytes(4);
         const fieldsCount = this.buffer.readInt16();
-        const rowValues = [];
+        const row = {};
         for (let i = 0; i < fieldsCount; i++) {
-            let fieldLength = this.buffer.readInt32();
+            const fieldLength = this.buffer.readInt32();
+            const desc = descriptions[i];
+            const key = desc ? desc.name : `col_${i}`;
             if (fieldLength === -1) {
-                rowValues.push(null);
+                row[key] = null;
                 continue;
             }
-            const desc = descriptions[i];
             const oid = desc ? desc.typeOID : 0;
             switch (oid) {
-                case DataTypeOids.Jsonb:
-                    {
-                        this.buffer.skipBytes(1);
-                        const jsonText = this.buffer.readRawString(fieldLength - 1);
-                        rowValues.push(JSON.parse(jsonText));
-                    }
-                    break;
-                case DataTypeOids.Json:
-                    {
-                        const jsonText = this.buffer.readRawString(fieldLength);
-                        rowValues.push(JSON.parse(jsonText));
-                    }
-                    break;
                 case DataTypeOids.Int4:
-                    {
-                        rowValues.push(this.buffer.readInt32());
-                    }
-                    break;
-                case DataTypeOids.Int2:
-                    {
-                        rowValues.push(this.buffer.readInt16());
-                    }
-                    break;
-                case DataTypeOids.Bool:
-                    {
-                        rowValues.push(this.buffer.readBool());
-                    }
-                    break;
-                case DataTypeOids.Int8:
-                    {
-                        const bigint = this.buffer.readInt64();
-                        rowValues.push(int8toBigint ? bigint : Number(bigint));
-                    }
-                    break;
-                case DataTypeOids.Float8:
-                    {
-                        rowValues.push(this.buffer.readFloat64());
-                    }
-                    break;
-                case DataTypeOids.Date:
-                    {
-                        rowValues.push(this.buffer.readBinaryDate());
-                    }
-                    break;
-                case DataTypeOids.Timestamp:
-                case DataTypeOids.Timestamptz:
-                    {
-                        rowValues.push(this.buffer.readBinaryTimestamp());
-                    }
-                    break;
-                case DataTypeOids.Time:
-                    {
-                        rowValues.push(this.buffer.readBinaryTime());
-                    }
-                    break;
-                case DataTypeOids.Timetz:
-                    {
-                        const timeStr = this.buffer.readBinaryTime();
-                        this.buffer.skipBytes(4);
-                        rowValues.push(timeStr);
-                    }
+                    row[key] = this.buffer.readInt32();
                     break;
                 case DataTypeOids.Text:
                 case DataTypeOids.Varchar:
-                case DataTypeOids.Uuid:
+                case DataTypeOids.Char:
                     {
                         if (fieldLength <= 32) {
                             let cacheForColumn = columnValueCache.get(i);
@@ -299,30 +256,59 @@ export class ConnectionResponseReader {
                                 cacheForColumn = new Map();
                                 columnValueCache.set(i, cacheForColumn);
                             }
-                            const byteKey = this.buffer.readRawBinaryString(fieldLength);
-                            let cachedString = cacheForColumn.get(byteKey);
+                            const byteHash = this.buffer.getBufferHash(fieldLength);
+                            let cachedString = cacheForColumn.get(byteHash);
                             if (cachedString === undefined) {
-                                cachedString = Buffer.from(byteKey, 'binary').toString('utf-8');
+                                cachedString = this.buffer.readRawString(fieldLength);
                                 if (cacheForColumn.size < 512) {
-                                    cacheForColumn.set(byteKey, cachedString);
+                                    cacheForColumn.set(byteHash, cachedString);
                                 }
                             }
-                            rowValues.push(cachedString);
+                            else {
+                                this.buffer.skipBytes(fieldLength);
+                            }
+                            row[key] = cachedString;
                         }
                         else {
-                            rowValues.push(this.buffer.readRawString(fieldLength));
+                            row[key] = this.buffer.readRawString(fieldLength);
                         }
                     }
                     break;
-                default:
+                case DataTypeOids.Int2:
+                    row[key] = this.buffer.readInt16();
+                    break;
+                case DataTypeOids.Bool:
+                    row[key] = this.buffer.readBool();
+                    break;
+                case DataTypeOids.Int8:
                     {
-                        this.buffer.skipBytes(fieldLength);
-                        rowValues.push(undefined);
+                        row[key] = int8toBigint ? this.buffer.readBigInt64() : this.buffer.readInt64();
                     }
                     break;
+                case DataTypeOids.Float8:
+                    row[key] = this.buffer.readFloat64();
+                    break;
+                case DataTypeOids.Jsonb:
+                    this.buffer.skipBytes(1);
+                    row[key] = JSON.parse(this.buffer.readRawString(fieldLength - 1));
+                    break;
+                case DataTypeOids.Json:
+                    row[key] = JSON.parse(this.buffer.readRawString(fieldLength));
+                    break;
+                case DataTypeOids.Date:
+                    row[key] = this.buffer.readBinaryDate();
+                    break;
+                case DataTypeOids.Timestamp:
+                case DataTypeOids.Timestamptz:
+                    row[key] = this.buffer.readBinaryTimestamp();
+                    break;
+                default:
+                    this.buffer.skipBytes(fieldLength);
+                    row[key] = null;
+                    break;
             }
         }
-        return rowValues;
+        return row;
     }
     readNotificationResponse() {
         this.buffer.readInt32();

package/dist/query.d.ts

@@ -15,11 +15,13 @@ export declare class Query<T> {
     statementName: StatementName;
     columns?: ColumnDescription[] | undefined;
     promise: Promise<T[]>;
-    resolve: (value: T[]) => void;
-    reject: (error: Error) => void;
-    rows: any[][];
+    private _resolve;
+    private _reject;
+    private _rows;
     constructor(text: QueryText, args: (string | null)[], state: State, statementName: StatementName, columns?: ColumnDescription[] | undefined);
     setState(state: State): void;
-    toObjects(): T[];
+    push(value: T): void;
+    reject(cause: Error): void;
+    resolve(): void;
 }
 //# sourceMappingURL=query.d.ts.map

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGrD,eAAO,MAAM,UAAU;;;;;;CAMb,CAAA;AAGV,MAAM,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,UAAU,CAAC,CAAA;AAG9C,qBAAa,KAAK,CAAC,CAAC;IAOL,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IACvB,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,aAAa;IAC5B,OAAO,CAAC,EAAE,iBAAiB,EAAE;IAVxC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAA;IACrB,OAAO,EAAG,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,IAAI,CAAA;IAC9B,MAAM,EAAG,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/B,IAAI,EAAE,GAAG,EAAE,EAAE,CAAK;gBAGP,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EACvB,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,iBAAiB,EAAE,YAAA;IAQxC,QAAQ,CAAC,KAAK,EAAE,KAAK;IAIrB,SAAS,IAAI,CAAC,EAAE;CA2BnB"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGrD,eAAO,MAAM,UAAU;;;;;;CAMb,CAAA;AAGV,MAAM,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,UAAU,CAAC,CAAA;AAG9C,qBAAa,KAAK,CAAC,CAAC;IAOL,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IACvB,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,aAAa;IAC5B,OAAO,CAAC,EAAE,iBAAiB,EAAE;IAVxC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAA;IACrB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,KAAK,CAAU;gBAGZ,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EACvB,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,iBAAiB,EAAE,YAAA;IAQxC,QAAQ,CAAC,KAAK,EAAE,KAAK;IAKrB,IAAI,CAAC,KAAK,EAAE,CAAC;IAIb,MAAM,CAAC,KAAK,EAAE,KAAK;IAKnB,OAAO;CAGV"}

package/dist/query.js

@@ -12,34 +12,22 @@ export class Query {
         this.state = state;
         this.statementName = statementName;
         this.columns = columns;
-        this.rows = [];
+        this._rows = [];
         this.promise = new Promise((a, b) => {
-            this.resolve = a;
-            this.reject = b;
+            this._resolve = a;
+            this._reject = b;
         });
     }
     setState(state) {
         this.state = state;
     }
-    toObjects() {
-        if (!this.rows.length || !this.columns || !this.columns.length) {
-            return [];
-        }
-        const result = [];
-        const rowsLength = this.rows.length;
-        const columnsLength = this.columns.length;
-        const colNames = new Array(columnsLength);
-        for (let c = 0; c < columnsLength; c++) {
-            colNames[c] = this.columns[c].name;
-        }
-        for (let r = 0; r < rowsLength; r++) {
-            const rawRow = this.rows[r];
-            const rowObject = {};
-            for (let c = 0; c < columnsLength; c++) {
-                rowObject[colNames[c]] = rawRow[c];
-            }
-            result.push(rowObject);
-        }
-        return result;
+    push(value) {
+        this._rows.push(value);
+    }
+    reject(cause) {
+        this._reject(cause);
+    }
+    resolve() {
+        this._resolve(this._rows);
     }
 }

package/dist/queue.js

@@ -17,7 +17,7 @@ export class Queue {
         const item = this._queue[this._pointer];
         this._pointer++;
         if (this._pointer >= this._queue.length) {
-            this._queue = [];
+            this._queue.length = 0;
             this._pointer = 0;
         }
         return item;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2k-5f/pgtx",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "type": "module", 
   "description": "Blazing-fast PostgreSQL driver with pipeline support.",
   "files": [