sqlite-executor 4.0.4 → 4.0.6

package/dist/cjs/index.cjs

@@ -56,218 +56,9 @@ __webpack_require__.d(__webpack_exports__, {
     }
 });
 var external_node_events_namespaceObject = require("node:events");
-function _check_private_redeclaration(obj, privateCollection) {
-    if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
-}
-function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) return descriptor.get.call(receiver);
-    return descriptor.value;
-}
-function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) descriptor.set.call(receiver, value);
-    else {
-        if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
-        descriptor.value = value;
-    }
-}
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
-}
-function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
-    return privateMap.get(receiver);
-}
-function _class_private_field_get(receiver, privateMap) {
-    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "get");
-    return _class_apply_descriptor_get(receiver, descriptor);
-}
-function _class_private_field_init(obj, privateMap, value) {
-    _check_private_redeclaration(obj, privateMap);
-    privateMap.set(obj, value);
-}
-function _class_private_field_set(receiver, privateMap, value) {
-    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "set");
-    _class_apply_descriptor_set(receiver, descriptor, value);
-    return value;
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-var _maxSize = /*#__PURE__*/ new WeakMap(), _maxKeyLength = /*#__PURE__*/ new WeakMap(), _map = /*#__PURE__*/ new WeakMap();
-var lruCache_LRUCache = /*#__PURE__*/ function() {
-    "use strict";
-    function LRUCache() {
-        var _ref = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, _ref_maxSize = _ref.maxSize, maxSize = void 0 === _ref_maxSize ? 256 : _ref_maxSize, _ref_maxKeyLength = _ref.maxKeyLength, maxKeyLength = void 0 === _ref_maxKeyLength ? 4096 : _ref_maxKeyLength;
-        _class_call_check(this, LRUCache);
-        _class_private_field_init(this, _maxSize, {
-            writable: true,
-            value: void 0
-        });
-        _class_private_field_init(this, _maxKeyLength, {
-            writable: true,
-            value: void 0
-        });
-        _class_private_field_init(this, _map, {
-            writable: true,
-            value: new Map()
-        });
-        _class_private_field_set(this, _maxSize, Math.max(1, maxSize));
-        _class_private_field_set(this, _maxKeyLength, maxKeyLength);
-    }
-    _create_class(LRUCache, [
-        {
-            key: "get",
-            value: function(key) {
-                if ("string" != typeof key || key.length > _class_private_field_get(this, _maxKeyLength)) return;
-                var value = _class_private_field_get(this, _map).get(key);
-                if (void 0 === value) return;
-                _class_private_field_get(this, _map)["delete"](key);
-                _class_private_field_get(this, _map).set(key, value);
-                return value;
-            }
-        },
-        {
-            key: "set",
-            value: function(key, value) {
-                if ("string" != typeof key || key.length > _class_private_field_get(this, _maxKeyLength)) return;
-                if (_class_private_field_get(this, _map).size >= _class_private_field_get(this, _maxSize)) {
-                    var firstKey = _class_private_field_get(this, _map).keys().next().value;
-                    _class_private_field_get(this, _map)["delete"](firstKey);
-                }
-                _class_private_field_get(this, _map).set(key, value);
-            }
-        },
-        {
-            key: "size",
-            get: function() {
-                return _class_private_field_get(this, _map).size;
-            }
-        },
-        {
-            key: "clear",
-            value: function() {
-                _class_private_field_get(this, _map).clear();
-            }
-        }
-    ]);
-    return LRUCache;
-}();
-var CC_SINGLE_QUOTE = 39;
-var CC_DOUBLE_QUOTE = 34;
-var CC_DASH = 45;
-var CC_SLASH = 47;
-var CC_STAR = 42;
-var CC_NEWLINE = 10;
-var CC_QUESTION = 63;
-var CC_SEMICOLON = 59;
-var CC_SPACE = 32;
-var STATE_NORMAL = 0;
-var STATE_SINGLE_QUOTE = 1;
-var STATE_DOUBLE_QUOTE = 2;
-var STATE_LINE_COMMENT = 3;
-var STATE_BLOCK_COMMENT = 4;
-var _normBuf = new Uint16Array(1024);
-var _normDecoder = new TextDecoder("utf-16le");
-var _normCache = new lruCache_LRUCache({
-    maxSize: 256,
-    maxKeyLength: 4096
-});
-function normalizeSQL(sql) {
-    var cached = _normCache.get(sql);
-    if (void 0 !== cached) return cached;
-    var len = sql.length;
-    var needed = len + 1;
-    if (_normBuf.length < needed) _normBuf = new Uint16Array(needed);
-    var outCodes = _normBuf;
-    var writePos = 0;
-    var pendingSpace = false;
-    var state = STATE_NORMAL;
-    for(var i = 0; i < len; i++){
-        var code = sql.charCodeAt(i);
-        var nextCode = sql.charCodeAt(i + 1);
-        if (state === STATE_BLOCK_COMMENT) {
-            if (code === CC_STAR && nextCode === CC_SLASH) {
-                state = STATE_NORMAL;
-                i++;
-                if (writePos > 0) pendingSpace = true;
-            }
-            continue;
-        }
-        if (state === STATE_LINE_COMMENT) {
-            if (code === CC_NEWLINE) {
-                state = STATE_NORMAL;
-                if (writePos > 0) pendingSpace = true;
-            }
-            continue;
-        }
-        if (state === STATE_NORMAL) {
-            if (code === CC_DASH && nextCode === CC_DASH) {
-                state = STATE_LINE_COMMENT;
-                i++;
-                continue;
-            }
-            if (code === CC_SLASH && nextCode === CC_STAR) {
-                state = STATE_BLOCK_COMMENT;
-                i++;
-                continue;
-            }
-        }
-        if (32 === code || 9 === code || 10 === code || 11 === code || 12 === code || 13 === code) {
-            if (writePos > 0) pendingSpace = true;
-            continue;
-        }
-        if (pendingSpace && writePos > 0) {
-            outCodes[writePos++] = CC_SPACE;
-            pendingSpace = false;
-        }
-        outCodes[writePos++] = code;
-        if (state === STATE_NORMAL) {
-            if (code === CC_SINGLE_QUOTE) state = STATE_SINGLE_QUOTE;
-            else if (code === CC_DOUBLE_QUOTE) state = STATE_DOUBLE_QUOTE;
-            continue;
-        }
-        if (state === STATE_SINGLE_QUOTE) {
-            if (code === CC_SINGLE_QUOTE && nextCode === CC_SINGLE_QUOTE) {
-                outCodes[writePos++] = nextCode;
-                i++;
-                continue;
-            }
-            if (code === CC_SINGLE_QUOTE) state = STATE_NORMAL;
-            continue;
-        }
-        if (state === STATE_DOUBLE_QUOTE) {
-            if (code === CC_DOUBLE_QUOTE && nextCode === CC_DOUBLE_QUOTE) {
-                outCodes[writePos++] = nextCode;
-                i++;
-                continue;
-            }
-            if (code === CC_DOUBLE_QUOTE) state = STATE_NORMAL;
-        }
-    }
-    var result;
-    if (0 === writePos) result = ";";
-    else {
-        while(writePos > 0 && outCodes[writePos - 1] === CC_SEMICOLON)writePos--;
-        outCodes[writePos++] = CC_SEMICOLON;
-        result = _normDecoder.decode(outCodes.subarray(0, writePos));
-    }
-    _normCache.set(sql, result);
-    return result;
-}
 var DEFAULT_STATEMENT_TIMEOUT = 30000;
 function createTimeoutError(timeout, sql) {
-    return new Error("SQLite statement timed out after ".concat(timeout, "ms: ").concat(normalizeSQL(sql)));
+    return new Error("SQLite statement timed out after ".concat(timeout, "ms: ").concat(sql));
 }
 function toError(value) {
     return value instanceof Error ? value : new Error(String(value));
@@ -298,55 +89,65 @@ function createJsonValueParser(onValue) {
         feed: function(chunk) {
             this.buffer += chunk;
             var consumeUntil = 0;
-            for(var index = this.readPos; index < this.buffer.length; index++){
-                var code = this.buffer.charCodeAt(index);
-                if (-1 === this.start) {
+            var buffer = this.buffer;
+            var start = this.start;
+            var nesting = this.nesting;
+            var inString = this.inString;
+            var escaped = this.escaped;
+            for(var index = this.readPos; index < buffer.length; index++){
+                var code = buffer.charCodeAt(index);
+                if (-1 === start) {
                     if (isWhitespaceCode(code)) continue;
                     if (code !== CHAR_OPEN_BRACKET && code !== CHAR_OPEN_BRACE) continue;
-                    this.start = index;
-                    this.nesting = 1;
-                    this.inString = false;
-                    this.escaped = false;
+                    start = index;
+                    nesting = 1;
+                    inString = false;
+                    escaped = false;
                     continue;
                 }
-                if (this.inString) {
-                    if (this.escaped) this.escaped = false;
-                    else if (code === CHAR_BACKSLASH) this.escaped = true;
-                    else if (code === CHAR_QUOTE) this.inString = false;
+                if (inString) {
+                    if (escaped) escaped = false;
+                    else if (code === CHAR_BACKSLASH) escaped = true;
+                    else if (code === CHAR_QUOTE) inString = false;
                     continue;
                 }
                 if (code === CHAR_QUOTE) {
-                    this.inString = true;
+                    inString = true;
                     continue;
                 }
                 if (code === CHAR_OPEN_BRACKET || code === CHAR_OPEN_BRACE) {
-                    this.nesting++;
+                    nesting++;
                     continue;
                 }
                 if (code === CHAR_CLOSE_BRACKET || code === CHAR_CLOSE_BRACE) {
-                    this.nesting--;
-                    if (0 === this.nesting) {
-                        if (index === this.start + 1) {
-                            this.start = -1;
+                    nesting--;
+                    if (0 === nesting) {
+                        if (index === start + 1) {
+                            start = -1;
                             consumeUntil = index + 1;
                             continue;
                         }
-                        var raw = this.buffer.slice(this.start, index + 1);
-                        this.start = -1;
+                        var raw = buffer.slice(start, index + 1);
+                        start = -1;
                         onValue(raw);
                         consumeUntil = index + 1;
                     }
                 }
             }
+            this.start = start;
+            this.nesting = nesting;
+            this.inString = inString;
+            this.escaped = escaped;
             if (consumeUntil > 0) {
                 this._consumed = consumeUntil;
-                this.readPos = this._consumed;
+                this.readPos = -1 !== this.start ? buffer.length : this._consumed;
                 if (this._consumed > 65536) {
+                    if (-1 !== this.start) this.start -= this._consumed;
                     this.buffer = this.buffer.slice(this._consumed);
-                    this.readPos = 0;
+                    this.readPos = this.buffer.length;
                     this._consumed = 0;
                 }
-            } else this.readPos = this.buffer.length;
+            } else this.readPos = buffer.length;
         },
         reset: function() {
             this.buffer = "";
@@ -374,10 +175,18 @@ function createRowStreamParser(onRow) {
         feed: function(chunk) {
             if (this.finished) return chunk;
             this.buffer += chunk;
+            var buffer = this.buffer;
+            var started = this.started;
+            var inString = this.inString;
+            var escaped = this.escaped;
+            var elementStart = this.elementStart;
+            var elementEnd = this.elementEnd;
+            var nesting = this.nesting;
+            var consumed = this._consumed;
             var index = this.readPos;
-            while(index < this.buffer.length){
-                var code = this.buffer.charCodeAt(index);
-                if (!this.started) {
+            while(index < buffer.length){
+                var code = buffer.charCodeAt(index);
+                if (!started) {
                     if (isWhitespaceCode(code)) {
                         index++;
                         continue;
@@ -386,74 +195,81 @@ function createRowStreamParser(onRow) {
                         index++;
                         continue;
                     }
-                    this.started = true;
+                    started = true;
                     index++;
                     continue;
                 }
-                if (this.inString) {
-                    if (this.escaped) this.escaped = false;
-                    else if (code === CHAR_BACKSLASH) this.escaped = true;
-                    else if (code === CHAR_QUOTE) this.inString = false;
+                if (inString) {
+                    if (escaped) escaped = false;
+                    else if (code === CHAR_BACKSLASH) escaped = true;
+                    else if (code === CHAR_QUOTE) inString = false;
                     index++;
                     continue;
                 }
-                if (-1 === this.elementStart) {
+                if (-1 === elementStart) {
                     if (isWhitespaceCode(code) || code === CHAR_COMMA) {
                         index++;
                         continue;
                     }
                     if (code === CHAR_CLOSE_BRACKET) {
                         this.finished = true;
-                        var leftover = this.buffer.slice(index + 1);
-                        this.buffer = "";
                         this.readPos = 0;
-                        return leftover;
+                        this.buffer = "";
+                        this.started = false;
+                        return buffer.slice(index + 1);
                     }
-                    this.elementStart = index;
-                    this.elementEnd = -1;
-                    this.nesting = code === CHAR_OPEN_BRACE || code === CHAR_OPEN_BRACKET ? 1 : 0;
-                    this.inString = code === CHAR_QUOTE;
+                    elementStart = index;
+                    elementEnd = -1;
+                    nesting = code === CHAR_OPEN_BRACE || code === CHAR_OPEN_BRACKET ? 1 : 0;
+                    inString = code === CHAR_QUOTE;
+                    escaped = false;
                     index++;
                     continue;
                 }
                 if (code === CHAR_QUOTE) {
-                    this.inString = true;
+                    inString = true;
                     index++;
                     continue;
                 }
                 if (code === CHAR_OPEN_BRACE || code === CHAR_OPEN_BRACKET) {
-                    this.nesting++;
+                    nesting++;
                     index++;
                     continue;
                 }
                 if (code === CHAR_CLOSE_BRACE || code === CHAR_CLOSE_BRACKET) {
-                    this.nesting--;
-                    if (0 === this.nesting) this.elementEnd = index + 1;
+                    nesting--;
+                    if (0 === nesting) elementEnd = index + 1;
                 }
-                if (-1 !== this.elementEnd) {
+                if (-1 !== elementEnd) {
                     var lookAhead = index + 1;
-                    while(lookAhead < this.buffer.length && isWhitespaceCode(this.buffer.charCodeAt(lookAhead)))lookAhead++;
-                    if (lookAhead < this.buffer.length) {
-                        var delimiter = this.buffer.charCodeAt(lookAhead);
+                    while(lookAhead < buffer.length && isWhitespaceCode(buffer.charCodeAt(lookAhead)))lookAhead++;
+                    if (lookAhead < buffer.length) {
+                        var delimiter = buffer.charCodeAt(lookAhead);
                         if (delimiter === CHAR_COMMA || delimiter === CHAR_CLOSE_BRACKET) {
-                            onRow(this.buffer.slice(this.elementStart, this.elementEnd));
-                            this._consumed = lookAhead + 1;
-                            this.elementStart = -1;
-                            this.elementEnd = -1;
-                            this.nesting = 0;
+                            onRow(buffer.slice(elementStart, elementEnd));
+                            consumed = lookAhead + 1;
+                            elementStart = -1;
+                            elementEnd = -1;
+                            nesting = 0;
                             if (delimiter === CHAR_CLOSE_BRACKET) {
                                 this.finished = true;
-                                var tail = this.buffer.slice(this._consumed);
                                 this.buffer = "";
+                                this.started = false;
+                                this.inString = false;
+                                this.escaped = false;
+                                this.elementStart = -1;
+                                this.elementEnd = -1;
+                                this.nesting = 0;
                                 this._consumed = 0;
                                 this.readPos = 0;
-                                return tail;
+                                return buffer.slice(consumed);
                             }
-                            index = this._consumed;
-                            if (this._consumed > 65536) {
-                                this.buffer = this.buffer.slice(this._consumed);
-                                index = 0;
+                            index = consumed;
+                            if (consumed > 65536) {
+                                this.buffer = buffer.slice(consumed);
                                 this._consumed = 0;
+                                index = 0;
+                                consumed = 0;
                             }
                             continue;
                         }
@@ -461,12 +277,19 @@ function createRowStreamParser(onRow) {
                 }
                 index++;
             }
-            if (this._consumed > 0) {
-                if (-1 !== this.elementStart) {
-                    this.elementStart -= this._consumed;
-                    if (-1 !== this.elementEnd) this.elementEnd -= this._consumed;
+            this.started = started;
+            this.inString = inString;
+            this.escaped = escaped;
+            this.elementStart = elementStart;
+            this.elementEnd = elementEnd;
+            this.nesting = nesting;
+            this._consumed = consumed;
+            if (consumed > 0) {
+                if (-1 !== elementStart) {
+                    this.elementStart -= consumed;
+                    if (-1 !== elementEnd) this.elementEnd -= consumed;
                 }
-                this.buffer = this.buffer.slice(this._consumed);
+                this.buffer = buffer.slice(consumed);
                 this._consumed = 0;
             }
             if (this.elementStart > 0) {
@@ -494,14 +317,14 @@ function createRowStreamParser(onRow) {
 var TOKEN_COLUMN = "__sqlite_executor_token__";
 var DEFAULT_BATCH_SIZE = 10;
 var DEFAULT_MAX_INFLIGHT = 50;
-function stream_check_private_redeclaration(obj, privateCollection) {
+function _check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
 }
-function stream_class_apply_descriptor_get(receiver, descriptor) {
+function _class_apply_descriptor_get(receiver, descriptor) {
     if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
-function stream_class_apply_descriptor_set(receiver, descriptor, value) {
+function _class_apply_descriptor_set(receiver, descriptor, value) {
     if (descriptor.set) descriptor.set.call(receiver, value);
     else {
         if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
@@ -524,31 +347,31 @@ function _class_apply_descriptor_update(receiver, descriptor) {
     if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
     return descriptor;
 }
-function stream_class_call_check(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
-function stream_class_extract_field_descriptor(receiver, privateMap, action) {
+function _class_extract_field_descriptor(receiver, privateMap, action) {
     if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
-function stream_class_private_field_get(receiver, privateMap) {
-    var descriptor = stream_class_extract_field_descriptor(receiver, privateMap, "get");
-    return stream_class_apply_descriptor_get(receiver, descriptor);
+function _class_private_field_get(receiver, privateMap) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "get");
+    return _class_apply_descriptor_get(receiver, descriptor);
 }
-function stream_class_private_field_init(obj, privateMap, value) {
-    stream_check_private_redeclaration(obj, privateMap);
+function _class_private_field_init(obj, privateMap, value) {
+    _check_private_redeclaration(obj, privateMap);
     privateMap.set(obj, value);
 }
-function stream_class_private_field_set(receiver, privateMap, value) {
-    var descriptor = stream_class_extract_field_descriptor(receiver, privateMap, "set");
-    stream_class_apply_descriptor_set(receiver, descriptor, value);
+function _class_private_field_set(receiver, privateMap, value) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "set");
+    _class_apply_descriptor_set(receiver, descriptor, value);
     return value;
 }
 function _class_private_field_update(receiver, privateMap) {
-    var descriptor = stream_class_extract_field_descriptor(receiver, privateMap, "update");
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "update");
     return _class_apply_descriptor_update(receiver, descriptor);
 }
-function stream_defineProperties(target, props) {
+function _defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -557,9 +380,9 @@ function stream_defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function stream_create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) stream_defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) stream_defineProperties(Constructor, staticProps);
+function _create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
 function _type_of(obj) {
@@ -589,50 +412,50 @@ var _computedKey1 = _computedKey;
 var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
     "use strict";
     function AsyncRowBuffer() {
-        stream_class_call_check(this, AsyncRowBuffer);
-        stream_class_private_field_init(this, _buffer, {
+        _class_call_check(this, AsyncRowBuffer);
+        _class_private_field_init(this, _buffer, {
             writable: true,
             value: []
         });
-        stream_class_private_field_init(this, _index, {
+        _class_private_field_init(this, _index, {
             writable: true,
             value: 0
         });
-        stream_class_private_field_init(this, _done, {
+        _class_private_field_init(this, _done, {
             writable: true,
             value: false
         });
-        stream_class_private_field_init(this, _error, {
+        _class_private_field_init(this, _error, {
             writable: true,
             value: null
         });
-        stream_class_private_field_init(this, _pending, {
+        _class_private_field_init(this, _pending, {
             writable: true,
             value: null
         });
     }
-    stream_create_class(AsyncRowBuffer, [
+    _create_class(AsyncRowBuffer, [
         {
             key: "push",
             value: function(row) {
-                if (stream_class_private_field_get(this, _done) || stream_class_private_field_get(this, _error)) return;
-                if (stream_class_private_field_get(this, _pending)) {
-                    var resolve = stream_class_private_field_get(this, _pending).resolve;
-                    stream_class_private_field_set(this, _pending, null);
+                if (_class_private_field_get(this, _done) || _class_private_field_get(this, _error)) return;
+                if (_class_private_field_get(this, _pending)) {
+                    var resolve = _class_private_field_get(this, _pending).resolve;
+                    _class_private_field_set(this, _pending, null);
                     resolve({
                         value: row,
                         done: false
                     });
-                } else stream_class_private_field_get(this, _buffer).push(row);
+                } else _class_private_field_get(this, _buffer).push(row);
             }
         },
         {
             key: "end",
             value: function() {
-                stream_class_private_field_set(this, _done, true);
-                if (stream_class_private_field_get(this, _pending)) {
-                    var resolve = stream_class_private_field_get(this, _pending).resolve;
-                    stream_class_private_field_set(this, _pending, null);
+                _class_private_field_set(this, _done, true);
+                if (_class_private_field_get(this, _pending)) {
+                    var resolve = _class_private_field_get(this, _pending).resolve;
+                    _class_private_field_set(this, _pending, null);
                     resolve({
                         value: void 0,
                         done: true
@@ -643,10 +466,10 @@ var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
         {
             key: "error",
             value: function(err) {
-                stream_class_private_field_set(this, _error, err);
-                if (stream_class_private_field_get(this, _pending)) {
-                    var reject = stream_class_private_field_get(this, _pending).reject;
-                    stream_class_private_field_set(this, _pending, null);
+                _class_private_field_set(this, _error, err);
+                if (_class_private_field_get(this, _pending)) {
+                    var reject = _class_private_field_get(this, _pending).reject;
+                    _class_private_field_set(this, _pending, null);
                     reject(err);
                 }
             }
@@ -655,17 +478,17 @@ var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
             key: "next",
             value: function() {
                 var _this = this;
-                if (stream_class_private_field_get(this, _index) < stream_class_private_field_get(this, _buffer).length) return Promise.resolve({
-                    value: stream_class_private_field_get(this, _buffer)[_class_private_field_update(this, _index).value++],
+                if (_class_private_field_get(this, _index) < _class_private_field_get(this, _buffer).length) return Promise.resolve({
+                    value: _class_private_field_get(this, _buffer)[_class_private_field_update(this, _index).value++],
                     done: false
                 });
-                if (stream_class_private_field_get(this, _done)) return Promise.resolve({
+                if (_class_private_field_get(this, _done)) return Promise.resolve({
                     value: void 0,
                     done: true
                 });
-                if (stream_class_private_field_get(this, _error)) return Promise.reject(stream_class_private_field_get(this, _error));
+                if (_class_private_field_get(this, _error)) return Promise.reject(_class_private_field_get(this, _error));
                 return new Promise(function(resolve, reject) {
-                    stream_class_private_field_set(_this, _pending, {
+                    _class_private_field_set(_this, _pending, {
                         resolve: resolve,
                         reject: reject
                     });
@@ -675,12 +498,12 @@ var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
         {
             key: "return",
             value: function() {
-                stream_class_private_field_set(this, _done, true);
-                stream_class_private_field_set(this, _buffer, []);
-                stream_class_private_field_set(this, _index, 0);
-                if (stream_class_private_field_get(this, _pending)) {
-                    var resolve = stream_class_private_field_get(this, _pending).resolve;
-                    stream_class_private_field_set(this, _pending, null);
+                _class_private_field_set(this, _done, true);
+                _class_private_field_set(this, _buffer, []);
+                _class_private_field_set(this, _index, 0);
+                if (_class_private_field_get(this, _pending)) {
+                    var resolve = _class_private_field_get(this, _pending).resolve;
+                    _class_private_field_set(this, _pending, null);
                     resolve({
                         value: void 0,
                         done: true
@@ -1220,6 +1043,119 @@ function generateToken() {
     _counter = _counter + 1 >>> 0;
     return "".concat(_PREFIX).concat(_counter.toString(36), "_").concat(_PID36);
 }
+function lruCache_check_private_redeclaration(obj, privateCollection) {
+    if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
+}
+function lruCache_class_apply_descriptor_get(receiver, descriptor) {
+    if (descriptor.get) return descriptor.get.call(receiver);
+    return descriptor.value;
+}
+function lruCache_class_apply_descriptor_set(receiver, descriptor, value) {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
+        if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
+        descriptor.value = value;
+    }
+}
+function lruCache_class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
+}
+function lruCache_class_extract_field_descriptor(receiver, privateMap, action) {
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
+    return privateMap.get(receiver);
+}
+function lruCache_class_private_field_get(receiver, privateMap) {
+    var descriptor = lruCache_class_extract_field_descriptor(receiver, privateMap, "get");
+    return lruCache_class_apply_descriptor_get(receiver, descriptor);
+}
+function lruCache_class_private_field_init(obj, privateMap, value) {
+    lruCache_check_private_redeclaration(obj, privateMap);
+    privateMap.set(obj, value);
+}
+function lruCache_class_private_field_set(receiver, privateMap, value) {
+    var descriptor = lruCache_class_extract_field_descriptor(receiver, privateMap, "set");
+    lruCache_class_apply_descriptor_set(receiver, descriptor, value);
+    return value;
+}
+function lruCache_defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function lruCache_create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) lruCache_defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) lruCache_defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+var _maxSize = /*#__PURE__*/ new WeakMap(), _maxKeyLength = /*#__PURE__*/ new WeakMap(), _maxValueLength = /*#__PURE__*/ new WeakMap(), _map = /*#__PURE__*/ new WeakMap();
+var lruCache_LRUCache = /*#__PURE__*/ function() {
+    "use strict";
+    function LRUCache() {
+        var _ref = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, _ref_maxSize = _ref.maxSize, maxSize = void 0 === _ref_maxSize ? 256 : _ref_maxSize, _ref_maxKeyLength = _ref.maxKeyLength, maxKeyLength = void 0 === _ref_maxKeyLength ? 4096 : _ref_maxKeyLength, _ref_maxValueLength = _ref.maxValueLength, maxValueLength = void 0 === _ref_maxValueLength ? 1 / 0 : _ref_maxValueLength;
+        lruCache_class_call_check(this, LRUCache);
+        lruCache_class_private_field_init(this, _maxSize, {
+            writable: true,
+            value: void 0
+        });
+        lruCache_class_private_field_init(this, _maxKeyLength, {
+            writable: true,
+            value: void 0
+        });
+        lruCache_class_private_field_init(this, _maxValueLength, {
+            writable: true,
+            value: void 0
+        });
+        lruCache_class_private_field_init(this, _map, {
+            writable: true,
+            value: new Map()
+        });
+        lruCache_class_private_field_set(this, _maxSize, Math.max(1, maxSize));
+        lruCache_class_private_field_set(this, _maxKeyLength, maxKeyLength);
+        lruCache_class_private_field_set(this, _maxValueLength, maxValueLength);
+    }
+    lruCache_create_class(LRUCache, [
+        {
+            key: "get",
+            value: function(key) {
+                if ("string" != typeof key || key.length > lruCache_class_private_field_get(this, _maxKeyLength)) return;
+                var value = lruCache_class_private_field_get(this, _map).get(key);
+                if (void 0 === value) return;
+                lruCache_class_private_field_get(this, _map)["delete"](key);
+                lruCache_class_private_field_get(this, _map).set(key, value);
+                return value;
+            }
+        },
+        {
+            key: "set",
+            value: function(key, value) {
+                if ("string" != typeof key || key.length > lruCache_class_private_field_get(this, _maxKeyLength)) return;
+                if (value && value.length > lruCache_class_private_field_get(this, _maxValueLength)) return;
+                if (lruCache_class_private_field_get(this, _map).size >= lruCache_class_private_field_get(this, _maxSize)) {
+                    var firstKey = lruCache_class_private_field_get(this, _map).keys().next().value;
+                    lruCache_class_private_field_get(this, _map)["delete"](firstKey);
+                }
+                lruCache_class_private_field_get(this, _map).set(key, value);
+            }
+        },
+        {
+            key: "size",
+            get: function() {
+                return lruCache_class_private_field_get(this, _map).size;
+            }
+        },
+        {
+            key: "clear",
+            value: function() {
+                lruCache_class_private_field_get(this, _map).clear();
+            }
+        }
+    ]);
+    return LRUCache;
+}();
 function escape_type_of(obj) {
     return obj && "undefined" != typeof Symbol && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
@@ -1231,110 +1167,168 @@ function escapeValue(value) {
     if (value instanceof Date) return "'".concat(value.toISOString(), "'");
     throw new TypeError("Unsupported parameter type: ".concat(void 0 === value ? "undefined" : escape_type_of(value)));
 }
-var _interpCache = new lruCache_LRUCache({
+new lruCache_LRUCache({
     maxSize: 256,
     maxKeyLength: 4096
 });
-function _parseTemplate(sql) {
-    var segments = [];
-    var segStart = 0;
-    var state = STATE_NORMAL;
-    var stateStartPos = -1;
-    for(var pos = 0; pos < sql.length; pos++){
-        var code = sql.charCodeAt(pos);
-        if (state === STATE_NORMAL) {
-            if (code === CC_SINGLE_QUOTE) {
-                state = STATE_SINGLE_QUOTE;
-                stateStartPos = pos;
-                continue;
+function interpolateFromTemplate(template, params) {
+    var segments = template.segments, paramCount = template.paramCount;
+    if (params.length < paramCount) throw new Error("Too few parameters provided");
+    if (params.length > paramCount) throw new Error("Too many parameters provided");
+    if (0 === paramCount) return segments[0];
+    var parts = [
+        segments[0]
+    ];
+    for(var i = 0; i < params.length; i++){
+        parts.push(escapeValue(params[i]));
+        parts.push(segments[i + 1]);
+    }
+    return parts.join("");
+}
+var constants_CC_SINGLE_QUOTE = 39;
+var constants_CC_DOUBLE_QUOTE = 34;
+var constants_CC_DASH = 45;
+var constants_CC_SLASH = 47;
+var constants_CC_STAR = 42;
+var constants_CC_NEWLINE = 10;
+var constants_CC_QUESTION = 63;
+var CC_SEMICOLON = 59;
+var CC_SPACE = 32;
+var constants_STATE_NORMAL = 0;
+var constants_STATE_SINGLE_QUOTE = 1;
+var constants_STATE_DOUBLE_QUOTE = 2;
+var constants_STATE_LINE_COMMENT = 3;
+var constants_STATE_BLOCK_COMMENT = 4;
+var _normDecoder = new TextDecoder("utf-16le");
+var _normCache = new lruCache_LRUCache({
+    maxSize: 256,
+    maxKeyLength: 4096
+});
+function _normalize(sql) {
+    var len = sql.length;
+    var needed = len + 1;
+    var outCodes = new Uint16Array(needed);
+    var writePos = 0;
+    var pendingSpace = false;
+    var state = constants_STATE_NORMAL;
+    var questionPositions = [];
+    for(var i = 0; i < len; i++){
+        var code = sql.charCodeAt(i);
+        var nextCode = sql.charCodeAt(i + 1);
+        if (state === constants_STATE_BLOCK_COMMENT) {
+            if (code === constants_CC_STAR && nextCode === constants_CC_SLASH) {
+                state = constants_STATE_NORMAL;
+                i++;
+                if (writePos > 0) pendingSpace = true;
             }
-            if (code === CC_DOUBLE_QUOTE) {
-                state = STATE_DOUBLE_QUOTE;
-                stateStartPos = pos;
-                continue;
+            continue;
+        }
+        if (state === constants_STATE_LINE_COMMENT) {
+            if (code === constants_CC_NEWLINE) {
+                state = constants_STATE_NORMAL;
+                if (writePos > 0) pendingSpace = true;
             }
-            if (code === CC_DASH && sql.charCodeAt(pos + 1) === CC_DASH) {
-                state = STATE_LINE_COMMENT;
-                pos++;
+            continue;
+        }
+        if (state === constants_STATE_NORMAL) {
+            if (code === constants_CC_DASH && nextCode === constants_CC_DASH) {
+                state = constants_STATE_LINE_COMMENT;
+                i++;
                 continue;
             }
-            if (code === CC_SLASH && sql.charCodeAt(pos + 1) === CC_STAR) {
-                state = STATE_BLOCK_COMMENT;
-                stateStartPos = pos;
-                pos++;
+            if (code === constants_CC_SLASH && nextCode === constants_CC_STAR) {
+                state = constants_STATE_BLOCK_COMMENT;
+                i++;
                 continue;
             }
-            if (code === CC_QUESTION) {
-                segments.push(sql.slice(segStart, pos));
-                segStart = pos + 1;
-            }
-            continue;
         }
-        if (state === STATE_SINGLE_QUOTE) {
-            if (code === CC_SINGLE_QUOTE) {
-                if (sql.charCodeAt(pos + 1) === CC_SINGLE_QUOTE) {
-                    pos++;
-                    continue;
-                }
-                state = STATE_NORMAL;
-                stateStartPos = -1;
-            }
+        if (32 === code || 9 === code || 10 === code || 11 === code || 12 === code || 13 === code) {
+            if (writePos > 0) pendingSpace = true;
             continue;
         }
-        if (state === STATE_DOUBLE_QUOTE) {
-            if (code === CC_DOUBLE_QUOTE) {
-                if (sql.charCodeAt(pos + 1) === CC_DOUBLE_QUOTE) {
-                    pos++;
-                    continue;
-                }
-                state = STATE_NORMAL;
-                stateStartPos = -1;
-            }
+        if (pendingSpace && writePos > 0) {
+            outCodes[writePos++] = CC_SPACE;
+            pendingSpace = false;
+        }
+        if (code === constants_CC_QUESTION && state === constants_STATE_NORMAL) questionPositions.push(writePos);
+        outCodes[writePos++] = code;
+        if (state === constants_STATE_NORMAL) {
+            if (code === constants_CC_SINGLE_QUOTE) state = constants_STATE_SINGLE_QUOTE;
+            else if (code === constants_CC_DOUBLE_QUOTE) state = constants_STATE_DOUBLE_QUOTE;
             continue;
         }
-        if (state === STATE_LINE_COMMENT) {
-            if (code === CC_NEWLINE) state = STATE_NORMAL;
+        if (state === constants_STATE_SINGLE_QUOTE) {
+            if (code === constants_CC_SINGLE_QUOTE && nextCode === constants_CC_SINGLE_QUOTE) {
+                outCodes[writePos++] = nextCode;
+                i++;
+                continue;
+            }
+            if (code === constants_CC_SINGLE_QUOTE) state = constants_STATE_NORMAL;
             continue;
         }
-        if (state === STATE_BLOCK_COMMENT) {
-            if (code === CC_STAR && sql.charCodeAt(pos + 1) === CC_SLASH) {
-                pos++;
-                state = STATE_NORMAL;
-                stateStartPos = -1;
+        if (state === constants_STATE_DOUBLE_QUOTE) {
+            if (code === constants_CC_DOUBLE_QUOTE && nextCode === constants_CC_DOUBLE_QUOTE) {
+                outCodes[writePos++] = nextCode;
+                i++;
+                continue;
             }
+            if (code === constants_CC_DOUBLE_QUOTE) state = constants_STATE_NORMAL;
+        }
+    }
+    var normalized;
+    if (0 === writePos) normalized = ";";
+    else {
+        while(writePos > 0 && outCodes[writePos - 1] === CC_SEMICOLON)writePos--;
+        outCodes[writePos++] = CC_SEMICOLON;
+        normalized = _normDecoder.decode(outCodes.subarray(0, writePos));
+    }
+    var paramCount = questionPositions.length;
+    if (0 === paramCount) return {
+        normalized: normalized,
+        segments: [
+            normalized
+        ],
+        paramCount: 0
+    };
+    var segments = [];
+    var segStart = 0;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+    try {
+        for(var _iterator = questionPositions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var pos = _step.value;
+            segments.push(normalized.slice(segStart, pos));
+            segStart = pos + 1;
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && null != _iterator["return"]) _iterator["return"]();
+        } finally{
+            if (_didIteratorError) throw _iteratorError;
         }
     }
-    if (state === STATE_SINGLE_QUOTE) throw new Error("Unterminated single-quoted string starting at position ".concat(stateStartPos + 1));
-    if (state === STATE_DOUBLE_QUOTE) throw new Error("Unterminated double-quoted identifier/string starting at position ".concat(stateStartPos + 1));
-    if (state === STATE_BLOCK_COMMENT) throw new Error("Unterminated block comment starting at position ".concat(stateStartPos + 1));
-    segments.push(sql.slice(segStart));
+    segments.push(normalized.slice(segStart));
     return {
+        normalized: normalized,
         segments: segments,
-        paramCount: segments.length - 1
+        paramCount: paramCount
     };
 }
-function interpolateSQL(sql, params) {
-    if (!sql.includes("?")) {
-        if (params.length > 0) throw new Error("Too many parameters provided");
-        return sql;
-    }
-    var template = _interpCache.get(sql);
-    if (void 0 === template) {
-        template = _parseTemplate(sql);
-        _interpCache.set(sql, template);
-    }
-    var segments = template.segments, paramCount = template.paramCount;
-    if (params.length < paramCount) throw new Error("Too few parameters provided");
-    if (params.length > paramCount) throw new Error("Too many parameters provided");
-    if (0 === paramCount) return segments[0];
-    var parts = [
-        segments[0]
-    ];
-    for(var i = 0; i < params.length; i++){
-        parts.push(escapeValue(params[i]));
-        parts.push(segments[i + 1]);
-    }
-    return parts.join("");
+function normalizeSQL(sql) {
+    var cached = _normCache.get(sql);
+    if (void 0 !== cached) return cached.normalized;
+    var result = _normalize(sql);
+    _normCache.set(sql, result);
+    return result.normalized;
+}
+function normalizeSQLTemplate(sql) {
+    var cached = _normCache.get(sql);
+    if (void 0 !== cached) return cached;
+    var result = _normalize(sql);
+    _normCache.set(sql, result);
+    return result;
 }
 var READ_ONLY_KINDS = new Set([
     "SELECT",
@@ -1353,13 +1347,17 @@ function classifySingle(stmt) {
     return READ_ONLY_KINDS.has(kind) ? "read" : "write";
 }
 function classifySQL(sql) {
-    if ("string" != typeof sql || 0 === sql.trim().length) return "write";
+    if ("string" != typeof sql) return "write";
     var cached = _classifyCache.get(sql);
     if (void 0 !== cached) return cached;
     var trimmed = sql.trim();
+    if (0 === trimmed.length) return "write";
     var result;
     if (trimmed.includes(";")) {
-        var stmts = trimmed.split(";");
+        var stmts = trimmed.split(";").filter(function(s) {
+            return s.trim().length > 0;
+        });
+        if (0 === stmts.length) return "write";
         result = "read";
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
         try {
@@ -1780,8 +1778,11 @@ function buildPayload(sql, token) {
     return "".concat(normalized).concat(suffix, "\nSELECT '").concat(token, "' AS ").concat(TOKEN_COLUMN, ";\n");
 }
 function isTransactionControl(sql) {
-    var s = sql.trim().toUpperCase();
-    return "BEGIN" === s || "BEGIN TRANSACTION" === s || "COMMIT" === s || "COMMIT TRANSACTION" === s || "ROLLBACK" === s || "ROLLBACK TRANSACTION" === s || s.startsWith("BEGIN ") || s.startsWith("COMMIT ") || s.startsWith("ROLLBACK ");
+    var f = sql.charCodeAt(0);
+    if (66 === f || 98 === f) return "BEGIN" === sql || "BEGIN;" === sql || sql.startsWith("BEGIN ") || sql.startsWith("BEGIN;");
+    if (67 === f || 99 === f) return "COMMIT" === sql || "COMMIT;" === sql || sql.startsWith("COMMIT ") || sql.startsWith("COMMIT;");
+    if (82 === f || 114 === f) return "ROLLBACK" === sql || "ROLLBACK;" === sql || sql.startsWith("ROLLBACK ") || sql.startsWith("ROLLBACK;");
+    return false;
 }
 function buildBatchPayload(batch) {
     var useWalBatch = batch.length > 1 && batch.every(function(t) {
@@ -1847,43 +1848,21 @@ function buildBatchPayload(batch) {
     }
     return parts1.join("");
 }
+var TC_FIRST_CHAR = TOKEN_COLUMN.charCodeAt(0);
+function buildSentinelStr(token) {
+    return '[{"'.concat(TOKEN_COLUMN, '":"').concat(token, '"}]');
+}
 function isSentinelRaw(raw, token) {
-    return raw === '[{"'.concat(TOKEN_COLUMN, '":"').concat(token, '"}]');
+    return raw.charCodeAt(3) === TC_FIRST_CHAR && raw === buildSentinelStr(token);
 }
 function isSentinelRow(value, token) {
     var _value_;
     return Array.isArray(value) && 1 === value.length && (null == (_value_ = value[0]) ? void 0 : _value_[TOKEN_COLUMN]) === token;
 }
-function _array_like_to_array(arr, len) {
-    if (null == len || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
-function _iterable_to_array(iter) {
-    if ("undefined" != typeof Symbol && null != iter[Symbol.iterator] || null != iter["@@iterator"]) return Array.from(iter);
-}
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if ("string" == typeof o) return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if ("Object" === n && o.constructor) n = o.constructor.name;
-    if ("Map" === n || "Set" === n) return Array.from(n);
-    if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
 function collectQueryRows(task, parsed) {
     if (Array.isArray(parsed)) {
-        var _task_rows;
         if (!task.rows) task.rows = [];
-        (_task_rows = task.rows).push.apply(_task_rows, _to_consumable_array(parsed));
+        for(var i = 0; i < parsed.length; i++)task.rows.push(parsed[i]);
     }
 }
 function processStreamRows(task, parsed) {
@@ -1914,7 +1893,6 @@ function settleTask(task, error, value, metrics) {
     var _ref = arguments.length > 4 && void 0 !== arguments[4] ? arguments[4] : {}, _ref_resetRowParser = _ref.resetRowParser, resetRowParser = void 0 === _ref_resetRowParser ? false : _ref_resetRowParser;
     if (task.settled) return;
     task.settled = true;
-    clearTimeout(task.timer);
     if (resetRowParser) {
         var _task_rowParser_reset, _task_rowParser;
         null == (_task_rowParser = task.rowParser) || null == (_task_rowParser_reset = _task_rowParser.reset) || _task_rowParser_reset.call(_task_rowParser);
@@ -1963,18 +1941,16 @@ function finalizePendingTasks(tasks, settle, pumpQueue) {
 function prepareTaskTimeout(task, metrics) {
     if (task.settled) return null;
     task.timedout = true;
-    clearTimeout(task.timer);
-    task.timer = null;
     null == metrics || metrics.incrementTasksTimeout();
     return createTimeoutError(task.timeout, task.sql);
 }
-function taskWorker_array_like_to_array(arr, len) {
+function _array_like_to_array(arr, len) {
     if (null == len || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function taskWorker_array_without_holes(arr) {
-    if (Array.isArray(arr)) return taskWorker_array_like_to_array(arr);
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
 function taskWorker_check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
@@ -1990,6 +1966,22 @@ function taskWorker_class_apply_descriptor_set(receiver, descriptor, value) {
         descriptor.value = value;
     }
 }
+function taskWorker_class_apply_descriptor_update(receiver, descriptor) {
+    if (descriptor.set) {
+        if (!descriptor.get) throw new TypeError("attempted to read set only private field");
+        if (!("__destrWrapper" in descriptor)) descriptor.__destrWrapper = {
+            set value (v){
+                descriptor.set.call(receiver, v);
+            },
+            get value () {
+                return descriptor.get.call(receiver);
+            }
+        };
+        return descriptor.__destrWrapper;
+    }
+    if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
+    return descriptor;
+}
 function taskWorker_class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
@@ -2010,6 +2002,10 @@ function taskWorker_class_private_field_set(receiver, privateMap, value) {
     taskWorker_class_apply_descriptor_set(receiver, descriptor, value);
     return value;
 }
+function taskWorker_class_private_field_update(receiver, privateMap) {
+    var descriptor = taskWorker_class_extract_field_descriptor(receiver, privateMap, "update");
+    return taskWorker_class_apply_descriptor_update(receiver, descriptor);
+}
 function taskWorker_class_private_method_get(receiver, privateSet, fn) {
     if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
     return fn;
@@ -2032,35 +2028,39 @@ function taskWorker_create_class(Constructor, protoProps, staticProps) {
     if (staticProps) taskWorker_defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function taskWorker_iterable_to_array(iter) {
+function _iterable_to_array(iter) {
     if ("undefined" != typeof Symbol && null != iter[Symbol.iterator] || null != iter["@@iterator"]) return Array.from(iter);
 }
-function taskWorker_non_iterable_spread() {
+function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function taskWorker_to_consumable_array(arr) {
-    return taskWorker_array_without_holes(arr) || taskWorker_iterable_to_array(arr) || taskWorker_unsupported_iterable_to_array(arr) || taskWorker_non_iterable_spread();
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function taskWorker_unsupported_iterable_to_array(o, minLen) {
+function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
-    if ("string" == typeof o) return taskWorker_array_like_to_array(o, minLen);
+    if ("string" == typeof o) return _array_like_to_array(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if ("Object" === n && o.constructor) n = o.constructor.name;
     if ("Map" === n || "Set" === n) return Array.from(n);
-    if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return taskWorker_array_like_to_array(o, minLen);
+    if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-var _processManager = /*#__PURE__*/ new WeakMap(), _pendingQueue = /*#__PURE__*/ new WeakMap(), _inflightTasks = /*#__PURE__*/ new WeakMap(), _pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), _scheduledFinalize = /*#__PURE__*/ new WeakMap(), _valueParser = /*#__PURE__*/ new WeakMap(), _statementTimeout = /*#__PURE__*/ new WeakMap(), _logger = /*#__PURE__*/ new WeakMap(), _name = /*#__PURE__*/ new WeakMap(), _batchSize = /*#__PURE__*/ new WeakMap(), _maxInflight = /*#__PURE__*/ new WeakMap(), _metrics = /*#__PURE__*/ new WeakMap(), _startProcess = /*#__PURE__*/ new WeakSet(), _pumpQueue = /*#__PURE__*/ new WeakSet(), _handleParsedValue = /*#__PURE__*/ new WeakSet(), _scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), _handleStderrChunk = /*#__PURE__*/ new WeakSet(), _handleTaskTimeout = /*#__PURE__*/ new WeakSet(), _settleTask = /*#__PURE__*/ new WeakSet(), _rejectAll = /*#__PURE__*/ new WeakSet();
+var _processManager = /*#__PURE__*/ new WeakMap(), _pendingQueue = /*#__PURE__*/ new WeakMap(), _inflightTasks = /*#__PURE__*/ new WeakMap(), _inflightHead = /*#__PURE__*/ new WeakMap(), _pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), _scheduledFinalize = /*#__PURE__*/ new WeakMap(), _valueParser = /*#__PURE__*/ new WeakMap(), _statementTimeout = /*#__PURE__*/ new WeakMap(), _logger = /*#__PURE__*/ new WeakMap(), _name = /*#__PURE__*/ new WeakMap(), _batchSize = /*#__PURE__*/ new WeakMap(), _maxInflight = /*#__PURE__*/ new WeakMap(), _metrics = /*#__PURE__*/ new WeakMap(), _sweepTimer = /*#__PURE__*/ new WeakMap(), _sweepIntervalMs = /*#__PURE__*/ new WeakMap(), _startProcess = /*#__PURE__*/ new WeakSet(), _inflightCount = /*#__PURE__*/ new WeakSet(), _firstInflight = /*#__PURE__*/ new WeakSet(), _shiftInflight = /*#__PURE__*/ new WeakSet(), _pumpQueue = /*#__PURE__*/ new WeakSet(), _handleParsedValue = /*#__PURE__*/ new WeakSet(), _scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), _handleStderrChunk = /*#__PURE__*/ new WeakSet(), _scheduleSweep = /*#__PURE__*/ new WeakSet(), _handleTaskTimeout = /*#__PURE__*/ new WeakSet(), _settleTask = /*#__PURE__*/ new WeakSet(), _rejectAll = /*#__PURE__*/ new WeakSet();
 var taskWorker_TaskWorker = /*#__PURE__*/ function() {
     "use strict";
     function TaskWorker(param) {
         var _this = this;
-        var binary = param.binary, database = param.database, statementTimeout = param.statementTimeout, logger = param.logger, name = param.name, initMode = param.initMode, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, metrics = param.metrics;
+        var binary = param.binary, database = param.database, statementTimeout = param.statementTimeout, logger = param.logger, name = param.name, initMode = param.initMode, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, metrics = param.metrics, _param_sweepInterval = param.sweepInterval, sweepInterval = void 0 === _param_sweepInterval ? 100 : _param_sweepInterval;
         taskWorker_class_call_check(this, TaskWorker);
         taskWorker_class_private_method_init(this, _startProcess);
+        taskWorker_class_private_method_init(this, _inflightCount);
+        taskWorker_class_private_method_init(this, _firstInflight);
+        taskWorker_class_private_method_init(this, _shiftInflight);
         taskWorker_class_private_method_init(this, _pumpQueue);
         taskWorker_class_private_method_init(this, _handleParsedValue);
         taskWorker_class_private_method_init(this, _scheduleFinalizeCheck);
         taskWorker_class_private_method_init(this, _handleStderrChunk);
+        taskWorker_class_private_method_init(this, _scheduleSweep);
         taskWorker_class_private_method_init(this, _handleTaskTimeout);
         taskWorker_class_private_method_init(this, _settleTask);
         taskWorker_class_private_method_init(this, _rejectAll);
@@ -2076,6 +2076,10 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
             writable: true,
             value: []
         });
+        taskWorker_class_private_field_init(this, _inflightHead, {
+            writable: true,
+            value: 0
+        });
         taskWorker_class_private_field_init(this, _pendingFinalizeTasks, {
             writable: true,
             value: new Set()
@@ -2112,12 +2116,21 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
             writable: true,
             value: void 0
         });
+        taskWorker_class_private_field_init(this, _sweepTimer, {
+            writable: true,
+            value: null
+        });
+        taskWorker_class_private_field_init(this, _sweepIntervalMs, {
+            writable: true,
+            value: void 0
+        });
         taskWorker_class_private_field_set(this, _name, null != name ? name : "worker");
         taskWorker_class_private_field_set(this, _statementTimeout, statementTimeout);
         taskWorker_class_private_field_set(this, _logger, logger);
         taskWorker_class_private_field_set(this, _batchSize, batchSize);
         taskWorker_class_private_field_set(this, _maxInflight, maxInflight);
         taskWorker_class_private_field_set(this, _metrics, metrics);
+        taskWorker_class_private_field_set(this, _sweepIntervalMs, sweepInterval);
         taskWorker_class_private_field_set(this, _processManager, new process_ProcessManager({
             binary: binary,
             database: database,
@@ -2141,13 +2154,13 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
         {
             key: "idle",
             get: function() {
-                return 0 === taskWorker_class_private_field_get(this, _inflightTasks).length && taskWorker_class_private_field_get(this, _pendingQueue).isEmpty() && 0 === taskWorker_class_private_field_get(this, _pendingFinalizeTasks).size;
+                return taskWorker_class_private_field_get(this, _inflightTasks).length === taskWorker_class_private_field_get(this, _inflightHead) && taskWorker_class_private_field_get(this, _pendingQueue).isEmpty() && 0 === taskWorker_class_private_field_get(this, _pendingFinalizeTasks).size;
             }
         },
         {
             key: "pendingStatements",
             get: function() {
-                return taskWorker_class_private_field_get(this, _pendingQueue).size + taskWorker_class_private_field_get(this, _inflightTasks).length + taskWorker_class_private_field_get(this, _pendingFinalizeTasks).size;
+                return taskWorker_class_private_field_get(this, _pendingQueue).size + (taskWorker_class_private_field_get(this, _inflightTasks).length - taskWorker_class_private_field_get(this, _inflightHead)) + taskWorker_class_private_field_get(this, _pendingFinalizeTasks).size;
             }
         },
         {
@@ -2167,8 +2180,6 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
                     consumerError: null,
                     stderrText: "",
                     settled: false,
-                    errorScheduled: false,
-                    timer: null,
                     startTime: 0
                 };
                 null == (_$_class_private_field_get = taskWorker_class_private_field_get(this, _metrics)) || _$_class_private_field_get.incrementTasksTotal(config.kind);
@@ -2176,6 +2187,12 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
                 taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
             }
         },
+        {
+            key: "_sweepTimer",
+            get: function() {
+                return taskWorker_class_private_field_get(this, _sweepTimer);
+            }
+        },
         {
             key: "_process",
             get: function() {
@@ -2185,6 +2202,8 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
         {
             key: "kill",
             value: function() {
+                clearTimeout(taskWorker_class_private_field_get(this, _sweepTimer));
+                taskWorker_class_private_field_set(this, _sweepTimer, null);
                 taskWorker_class_private_method_get(this, _rejectAll, taskWorker_rejectAll).call(this, new Error("".concat(taskWorker_class_private_field_get(this, _name), " is killed")));
                 taskWorker_class_private_field_get(this, _processManager).kill();
             }
@@ -2213,15 +2232,33 @@ function startProcess() {
         taskWorker_class_private_method_get(_this, _rejectAll, taskWorker_rejectAll).call(_this, err);
     });
 }
+function inflightCount() {
+    return taskWorker_class_private_field_get(this, _inflightTasks).length - taskWorker_class_private_field_get(this, _inflightHead);
+}
+function firstInflight() {
+    return taskWorker_class_private_field_get(this, _inflightHead) < taskWorker_class_private_field_get(this, _inflightTasks).length ? taskWorker_class_private_field_get(this, _inflightTasks)[taskWorker_class_private_field_get(this, _inflightHead)] : null;
+}
+function shiftInflight() {
+    var task = taskWorker_class_private_field_get(this, _inflightTasks)[taskWorker_class_private_field_get(this, _inflightHead)];
+    taskWorker_class_private_field_get(this, _inflightTasks)[taskWorker_class_private_field_get(this, _inflightHead)] = null;
+    taskWorker_class_private_field_update(this, _inflightHead).value++;
+    if (taskWorker_class_private_field_get(this, _inflightHead) >= taskWorker_class_private_field_get(this, _inflightTasks).length) {
+        taskWorker_class_private_field_set(this, _inflightTasks, []);
+        taskWorker_class_private_field_set(this, _inflightHead, 0);
+    } else if (taskWorker_class_private_field_get(this, _inflightHead) > 128) {
+        taskWorker_class_private_field_set(this, _inflightTasks, taskWorker_class_private_field_get(this, _inflightTasks).slice(taskWorker_class_private_field_get(this, _inflightHead)));
+        taskWorker_class_private_field_set(this, _inflightHead, 0);
+    }
+    return task;
+}
 function taskWorker_pumpQueue() {
-    var _this = this;
     var _$_class_private_field_get;
     if (taskWorker_class_private_field_get(this, _processManager).draining) return;
-    if (taskWorker_class_private_field_get(this, _inflightTasks).length >= taskWorker_class_private_field_get(this, _maxInflight)) return;
+    if (taskWorker_class_private_method_get(this, _inflightCount, inflightCount).call(this) >= taskWorker_class_private_field_get(this, _maxInflight)) return;
     var batch = [];
-    while(batch.length < taskWorker_class_private_field_get(this, _batchSize) && !taskWorker_class_private_field_get(this, _pendingQueue).isEmpty() && taskWorker_class_private_field_get(this, _inflightTasks).length + batch.length < taskWorker_class_private_field_get(this, _maxInflight)){
+    while(batch.length < taskWorker_class_private_field_get(this, _batchSize) && !taskWorker_class_private_field_get(this, _pendingQueue).isEmpty() && taskWorker_class_private_method_get(this, _inflightCount, inflightCount).call(this) + batch.length < taskWorker_class_private_field_get(this, _maxInflight)){
         var task = taskWorker_class_private_field_get(this, _pendingQueue).peek();
-        if ("stream" === task.kind && (batch.length > 0 || taskWorker_class_private_field_get(this, _inflightTasks).length > 0)) break;
+        if ("stream" === task.kind && (batch.length > 0 || taskWorker_class_private_method_get(this, _inflightCount, inflightCount).call(this) > 0)) break;
         taskWorker_class_private_field_get(this, _pendingQueue).dequeue();
         batch.push(task);
     }
@@ -2230,15 +2267,10 @@ function taskWorker_pumpQueue() {
     var payload = buildBatchPayload(batch);
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
-        var _this1, _loop = function() {
-            var task = _step.value;
-            task.startTime = now;
-            var _task_timeout;
-            task.timer = setTimeout(function() {
-                return taskWorker_class_private_method_get(_this, _handleTaskTimeout, handleTaskTimeout).call(_this, task);
-            }, null != (_task_timeout = task.timeout) ? _task_timeout : taskWorker_class_private_field_get(_this1, _statementTimeout));
-        };
-        for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_this1 = this, _loop();
+        for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var task1 = _step.value;
+            task1.startTime = now;
+        }
     } catch (err) {
         _didIteratorError = true;
         _iteratorError = err;
@@ -2249,15 +2281,15 @@ function taskWorker_pumpQueue() {
             if (_didIteratorError) throw _iteratorError;
         }
     }
-    (_$_class_private_field_get = taskWorker_class_private_field_get(this, _inflightTasks)).push.apply(_$_class_private_field_get, taskWorker_to_consumable_array(batch));
+    (_$_class_private_field_get = taskWorker_class_private_field_get(this, _inflightTasks)).push.apply(_$_class_private_field_get, _to_consumable_array(batch));
+    taskWorker_class_private_method_get(this, _scheduleSweep, scheduleSweep).call(this);
     taskWorker_class_private_field_get(this, _processManager).write(payload);
 }
 function handleParsedValue(raw) {
-    var task = taskWorker_class_private_field_get(this, _inflightTasks)[0];
+    var task = taskWorker_class_private_method_get(this, _firstInflight, firstInflight).call(this);
     if (!task) return;
     if (isSentinelRaw(raw, task.token)) {
-        clearTimeout(task.timer);
-        taskWorker_class_private_field_get(this, _inflightTasks).shift();
+        taskWorker_class_private_method_get(this, _shiftInflight, shiftInflight).call(this);
         if (task.timedout) return void taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
         if (task.stderrText) {
             taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, task, new Error(task.stderrText.trim()), void 0);
@@ -2283,8 +2315,7 @@ function handleParsedValue(raw) {
         return;
     }
     if (isSentinelRow(parsed, task.token)) {
-        clearTimeout(task.timer);
-        taskWorker_class_private_field_get(this, _inflightTasks).shift();
+        taskWorker_class_private_method_get(this, _shiftInflight, shiftInflight).call(this);
         if (task.timedout) return void taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
         if (task.stderrText) {
             taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, task, new Error(task.stderrText.trim()), void 0);
@@ -2301,6 +2332,7 @@ function handleParsedValue(raw) {
         taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
         return;
     }
+    if (task.timedout) return;
     if ("query" === task.kind) return void collectQueryRows(task, parsed);
     if ("stream" === task.kind) processStreamRows(task, parsed);
 }
@@ -2318,14 +2350,29 @@ function scheduleFinalizeCheck() {
     });
 }
 function taskWorker_handleStderrChunk(chunk) {
-    var _class_private_field_get_;
-    var task = null != (_class_private_field_get_ = taskWorker_class_private_field_get(this, _inflightTasks)[0]) ? _class_private_field_get_ : taskWorker_class_private_field_get(this, _pendingFinalizeTasks).values().next().value;
+    var _class_private_field_get_values_next_value;
+    var task = null != (_class_private_field_get_values_next_value = taskWorker_class_private_field_get(this, _pendingFinalizeTasks).values().next().value) ? _class_private_field_get_values_next_value : taskWorker_class_private_method_get(this, _firstInflight, firstInflight).call(this);
     if (!task) {
         var _class_private_field_get_error, _$_class_private_field_get;
-        null == (_$_class_private_field_get = taskWorker_class_private_field_get(this, _logger)) || null == (_class_private_field_get_error = _$_class_private_field_get.error) || _class_private_field_get_error.call(_$_class_private_field_get, String(chunk).trim());
+        null == (_$_class_private_field_get = taskWorker_class_private_field_get(this, _logger)) || null == (_class_private_field_get_error = _$_class_private_field_get.error) || _class_private_field_get_error.call(_$_class_private_field_get, chunk.trim());
         return;
     }
-    task.stderrText += String(chunk);
+    task.stderrText += chunk;
+}
+function scheduleSweep() {
+    var _this = this;
+    if (taskWorker_class_private_field_get(this, _sweepTimer)) return;
+    taskWorker_class_private_field_set(this, _sweepTimer, setTimeout(function() {
+        taskWorker_class_private_field_set(_this, _sweepTimer, null);
+        var tasks = taskWorker_class_private_field_get(_this, _inflightTasks);
+        var head = taskWorker_class_private_field_get(_this, _inflightHead);
+        var now = performance.now();
+        for(var i = head; i < tasks.length; i++){
+            var task = tasks[i];
+            if (now - task.startTime > task.timeout) taskWorker_class_private_method_get(_this, _handleTaskTimeout, handleTaskTimeout).call(_this, task);
+        }
+        if (taskWorker_class_private_method_get(_this, _inflightCount, inflightCount).call(_this) > 0) taskWorker_class_private_method_get(_this, _scheduleSweep, scheduleSweep).call(_this);
+    }, taskWorker_class_private_field_get(this, _sweepIntervalMs)).unref());
 }
 function handleTaskTimeout(task) {
     var error = prepareTaskTimeout(task, taskWorker_class_private_field_get(this, _metrics));
@@ -2335,8 +2382,12 @@ function settleTask1(task, error, value) {
     settleTask(task, error, value, taskWorker_class_private_field_get(this, _metrics));
 }
 function taskWorker_rejectAll(error) {
-    var all = taskWorker_class_private_field_get(this, _inflightTasks);
+    clearTimeout(taskWorker_class_private_field_get(this, _sweepTimer));
+    taskWorker_class_private_field_set(this, _sweepTimer, null);
+    var activeCount = taskWorker_class_private_field_get(this, _inflightTasks).length - taskWorker_class_private_field_get(this, _inflightHead);
+    var all = activeCount > 0 ? taskWorker_class_private_field_get(this, _inflightTasks).slice(taskWorker_class_private_field_get(this, _inflightHead)) : [];
     taskWorker_class_private_field_set(this, _inflightTasks, []);
+    taskWorker_class_private_field_set(this, _inflightHead, 0);
     var queued = taskWorker_class_private_field_get(this, _pendingQueue).dequeue();
     while(queued){
         taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, queued, error, void 0);
@@ -2470,9 +2521,19 @@ var readerPool_ReaderPool = /*#__PURE__*/ function() {
         {
             key: "enqueue",
             value: function(task) {
-                var worker = readerPool_class_private_field_get(this, _workers)[readerPool_class_private_field_get(this, _rrIndex) % readerPool_class_private_field_get(this, _workers).length];
+                var minLoad = 1 / 0;
+                var candidates = [];
+                for(var i = 0; i < readerPool_class_private_field_get(this, _workers).length; i++){
+                    var load = readerPool_class_private_field_get(this, _workers)[i].pendingStatements;
+                    if (load < minLoad) {
+                        minLoad = load;
+                        candidates.length = 0;
+                        candidates.push(i);
+                    } else if (load === minLoad) candidates.push(i);
+                }
+                var idx = candidates[readerPool_class_private_field_get(this, _rrIndex) % candidates.length];
                 readerPool_class_private_field_set(this, _rrIndex, readerPool_class_private_field_get(this, _rrIndex) + 1 >>> 0);
-                worker.enqueue(task);
+                readerPool_class_private_field_get(this, _workers)[idx].enqueue(task);
             }
         },
         {
@@ -2965,9 +3026,7 @@ var transactionScope_TransactionScope = /*#__PURE__*/ function() {
                                     release = resolve;
                                 });
                                 previous = transactionScope_class_private_field_get(_this, _scopeChain);
-                                transactionScope_class_private_field_set(_this, _scopeChain, previous["catch"](function() {}).then(function() {
-                                    return gate;
-                                }));
+                                transactionScope_class_private_field_set(_this, _scopeChain, gate);
                                 return [
                                     4,
                                     previous["catch"](function() {})
@@ -3034,6 +3093,22 @@ function pipelineEngine_class_apply_descriptor_set(receiver, descriptor, value)
         descriptor.value = value;
     }
 }
+function pipelineEngine_class_apply_descriptor_update(receiver, descriptor) {
+    if (descriptor.set) {
+        if (!descriptor.get) throw new TypeError("attempted to read set only private field");
+        if (!("__destrWrapper" in descriptor)) descriptor.__destrWrapper = {
+            set value (v){
+                descriptor.set.call(receiver, v);
+            },
+            get value () {
+                return descriptor.get.call(receiver);
+            }
+        };
+        return descriptor.__destrWrapper;
+    }
+    if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
+    return descriptor;
+}
 function pipelineEngine_class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
@@ -3054,6 +3129,10 @@ function pipelineEngine_class_private_field_set(receiver, privateMap, value) {
     pipelineEngine_class_apply_descriptor_set(receiver, descriptor, value);
     return value;
 }
+function pipelineEngine_class_private_field_update(receiver, privateMap) {
+    var descriptor = pipelineEngine_class_extract_field_descriptor(receiver, privateMap, "update");
+    return pipelineEngine_class_apply_descriptor_update(receiver, descriptor);
+}
 function pipelineEngine_class_private_method_get(receiver, privateSet, fn) {
     if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
     return fn;
@@ -3093,16 +3172,20 @@ function pipelineEngine_unsupported_iterable_to_array(o, minLen) {
     if ("Map" === n || "Set" === n) return Array.from(n);
     if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return pipelineEngine_array_like_to_array(o, minLen);
 }
-var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduledFinalize = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), pipelineEngine_maxInflight = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), pipelineEngine_handleParsedValue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_handleTaskTimeout = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
+var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightHead = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduledFinalize = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), pipelineEngine_maxInflight = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), pipelineEngine_sweepTimer = /*#__PURE__*/ new WeakMap(), pipelineEngine_sweepIntervalMs = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightCount = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_firstInflight = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_shiftInflight = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), pipelineEngine_handleParsedValue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), pipelineEngine_scheduleSweep = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_handleTaskTimeout = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
 var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
     "use strict";
     function PipelineEngine(processManager, param) {
         var _this = this;
-        var metrics = param.metrics, statementTimeout = param.statementTimeout, logger = param.logger, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, onTaskTimeout = param.onTaskTimeout;
+        var metrics = param.metrics, statementTimeout = param.statementTimeout, logger = param.logger, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, onTaskTimeout = param.onTaskTimeout, _param_sweepInterval = param.sweepInterval, sweepInterval = void 0 === _param_sweepInterval ? 100 : _param_sweepInterval;
         pipelineEngine_class_call_check(this, PipelineEngine);
+        pipelineEngine_class_private_method_init(this, pipelineEngine_inflightCount);
+        pipelineEngine_class_private_method_init(this, core_pipelineEngine_firstInflight);
+        pipelineEngine_class_private_method_init(this, core_pipelineEngine_shiftInflight);
         pipelineEngine_class_private_method_init(this, core_pipelineEngine_pumpQueue);
         pipelineEngine_class_private_method_init(this, pipelineEngine_handleParsedValue);
         pipelineEngine_class_private_method_init(this, core_pipelineEngine_scheduleFinalizeCheck);
+        pipelineEngine_class_private_method_init(this, pipelineEngine_scheduleSweep);
         pipelineEngine_class_private_method_init(this, core_pipelineEngine_handleTaskTimeout);
         pipelineEngine_class_private_method_init(this, pipelineEngine_settleTask);
         pipelineEngine_class_private_field_init(this, _queue, {
@@ -3113,6 +3196,10 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             writable: true,
             value: []
         });
+        pipelineEngine_class_private_field_init(this, pipelineEngine_inflightHead, {
+            writable: true,
+            value: 0
+        });
         pipelineEngine_class_private_field_init(this, pipelineEngine_pendingFinalizeTasks, {
             writable: true,
             value: new Set()
@@ -3157,6 +3244,14 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             writable: true,
             value: false
         });
+        pipelineEngine_class_private_field_init(this, pipelineEngine_sweepTimer, {
+            writable: true,
+            value: null
+        });
+        pipelineEngine_class_private_field_init(this, pipelineEngine_sweepIntervalMs, {
+            writable: true,
+            value: void 0
+        });
         pipelineEngine_class_private_field_set(this, pipelineEngine_processManager, processManager);
         pipelineEngine_class_private_field_set(this, pipelineEngine_metrics, metrics);
         pipelineEngine_class_private_field_set(this, pipelineEngine_statementTimeout, statementTimeout);
@@ -3170,8 +3265,15 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         pipelineEngine_class_private_field_get(this, pipelineEngine_processManager).setOnDrainCallback(function() {
             return pipelineEngine_class_private_method_get(_this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(_this);
         });
+        pipelineEngine_class_private_field_set(this, pipelineEngine_sweepIntervalMs, sweepInterval);
     }
     pipelineEngine_create_class(PipelineEngine, [
+        {
+            key: "_sweepTimer",
+            get: function() {
+                return pipelineEngine_class_private_field_get(this, pipelineEngine_sweepTimer);
+            }
+        },
         {
             key: "mainQueue",
             get: function() {
@@ -3187,7 +3289,7 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         {
             key: "pendingStatements",
             get: function() {
-                return pipelineEngine_class_private_field_get(this, _queue).size + pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length + pipelineEngine_class_private_field_get(this, pipelineEngine_pendingFinalizeTasks).size;
+                return pipelineEngine_class_private_field_get(this, _queue).size + (pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length - pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead)) + pipelineEngine_class_private_field_get(this, pipelineEngine_pendingFinalizeTasks).size;
             }
         },
         {
@@ -3220,9 +3322,9 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         {
             key: "handleStdoutChunk",
             value: function(chunk) {
-                var task = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[0];
+                var task = pipelineEngine_class_private_method_get(this, core_pipelineEngine_firstInflight, pipelineEngine_firstInflight).call(this);
                 if (!task) return;
-                if ("stream" === task.kind && task.rowParser && !task.rowParser.finished) {
+                if ("stream" === task.kind && task.rowParser && !task.rowParser.finished && !task.timedout) {
                     var leftover = task.rowParser.feed(chunk);
                     if (leftover) pipelineEngine_class_private_field_get(this, _sharedValueParser).feed(leftover);
                     return;
@@ -3234,20 +3336,23 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             key: "handleStderrChunk",
             value: function(chunk) {
                 var _class_private_field_get_values_next_value;
-                var task = null != (_class_private_field_get_values_next_value = pipelineEngine_class_private_field_get(this, pipelineEngine_pendingFinalizeTasks).values().next().value) ? _class_private_field_get_values_next_value : pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[0];
+                var task = null != (_class_private_field_get_values_next_value = pipelineEngine_class_private_field_get(this, pipelineEngine_pendingFinalizeTasks).values().next().value) ? _class_private_field_get_values_next_value : pipelineEngine_class_private_method_get(this, core_pipelineEngine_firstInflight, pipelineEngine_firstInflight).call(this);
                 if (!task) {
                     var _class_private_field_get_error, _$_class_private_field_get;
-                    null == (_$_class_private_field_get = pipelineEngine_class_private_field_get(this, pipelineEngine_logger)) || null == (_class_private_field_get_error = _$_class_private_field_get.error) || _class_private_field_get_error.call(_$_class_private_field_get, String(chunk).trim());
+                    null == (_$_class_private_field_get = pipelineEngine_class_private_field_get(this, pipelineEngine_logger)) || null == (_class_private_field_get_error = _$_class_private_field_get.error) || _class_private_field_get_error.call(_$_class_private_field_get, chunk.trim());
                     return;
                 }
-                task.stderrText += String(chunk);
+                task.stderrText += chunk;
             }
         },
         {
             key: "rejectAll",
             value: function(error) {
-                var all = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks);
+                pipelineEngine_class_private_field_get(this, _sharedValueParser).reset();
+                var activeCount = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length - pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead);
+                var all = activeCount > 0 ? pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).slice(pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead)) : [];
                 pipelineEngine_class_private_field_set(this, pipelineEngine_inflightTasks, []);
+                pipelineEngine_class_private_field_set(this, pipelineEngine_inflightHead, 0);
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
                 try {
                     for(var _iterator = all[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -3292,22 +3397,42 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             key: "kill",
             value: function() {
                 pipelineEngine_class_private_field_set(this, _active, false);
+                clearTimeout(pipelineEngine_class_private_field_get(this, pipelineEngine_sweepTimer));
+                pipelineEngine_class_private_field_set(this, pipelineEngine_sweepTimer, null);
                 this.rejectAll(new Error("PipelineEngine is killed"));
             }
         }
     ]);
     return PipelineEngine;
 }();
+function core_pipelineEngine_inflightCount() {
+    return pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length - pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead);
+}
+function pipelineEngine_firstInflight() {
+    return pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead) < pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length ? pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead)] : null;
+}
+function pipelineEngine_shiftInflight() {
+    var task = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead)];
+    pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead)] = null;
+    pipelineEngine_class_private_field_update(this, pipelineEngine_inflightHead).value++;
+    if (pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead) >= pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length) {
+        pipelineEngine_class_private_field_set(this, pipelineEngine_inflightTasks, []);
+        pipelineEngine_class_private_field_set(this, pipelineEngine_inflightHead, 0);
+    } else if (pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead) > 128) {
+        pipelineEngine_class_private_field_set(this, pipelineEngine_inflightTasks, pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).slice(pipelineEngine_class_private_field_get(this, pipelineEngine_inflightHead)));
+        pipelineEngine_class_private_field_set(this, pipelineEngine_inflightHead, 0);
+    }
+    return task;
+}
 function pipelineEngine_pumpQueue() {
-    var _this = this;
     var _$_class_private_field_get;
     if (!pipelineEngine_class_private_field_get(this, _active)) return;
     if (pipelineEngine_class_private_field_get(this, pipelineEngine_processManager).draining) return;
-    if (pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length >= pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)) return;
+    if (pipelineEngine_class_private_method_get(this, pipelineEngine_inflightCount, core_pipelineEngine_inflightCount).call(this) >= pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)) return;
     var batch = [];
-    while(batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_batchSize) && !pipelineEngine_class_private_field_get(this, _queue).isEmpty() && pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length + batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)){
+    while(batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_batchSize) && !pipelineEngine_class_private_field_get(this, _queue).isEmpty() && pipelineEngine_class_private_method_get(this, pipelineEngine_inflightCount, core_pipelineEngine_inflightCount).call(this) + batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)){
         var task = pipelineEngine_class_private_field_get(this, _queue).peek();
-        if ("stream" === task.kind && (batch.length > 0 || pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length > 0)) break;
+        if ("stream" === task.kind && (batch.length > 0 || pipelineEngine_class_private_method_get(this, pipelineEngine_inflightCount, core_pipelineEngine_inflightCount).call(this) > 0)) break;
         pipelineEngine_class_private_field_get(this, _queue).dequeue();
         batch.push(task);
     }
@@ -3316,14 +3441,10 @@ function pipelineEngine_pumpQueue() {
     var payload = buildBatchPayload(batch);
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
-        var _loop = function() {
-            var task = _step.value;
-            task.startTime = now;
-            task.timer = setTimeout(function() {
-                return pipelineEngine_class_private_method_get(_this, core_pipelineEngine_handleTaskTimeout, pipelineEngine_handleTaskTimeout).call(_this, task);
-            }, task.timeout);
-        };
-        for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
+        for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var task1 = _step.value;
+            task1.startTime = now;
+        }
     } catch (err) {
         _didIteratorError = true;
         _iteratorError = err;
@@ -3335,14 +3456,14 @@ function pipelineEngine_pumpQueue() {
         }
     }
     (_$_class_private_field_get = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)).push.apply(_$_class_private_field_get, pipelineEngine_to_consumable_array(batch));
+    pipelineEngine_class_private_method_get(this, pipelineEngine_scheduleSweep, core_pipelineEngine_scheduleSweep).call(this);
     pipelineEngine_class_private_field_get(this, pipelineEngine_processManager).write(payload);
 }
 function core_pipelineEngine_handleParsedValue(raw) {
-    var task = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[0];
+    var task = pipelineEngine_class_private_method_get(this, core_pipelineEngine_firstInflight, pipelineEngine_firstInflight).call(this);
     if (!task) return;
     if (isSentinelRaw(raw, task.token)) {
-        clearTimeout(task.timer);
-        pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).shift();
+        pipelineEngine_class_private_method_get(this, core_pipelineEngine_shiftInflight, pipelineEngine_shiftInflight).call(this);
         if (task.timedout) return void pipelineEngine_class_private_method_get(this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(this);
         if (task.consumerError) {
             pipelineEngine_class_private_method_get(this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(this, task, task.consumerError, void 0);
@@ -3363,8 +3484,7 @@ function core_pipelineEngine_handleParsedValue(raw) {
         return;
     }
     if (isSentinelRow(parsed, task.token)) {
-        clearTimeout(task.timer);
-        pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).shift();
+        pipelineEngine_class_private_method_get(this, core_pipelineEngine_shiftInflight, pipelineEngine_shiftInflight).call(this);
         if (task.timedout) return void pipelineEngine_class_private_method_get(this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(this);
         if (task.consumerError) {
             pipelineEngine_class_private_method_get(this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(this, task, task.consumerError, void 0);
@@ -3393,6 +3513,21 @@ function pipelineEngine_scheduleFinalizeCheck() {
         });
     });
 }
+function core_pipelineEngine_scheduleSweep() {
+    var _this = this;
+    if (pipelineEngine_class_private_field_get(this, pipelineEngine_sweepTimer)) return;
+    pipelineEngine_class_private_field_set(this, pipelineEngine_sweepTimer, setTimeout(function() {
+        pipelineEngine_class_private_field_set(_this, pipelineEngine_sweepTimer, null);
+        var tasks = pipelineEngine_class_private_field_get(_this, pipelineEngine_inflightTasks);
+        var head = pipelineEngine_class_private_field_get(_this, pipelineEngine_inflightHead);
+        var now = performance.now();
+        for(var i = head; i < tasks.length; i++){
+            var task = tasks[i];
+            if (now - task.startTime > task.timeout) pipelineEngine_class_private_method_get(_this, core_pipelineEngine_handleTaskTimeout, pipelineEngine_handleTaskTimeout).call(_this, task);
+        }
+        if (pipelineEngine_class_private_method_get(_this, pipelineEngine_inflightCount, core_pipelineEngine_inflightCount).call(_this) > 0) pipelineEngine_class_private_method_get(_this, pipelineEngine_scheduleSweep, core_pipelineEngine_scheduleSweep).call(_this);
+    }, pipelineEngine_class_private_field_get(this, pipelineEngine_sweepIntervalMs)).unref());
+}
 function pipelineEngine_handleTaskTimeout(task) {
     var _this, _this1;
     var error = prepareTaskTimeout(task, pipelineEngine_class_private_field_get(this, pipelineEngine_metrics));
@@ -4001,20 +4136,18 @@ function executor_enqueue(kind, sql, params, options, scopeId) {
     var token = generateToken();
     var _options_onRow;
     var onRow = null != (_options_onRow = null == options ? void 0 : options.onRow) ? _options_onRow : null;
-    var normalized = normalizeSQL(sql);
+    var template = normalizeSQLTemplate(sql);
     var formatted;
-    var sqlNormalized = true;
-    formatted = 0 !== params.length || normalized.includes("?") ? interpolateSQL(normalized, params) : normalized;
-    if (scopeId) return executor_class_private_method_get(this, _enqueueWriter, enqueueWriter).call(this, kind, formatted, timeout, token, onRow, scopeId, sqlNormalized);
+    formatted = 0 === params.length && 0 === template.paramCount ? template.normalized : interpolateFromTemplate(template, params);
+    if (scopeId) return executor_class_private_method_get(this, _enqueueWriter, enqueueWriter).call(this, kind, formatted, timeout, token, onRow, scopeId);
     if (executor_class_private_field_get(this, _readerPool)) {
         if ("stream" === kind || "query" === kind) return executor_class_private_method_get(this, _enqueueReader, enqueueReader).call(this, kind, formatted, timeout, token, onRow);
-        if ("execute" === kind && "read" === classifySQL(normalized)) return executor_class_private_method_get(this, _enqueueReader, enqueueReader).call(this, kind, formatted, timeout, token, onRow);
+        if ("execute" === kind && "read" === classifySQL(template.normalized)) return executor_class_private_method_get(this, _enqueueReader, enqueueReader).call(this, kind, formatted, timeout, token, onRow);
     }
-    return executor_class_private_method_get(this, _enqueueWriter, enqueueWriter).call(this, kind, formatted, timeout, token, onRow, null, sqlNormalized);
+    return executor_class_private_method_get(this, _enqueueWriter, enqueueWriter).call(this, kind, formatted, timeout, token, onRow, null);
 }
 function enqueueWriter(kind, sql, timeout, token, onRow, scopeId) {
     var _this = this;
-    var sqlNormalized = arguments.length > 6 && void 0 !== arguments[6] ? arguments[6] : false;
     executor_class_private_field_get(this, executor_metrics).incrementTasksTotal(kind);
     return new Promise(function(resolve, reject) {
         var task = {
@@ -4024,17 +4157,15 @@ function enqueueWriter(kind, sql, timeout, token, onRow, scopeId) {
             token: token,
             onRow: onRow,
             scopeId: scopeId,
-            sqlNormalized: sqlNormalized,
             resolve: resolve,
             reject: reject,
             consumerError: null,
             stderrText: "",
             settled: false,
-            timer: null,
             startTime: 0,
-            rowParser: null
+            rowParser: null,
+            rows: "query" === kind ? [] : null
         };
-        if ("query" === kind) task.rows = [];
         if ("stream" === kind) task.rowParser = setupStreamParser(task, executor_class_private_field_get(_this, _pipeline));
         if (executor_class_private_field_get(_this, _txScope).isDeferred(scopeId)) executor_class_private_field_get(_this, _txScope).defer(task);
         else executor_class_private_field_get(_this, _pipeline).enqueue(task);