cdk-rds-sql 6.1.2 → 6.1.4

package/lib/handler/handler.js

@@ -5,9 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -12226,28 +12223,28 @@ var require_execute = __commonJS({
           }
           i++;
         }
-        const types = [];
+        const types2 = [];
         for (let i2 = packet.offset + 1; i2 < packet.end - 1; i2++) {
           if ((packet.buffer[i2] === Types.VAR_STRING || packet.buffer[i2] === Types.NULL || packet.buffer[i2] === Types.DOUBLE || packet.buffer[i2] === Types.TINY || packet.buffer[i2] === Types.DATETIME || packet.buffer[i2] === Types.JSON) && packet.buffer[i2 + 1] === 0) {
-            types.push(packet.buffer[i2]);
+            types2.push(packet.buffer[i2]);
             packet.skip(2);
           }
         }
         packet.skip(1);
         const values = [];
-        for (let i2 = 0; i2 < types.length; i2++) {
-          if (types[i2] === Types.VAR_STRING) {
+        for (let i2 = 0; i2 < types2.length; i2++) {
+          if (types2[i2] === Types.VAR_STRING) {
             values.push(packet.readLengthCodedString(encoding));
-          } else if (types[i2] === Types.DOUBLE) {
+          } else if (types2[i2] === Types.DOUBLE) {
             values.push(packet.readDouble());
-          } else if (types[i2] === Types.TINY) {
+          } else if (types2[i2] === Types.TINY) {
             values.push(packet.readInt8());
-          } else if (types[i2] === Types.DATETIME) {
+          } else if (types2[i2] === Types.DATETIME) {
             values.push(packet.readDateTime());
-          } else if (types[i2] === Types.JSON) {
+          } else if (types2[i2] === Types.JSON) {
             values.push(JSON.parse(packet.readLengthCodedString(encoding)));
           }
-          if (types[i2] === Types.NULL) {
+          if (types2[i2] === Types.NULL) {
             values.push(null);
           }
         }
@@ -12607,7 +12604,7 @@ var require_query = __commonJS({
     var CommandCode = require_commands();
     var StringParser = require_string();
     var CharsetToEncoding = require_charset_encodings();
-    var Query = class {
+    var Query2 = class {
       constructor(sql, charsetNumber) {
         this.query = sql;
         this.charsetNumber = charsetNumber;
@@ -12624,7 +12621,7 @@ var require_query = __commonJS({
         return packet;
       }
     };
-    module2.exports = Query;
+    module2.exports = Query2;
   }
 });
 
@@ -12735,7 +12732,8 @@ var require_encoding_charset = __commonJS({
       geostd8: 92,
       cp932: 95,
       eucjpms: 97,
-      gb18030: 248
+      gb18030: 248,
+      utf8mb3: 192
     };
   }
 });
@@ -12814,7 +12812,9 @@ var require_resultset_header = __commonJS({
                 stateChanges.systemVariables[key] = val;
                 if (key === "character_set_client") {
                   const charsetNumber = EncodingToCharset[val];
-                  connection.config.charsetNumber = charsetNumber;
+                  if (typeof charsetNumber !== "undefined") {
+                    connection.config.charsetNumber = charsetNumber;
+                  }
                 }
               } else if (type === sessionInfoTypes.SCHEMA) {
                 key = packet.readLengthCodedString(encoding);
@@ -12956,7 +12956,7 @@ var require_packets = __commonJS({
     var HandshakeResponse = require_handshake_response();
     var PrepareStatement = require_prepare_statement();
     var PreparedStatementHeader = require_prepared_statement_header();
-    var Query = require_query();
+    var Query2 = require_query();
     var RegisterSlave = require_register_slave();
     var ResultSetHeader = require_resultset_header();
     var SSLRequest = require_ssl_request();
@@ -12976,7 +12976,7 @@ var require_packets = __commonJS({
       HandshakeResponse,
       PrepareStatement,
       PreparedStatementHeader,
-      Query,
+      Query: Query2,
       RegisterSlave,
       ResultSetHeader,
       SSLRequest,
@@ -14847,7 +14847,7 @@ var require_query2 = __commonJS({
     var staticParser = require_static_text_parser();
     var ServerStatus = require_server_status();
     var EmptyPacket = new Packets.Packet(0, Buffer.allocUnsafe(4), 0, 4);
-    var Query = class _Query extends Command {
+    var Query2 = class _Query extends Command {
       constructor(options, callback) {
         super();
         this.sql = options.sql;
@@ -15126,8 +15126,8 @@ var require_query2 = __commonJS({
         }
       }
     };
-    Query.prototype.catch = Query.prototype.then;
-    module2.exports = Query;
+    Query2.prototype.catch = Query2.prototype.then;
+    module2.exports = Query2;
   }
 });
 
@@ -15515,7 +15515,7 @@ var require_execute2 = __commonJS({
   "node_modules/mysql2/lib/commands/execute.js"(exports2, module2) {
     "use strict";
     var Command = require_command();
-    var Query = require_query2();
+    var Query2 = require_query2();
     var Packets = require_packets();
     var getBinaryParser = require_binary_parser();
     var getStaticBinaryParser = require_static_binary_parser();
@@ -15592,15 +15592,15 @@ var require_execute2 = __commonJS({
         return _Execute.prototype.row;
       }
     };
-    Execute.prototype.done = Query.prototype.done;
-    Execute.prototype.doneInsert = Query.prototype.doneInsert;
-    Execute.prototype.resultsetHeader = Query.prototype.resultsetHeader;
-    Execute.prototype._findOrCreateReadStream = Query.prototype._findOrCreateReadStream;
-    Execute.prototype._streamLocalInfile = Query.prototype._streamLocalInfile;
-    Execute.prototype._setTimeout = Query.prototype._setTimeout;
-    Execute.prototype._handleTimeoutError = Query.prototype._handleTimeoutError;
-    Execute.prototype.row = Query.prototype.row;
-    Execute.prototype.stream = Query.prototype.stream;
+    Execute.prototype.done = Query2.prototype.done;
+    Execute.prototype.doneInsert = Query2.prototype.doneInsert;
+    Execute.prototype.resultsetHeader = Query2.prototype.resultsetHeader;
+    Execute.prototype._findOrCreateReadStream = Query2.prototype._findOrCreateReadStream;
+    Execute.prototype._streamLocalInfile = Query2.prototype._streamLocalInfile;
+    Execute.prototype._setTimeout = Query2.prototype._setTimeout;
+    Execute.prototype._handleTimeoutError = Query2.prototype._handleTimeoutError;
+    Execute.prototype.row = Query2.prototype.row;
+    Execute.prototype.stream = Query2.prototype.stream;
     module2.exports = Execute;
   }
 });
@@ -15648,8 +15648,8 @@ var require_prepare = __commonJS({
         this.options = options;
       }
       start(packet, connection) {
-        const Connection = connection.constructor;
-        this.key = Connection.statementKey(this.options);
+        const Connection2 = connection.constructor;
+        this.key = Connection2.statementKey(this.options);
         const statement = connection._statements.get(this.key);
         if (statement) {
           if (this.onResult) {
@@ -16099,7 +16099,7 @@ var require_commands2 = __commonJS({
     "use strict";
     var ClientHandshake = require_client_handshake();
     var ServerHandshake = require_server_handshake();
-    var Query = require_query2();
+    var Query2 = require_query2();
     var Prepare = require_prepare();
     var CloseStatement = require_close_statement2();
     var Execute = require_execute2();
@@ -16111,7 +16111,7 @@ var require_commands2 = __commonJS({
     module2.exports = {
       ClientHandshake,
       ServerHandshake,
-      Query,
+      Query: Query2,
       Prepare,
       CloseStatement,
       Execute,
@@ -16129,7 +16129,7 @@ var require_package = __commonJS({
   "node_modules/mysql2/package.json"(exports2, module2) {
     module2.exports = {
       name: "mysql2",
-      version: "3.14.0",
+      version: "3.14.1",
       description: "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
       main: "index.js",
       typings: "typings/mysql/index",
@@ -19271,13 +19271,13 @@ var require_pool3 = __commonJS({
   "node_modules/mysql2/lib/pool.js"(exports2, module2) {
     "use strict";
     var BasePool = require_pool();
-    var Pool = class extends BasePool {
+    var Pool2 = class extends BasePool {
       promise(promiseImpl) {
         const PromisePool = require_pool2();
         return new PromisePool(this, promiseImpl);
       }
     };
-    module2.exports = Pool;
+    module2.exports = Pool2;
   }
 });
 
@@ -19308,13 +19308,13 @@ var require_connection3 = __commonJS({
   "node_modules/mysql2/lib/connection.js"(exports2, module2) {
     "use strict";
     var BaseConnection = require_connection();
-    var Connection = class extends BaseConnection {
+    var Connection2 = class extends BaseConnection {
       promise(promiseImpl) {
         const PromiseConnection = require_connection2();
         return new PromiseConnection(this, promiseImpl);
       }
     };
-    module2.exports = Connection;
+    module2.exports = Connection2;
   }
 });
 
@@ -19323,9 +19323,9 @@ var require_pool_cluster = __commonJS({
   "node_modules/mysql2/lib/pool_cluster.js"(exports2, module2) {
     "use strict";
     var process2 = require("process");
-    var Pool = require_pool3();
+    var Pool2 = require_pool3();
     var PoolConfig = require_pool_config();
-    var Connection = require_connection3();
+    var Connection2 = require_connection3();
     var EventEmitter = require("events").EventEmitter;
     var makeSelector = {
       RR() {
@@ -19392,7 +19392,7 @@ var require_pool_cluster = __commonJS({
        * @returns query
        */
       query(sql, values, cb) {
-        const query = Connection.createQuery(sql, values, cb, {});
+        const query = Connection2.createQuery(sql, values, cb, {});
         this.getConnection((err, conn) => {
           if (err) {
             if (typeof query.onResult === "function") {
@@ -19484,7 +19484,7 @@ var require_pool_cluster = __commonJS({
           this._nodes[id] = {
             id,
             errorCount: 0,
-            pool: new Pool({ config: new PoolConfig(config) }),
+            pool: new Pool2({ config: new PoolConfig(config) }),
             _offlineUntil: 0
           };
           this._serviceableNodeIds.push(id);
@@ -19627,10 +19627,10 @@ var require_pool_cluster = __commonJS({
 var require_create_connection = __commonJS({
   "node_modules/mysql2/lib/create_connection.js"(exports2, module2) {
     "use strict";
-    var Connection = require_connection3();
+    var Connection2 = require_connection3();
     var ConnectionConfig = require_connection_config();
     function createConnection(opts) {
-      return new Connection({ config: new ConnectionConfig(opts) });
+      return new Connection2({ config: new ConnectionConfig(opts) });
     }
     module2.exports = createConnection;
   }
@@ -19640,10 +19640,10 @@ var require_create_connection = __commonJS({
 var require_create_pool = __commonJS({
   "node_modules/mysql2/lib/create_pool.js"(exports2, module2) {
     "use strict";
-    var Pool = require_pool3();
+    var Pool2 = require_pool3();
     var PoolConfig = require_pool_config();
     function createPool(config) {
-      return new Pool({ config: new PoolConfig(config) });
+      return new Pool2({ config: new PoolConfig(config) });
     }
     module2.exports = createPool;
   }
@@ -20281,9 +20281,9 @@ var require_lib4 = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/postgres-array/index.js
+// node_modules/postgres-array/index.js
 var require_postgres_array = __commonJS({
-  "node_modules/pg/node_modules/postgres-array/index.js"(exports2) {
+  "node_modules/postgres-array/index.js"(exports2) {
     "use strict";
     exports2.parse = function(source, transform) {
       return new ArrayParser(source, transform).parse();
@@ -20375,9 +20375,9 @@ var require_postgres_array = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/pg-types/lib/arrayParser.js
+// node_modules/pg-types/lib/arrayParser.js
 var require_arrayParser = __commonJS({
-  "node_modules/pg/node_modules/pg-types/lib/arrayParser.js"(exports2, module2) {
+  "node_modules/pg-types/lib/arrayParser.js"(exports2, module2) {
     var array = require_postgres_array();
     module2.exports = {
       create: function(source, transform) {
@@ -20391,9 +20391,9 @@ var require_arrayParser = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/postgres-date/index.js
+// node_modules/postgres-date/index.js
 var require_postgres_date = __commonJS({
-  "node_modules/pg/node_modules/postgres-date/index.js"(exports2, module2) {
+  "node_modules/postgres-date/index.js"(exports2, module2) {
     "use strict";
     var DATE_TIME = /(\d{1,})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})(\.\d{1,})?.*?( BC)?$/;
     var DATE = /^(\d{1,})-(\d{2})-(\d{2})( BC)?$/;
@@ -20497,9 +20497,9 @@ var require_mutable = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/postgres-interval/index.js
+// node_modules/postgres-interval/index.js
 var require_postgres_interval = __commonJS({
-  "node_modules/pg/node_modules/postgres-interval/index.js"(exports2, module2) {
+  "node_modules/postgres-interval/index.js"(exports2, module2) {
     "use strict";
     var extend = require_mutable();
     module2.exports = PostgresInterval;
@@ -20588,9 +20588,9 @@ var require_postgres_interval = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/postgres-bytea/index.js
+// node_modules/postgres-bytea/index.js
 var require_postgres_bytea = __commonJS({
-  "node_modules/pg/node_modules/postgres-bytea/index.js"(exports2, module2) {
+  "node_modules/postgres-bytea/index.js"(exports2, module2) {
     "use strict";
     module2.exports = function parseBytea(input) {
       if (/^\\x/.test(input)) {
@@ -20623,9 +20623,9 @@ var require_postgres_bytea = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/pg-types/lib/textParsers.js
+// node_modules/pg-types/lib/textParsers.js
 var require_textParsers = __commonJS({
-  "node_modules/pg/node_modules/pg-types/lib/textParsers.js"(exports2, module2) {
+  "node_modules/pg-types/lib/textParsers.js"(exports2, module2) {
     var array = require_postgres_array();
     var arrayParser = require_arrayParser();
     var parseDate = require_postgres_date();
@@ -20903,9 +20903,9 @@ var require_pg_int8 = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/pg-types/lib/binaryParsers.js
+// node_modules/pg-types/lib/binaryParsers.js
 var require_binaryParsers = __commonJS({
-  "node_modules/pg/node_modules/pg-types/lib/binaryParsers.js"(exports2, module2) {
+  "node_modules/pg-types/lib/binaryParsers.js"(exports2, module2) {
     var parseInt64 = require_pg_int8();
     var parseBits = function(data, bits, offset, invert, callback) {
       offset = offset || 0;
@@ -21103,9 +21103,9 @@ var require_binaryParsers = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/pg-types/lib/builtins.js
+// node_modules/pg-types/lib/builtins.js
 var require_builtins = __commonJS({
-  "node_modules/pg/node_modules/pg-types/lib/builtins.js"(exports2, module2) {
+  "node_modules/pg-types/lib/builtins.js"(exports2, module2) {
     module2.exports = {
       BOOL: 16,
       BYTEA: 17,
@@ -21171,9 +21171,9 @@ var require_builtins = __commonJS({
   }
 });
 
-// node_modules/pg/node_modules/pg-types/index.js
+// node_modules/pg-types/index.js
 var require_pg_types = __commonJS({
-  "node_modules/pg/node_modules/pg-types/index.js"(exports2) {
+  "node_modules/pg-types/index.js"(exports2) {
     var textParsers = require_textParsers();
     var binaryParsers = require_binaryParsers();
     var arrayParser = require_arrayParser();
@@ -21278,14 +21278,16 @@ var require_defaults2 = __commonJS({
 var require_utils = __commonJS({
   "node_modules/pg/lib/utils.js"(exports2, module2) {
     "use strict";
-    var defaults = require_defaults2();
+    var defaults2 = require_defaults2();
+    var util = require("util");
+    var { isDate } = util.types || util;
     function escapeElement(elementRepresentation) {
-      var escaped = elementRepresentation.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+      const escaped = elementRepresentation.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
       return '"' + escaped + '"';
     }
     function arrayString(val) {
-      var result = "{";
-      for (var i = 0; i < val.length; i++) {
+      let result = "{";
+      for (let i = 0; i < val.length; i++) {
         if (i > 0) {
           result = result + ",";
         }
@@ -21294,9 +21296,9 @@ var require_utils = __commonJS({
         } else if (Array.isArray(val[i])) {
           result = result + arrayString(val[i]);
         } else if (ArrayBuffer.isView(val[i])) {
-          var item = val[i];
+          let item = val[i];
           if (!(item instanceof Buffer)) {
-            var buf = Buffer.from(item.buffer, item.byteOffset, item.byteLength);
+            const buf = Buffer.from(item.buffer, item.byteOffset, item.byteLength);
             if (buf.length === item.byteLength) {
               item = buf;
             } else {
@@ -21320,14 +21322,14 @@ var require_utils = __commonJS({
           return val;
         }
         if (ArrayBuffer.isView(val)) {
-          var buf = Buffer.from(val.buffer, val.byteOffset, val.byteLength);
+          const buf = Buffer.from(val.buffer, val.byteOffset, val.byteLength);
           if (buf.length === val.byteLength) {
             return buf;
           }
           return buf.slice(val.byteOffset, val.byteOffset + val.byteLength);
         }
-        if (val instanceof Date) {
-          if (defaults.parseInputDatesAsUTC) {
+        if (isDate(val)) {
+          if (defaults2.parseInputDatesAsUTC) {
             return dateToStringUTC(val);
           } else {
             return dateToString(val);
@@ -21352,11 +21354,11 @@ var require_utils = __commonJS({
       return JSON.stringify(val);
     }
     function dateToString(date) {
-      var offset = -date.getTimezoneOffset();
-      var year = date.getFullYear();
-      var isBCYear = year < 1;
+      let offset = -date.getTimezoneOffset();
+      let year = date.getFullYear();
+      const isBCYear = year < 1;
       if (isBCYear) year = Math.abs(year) + 1;
-      var ret = String(year).padStart(4, "0") + "-" + String(date.getMonth() + 1).padStart(2, "0") + "-" + String(date.getDate()).padStart(2, "0") + "T" + String(date.getHours()).padStart(2, "0") + ":" + String(date.getMinutes()).padStart(2, "0") + ":" + String(date.getSeconds()).padStart(2, "0") + "." + String(date.getMilliseconds()).padStart(3, "0");
+      let ret = String(year).padStart(4, "0") + "-" + String(date.getMonth() + 1).padStart(2, "0") + "-" + String(date.getDate()).padStart(2, "0") + "T" + String(date.getHours()).padStart(2, "0") + ":" + String(date.getMinutes()).padStart(2, "0") + ":" + String(date.getSeconds()).padStart(2, "0") + "." + String(date.getMilliseconds()).padStart(3, "0");
       if (offset < 0) {
         ret += "-";
         offset *= -1;
@@ -21368,10 +21370,10 @@ var require_utils = __commonJS({
       return ret;
     }
     function dateToStringUTC(date) {
-      var year = date.getUTCFullYear();
-      var isBCYear = year < 1;
+      let year = date.getUTCFullYear();
+      const isBCYear = year < 1;
       if (isBCYear) year = Math.abs(year) + 1;
-      var ret = String(year).padStart(4, "0") + "-" + String(date.getUTCMonth() + 1).padStart(2, "0") + "-" + String(date.getUTCDate()).padStart(2, "0") + "T" + String(date.getUTCHours()).padStart(2, "0") + ":" + String(date.getUTCMinutes()).padStart(2, "0") + ":" + String(date.getUTCSeconds()).padStart(2, "0") + "." + String(date.getUTCMilliseconds()).padStart(3, "0");
+      let ret = String(year).padStart(4, "0") + "-" + String(date.getUTCMonth() + 1).padStart(2, "0") + "-" + String(date.getUTCDate()).padStart(2, "0") + "T" + String(date.getUTCHours()).padStart(2, "0") + ":" + String(date.getUTCMinutes()).padStart(2, "0") + ":" + String(date.getUTCSeconds()).padStart(2, "0") + "." + String(date.getUTCMilliseconds()).padStart(3, "0");
       ret += "+00:00";
       if (isBCYear) ret += " BC";
       return ret;
@@ -21390,14 +21392,20 @@ var require_utils = __commonJS({
       }
       return config;
     }
-    var escapeIdentifier = function(str) {
+    var escapeIdentifier2 = function(str) {
       return '"' + str.replace(/"/g, '""') + '"';
     };
-    var escapeLiteral = function(str) {
-      var hasBackslash = false;
-      var escaped = "'";
-      for (var i = 0; i < str.length; i++) {
-        var c = str[i];
+    var escapeLiteral2 = function(str) {
+      let hasBackslash = false;
+      let escaped = "'";
+      if (str == null) {
+        return "''";
+      }
+      if (typeof str !== "string") {
+        return "''";
+      }
+      for (let i = 0; i < str.length; i++) {
+        const c = str[i];
         if (c === "'") {
           escaped += c + c;
         } else if (c === "\\") {
@@ -21418,8 +21426,8 @@ var require_utils = __commonJS({
         return prepareValue(value);
       },
       normalizeQueryConfig,
-      escapeIdentifier,
-      escapeLiteral
+      escapeIdentifier: escapeIdentifier2,
+      escapeLiteral: escapeLiteral2
     };
   }
 });
@@ -21433,8 +21441,8 @@ var require_utils_legacy = __commonJS({
       return nodeCrypto.createHash("md5").update(string, "utf-8").digest("hex");
     }
     function postgresMd5PasswordHash(user, password, salt) {
-      var inner = md5(password + user);
-      var outer = md5(Buffer.concat([Buffer.from(inner), salt]));
+      const inner = md5(password + user);
+      const outer = md5(Buffer.concat([Buffer.from(inner), salt]));
       return "md5" + outer;
     }
     function sha256(text) {
@@ -21491,8 +21499,8 @@ var require_utils_webcrypto = __commonJS({
       }
     }
     async function postgresMd5PasswordHash(user, password, salt) {
-      var inner = await md5(password + user);
-      var outer = await md5(Buffer.concat([Buffer.from(inner), salt]));
+      const inner = await md5(password + user);
+      const outer = await md5(Buffer.concat([Buffer.from(inner), salt]));
       return "md5" + outer;
     }
     async function sha256(text) {
@@ -21530,13 +21538,13 @@ var require_utils2 = __commonJS({
 var require_cert_signatures = __commonJS({
   "node_modules/pg/lib/crypto/cert-signatures.js"(exports2, module2) {
     function x509Error(msg, cert) {
-      throw new Error("SASL channel binding: " + msg + " when parsing public certificate " + cert.toString("base64"));
+      return new Error("SASL channel binding: " + msg + " when parsing public certificate " + cert.toString("base64"));
     }
     function readASN1Length(data, index) {
       let length = data[index++];
       if (length < 128) return { length, index };
       const lengthBytes = length & 127;
-      if (lengthBytes > 4) x509Error("bad length", data);
+      if (lengthBytes > 4) throw x509Error("bad length", data);
       length = 0;
       for (let i = 0; i < lengthBytes; i++) {
         length = length << 8 | data[index++];
@@ -21544,10 +21552,10 @@ var require_cert_signatures = __commonJS({
       return { length, index };
     }
     function readASN1OID(data, index) {
-      if (data[index++] !== 6) x509Error("non-OID data", data);
+      if (data[index++] !== 6) throw x509Error("non-OID data", data);
       const { length: OIDLength, index: indexAfterOIDLength } = readASN1Length(data, index);
       index = indexAfterOIDLength;
-      lastIndex = index + OIDLength;
+      const lastIndex = index + OIDLength;
       const byte1 = data[index++];
       let oid = (byte1 / 40 >> 0) + "." + byte1 % 40;
       while (index < lastIndex) {
@@ -21562,7 +21570,7 @@ var require_cert_signatures = __commonJS({
       return { oid, index };
     }
     function expectASN1Seq(data, index) {
-      if (data[index++] !== 48) x509Error("non-sequence data", data);
+      if (data[index++] !== 48) throw x509Error("non-sequence data", data);
       return readASN1Length(data, index);
     }
     function signatureAlgorithmHashFromCertificate(data, index) {
@@ -21602,10 +21610,10 @@ var require_cert_signatures = __commonJS({
         case "1.2.840.10045.4.3.4":
           return "SHA-512";
         // RSASSA-PSS: hash is indicated separately
-        case "1.2.840.113549.1.1.10":
+        case "1.2.840.113549.1.1.10": {
           index = indexAfterOID;
           index = expectASN1Seq(data, index).index;
-          if (data[index++] !== 160) x509Error("non-tag data", data);
+          if (data[index++] !== 160) throw x509Error("non-tag data", data);
           index = readASN1Length(data, index).index;
           index = expectASN1Seq(data, index).index;
           const { oid: hashOID } = readASN1OID(data, index);
@@ -21622,7 +21630,8 @@ var require_cert_signatures = __commonJS({
             case "2.16.840.1.101.3.4.2.3":
               return "SHA-512";
           }
-          x509Error("unknown hash OID " + hashOID, data);
+          throw x509Error("unknown hash OID " + hashOID, data);
+        }
         // Ed25519 -- see https: return//github.com/openssl/openssl/issues/15477
         case "1.3.101.110":
         case "1.3.101.112":
@@ -21630,9 +21639,9 @@ var require_cert_signatures = __commonJS({
         // Ed448 -- still not in pg 17.2 (if supported, digest would be SHAKE256 x 64 bytes)
         case "1.3.101.111":
         case "1.3.101.113":
-          x509Error("Ed448 certificate channel binding is not currently supported by Postgres");
+          throw x509Error("Ed448 certificate channel binding is not currently supported by Postgres");
       }
-      x509Error("unknown OID " + oid, data);
+      throw x509Error("unknown OID " + oid, data);
     }
     module2.exports = { signatureAlgorithmHashFromCertificate };
   }
@@ -21682,8 +21691,8 @@ var require_sasl = __commonJS({
       } else if (sv.nonce.length === session.clientNonce.length) {
         throw new Error("SASL: SCRAM-SERVER-FIRST-MESSAGE: server nonce is too short");
       }
-      var clientFirstMessageBare = "n=*,r=" + session.clientNonce;
-      var serverFirstMessage = "r=" + sv.nonce + ",s=" + sv.salt + ",i=" + sv.iteration;
+      const clientFirstMessageBare = "n=*,r=" + session.clientNonce;
+      const serverFirstMessage = "r=" + sv.nonce + ",s=" + sv.salt + ",i=" + sv.iteration;
       let channelBinding = stream ? "eSws" : "biws";
       if (session.mechanism === "SCRAM-SHA-256-PLUS") {
         const peerCert = stream.getPeerCertificate().raw;
@@ -21693,16 +21702,16 @@ var require_sasl = __commonJS({
         const bindingData = Buffer.concat([Buffer.from("p=tls-server-end-point,,"), Buffer.from(certHash)]);
         channelBinding = bindingData.toString("base64");
       }
-      var clientFinalMessageWithoutProof = "c=" + channelBinding + ",r=" + sv.nonce;
-      var authMessage = clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
-      var saltBytes = Buffer.from(sv.salt, "base64");
-      var saltedPassword = await crypto.deriveKey(password, saltBytes, sv.iteration);
-      var clientKey = await crypto.hmacSha256(saltedPassword, "Client Key");
-      var storedKey = await crypto.sha256(clientKey);
-      var clientSignature = await crypto.hmacSha256(storedKey, authMessage);
-      var clientProof = xorBuffers(Buffer.from(clientKey), Buffer.from(clientSignature)).toString("base64");
-      var serverKey = await crypto.hmacSha256(saltedPassword, "Server Key");
-      var serverSignatureBytes = await crypto.hmacSha256(serverKey, authMessage);
+      const clientFinalMessageWithoutProof = "c=" + channelBinding + ",r=" + sv.nonce;
+      const authMessage = clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
+      const saltBytes = Buffer.from(sv.salt, "base64");
+      const saltedPassword = await crypto.deriveKey(password, saltBytes, sv.iteration);
+      const clientKey = await crypto.hmacSha256(saltedPassword, "Client Key");
+      const storedKey = await crypto.sha256(clientKey);
+      const clientSignature = await crypto.hmacSha256(storedKey, authMessage);
+      const clientProof = xorBuffers(Buffer.from(clientKey), Buffer.from(clientSignature)).toString("base64");
+      const serverKey = await crypto.hmacSha256(saltedPassword, "Server Key");
+      const serverSignatureBytes = await crypto.hmacSha256(serverKey, authMessage);
       session.message = "SASLResponse";
       session.serverSignature = Buffer.from(serverSignatureBytes).toString("base64");
       session.response = clientFinalMessageWithoutProof + ",p=" + clientProof;
@@ -21809,13 +21818,13 @@ var require_sasl = __commonJS({
 var require_type_overrides = __commonJS({
   "node_modules/pg/lib/type-overrides.js"(exports2, module2) {
     "use strict";
-    var types = require_pg_types();
-    function TypeOverrides(userTypes) {
-      this._types = userTypes || types;
+    var types2 = require_pg_types();
+    function TypeOverrides2(userTypes) {
+      this._types = userTypes || types2;
       this.text = {};
       this.binary = {};
     }
-    TypeOverrides.prototype.getOverrides = function(format) {
+    TypeOverrides2.prototype.getOverrides = function(format) {
       switch (format) {
         case "text":
           return this.text;
@@ -21825,18 +21834,18 @@ var require_type_overrides = __commonJS({
           return {};
       }
     };
-    TypeOverrides.prototype.setTypeParser = function(oid, format, parseFn) {
+    TypeOverrides2.prototype.setTypeParser = function(oid, format, parseFn) {
       if (typeof format === "function") {
         parseFn = format;
         format = "text";
       }
       this.getOverrides(format)[oid] = parseFn;
     };
-    TypeOverrides.prototype.getTypeParser = function(oid, format) {
+    TypeOverrides2.prototype.getTypeParser = function(oid, format) {
       format = format || "text";
       return this.getOverrides(format)[oid] || this._types.getTypeParser(oid, format);
     };
-    module2.exports = TypeOverrides;
+    module2.exports = TypeOverrides2;
   }
 });
 
@@ -21844,7 +21853,7 @@ var require_type_overrides = __commonJS({
 var require_pg_connection_string = __commonJS({
   "node_modules/pg-connection-string/index.js"(exports2, module2) {
     "use strict";
-    function parse(str) {
+    function parse(str, options = {}) {
       if (str.charAt(0) === "/") {
         const config2 = str.split(" ");
         return { host: config2[0], database: config2[1] };
@@ -21853,13 +21862,17 @@ var require_pg_connection_string = __commonJS({
       let result;
       let dummyHost = false;
       if (/ |%[^a-f0-9]|%[a-f0-9][^a-f0-9]/i.test(str)) {
-        str = encodeURI(str).replace(/\%25(\d\d)/g, "%$1");
+        str = encodeURI(str).replace(/%25(\d\d)/g, "%$1");
       }
       try {
-        result = new URL(str, "postgres://base");
-      } catch (e) {
-        result = new URL(str.replace("@/", "@___DUMMY___/"), "postgres://base");
-        dummyHost = true;
+        try {
+          result = new URL(str, "postgres://base");
+        } catch (e) {
+          result = new URL(str.replace("@/", "@___DUMMY___/"), "postgres://base");
+          dummyHost = true;
+        }
+      } catch (err) {
+        err.input && (err.input = "*****REDACTED*****");
       }
       for (const entry of result.searchParams.entries()) {
         config[entry[0]] = entry[1];
@@ -21902,26 +21915,105 @@ var require_pg_connection_string = __commonJS({
       if (config.sslrootcert) {
         config.ssl.ca = fs3.readFileSync(config.sslrootcert).toString();
       }
-      switch (config.sslmode) {
-        case "disable": {
-          config.ssl = false;
-          break;
-        }
-        case "prefer":
-        case "require":
-        case "verify-ca":
-        case "verify-full": {
-          break;
+      if (options.useLibpqCompat && config.uselibpqcompat) {
+        throw new Error("Both useLibpqCompat and uselibpqcompat are set. Please use only one of them.");
+      }
+      if (config.uselibpqcompat === "true" || options.useLibpqCompat) {
+        switch (config.sslmode) {
+          case "disable": {
+            config.ssl = false;
+            break;
+          }
+          case "prefer": {
+            config.ssl.rejectUnauthorized = false;
+            break;
+          }
+          case "require": {
+            if (config.sslrootcert) {
+              config.ssl.checkServerIdentity = function() {
+              };
+            } else {
+              config.ssl.rejectUnauthorized = false;
+            }
+            break;
+          }
+          case "verify-ca": {
+            if (!config.ssl.ca) {
+              throw new Error(
+                "SECURITY WARNING: Using sslmode=verify-ca requires specifying a CA with sslrootcert. If a public CA is used, verify-ca allows connections to a server that somebody else may have registered with the CA, making you vulnerable to Man-in-the-Middle attacks. Either specify a custom CA certificate with sslrootcert parameter or use sslmode=verify-full for proper security."
+              );
+            }
+            config.ssl.checkServerIdentity = function() {
+            };
+            break;
+          }
+          case "verify-full": {
+            break;
+          }
         }
-        case "no-verify": {
-          config.ssl.rejectUnauthorized = false;
-          break;
+      } else {
+        switch (config.sslmode) {
+          case "disable": {
+            config.ssl = false;
+            break;
+          }
+          case "prefer":
+          case "require":
+          case "verify-ca":
+          case "verify-full": {
+            break;
+          }
+          case "no-verify": {
+            config.ssl.rejectUnauthorized = false;
+            break;
+          }
         }
       }
       return config;
     }
+    function toConnectionOptions(sslConfig) {
+      const connectionOptions = Object.entries(sslConfig).reduce((c, [key, value]) => {
+        if (value !== void 0 && value !== null) {
+          c[key] = value;
+        }
+        return c;
+      }, {});
+      return connectionOptions;
+    }
+    function toClientConfig(config) {
+      const poolConfig = Object.entries(config).reduce((c, [key, value]) => {
+        if (key === "ssl") {
+          const sslConfig = value;
+          if (typeof sslConfig === "boolean") {
+            c[key] = sslConfig;
+          }
+          if (typeof sslConfig === "object") {
+            c[key] = toConnectionOptions(sslConfig);
+          }
+        } else if (value !== void 0 && value !== null) {
+          if (key === "port") {
+            if (value !== "") {
+              const v = parseInt(value, 10);
+              if (isNaN(v)) {
+                throw new Error(`Invalid ${key}: ${value}`);
+              }
+              c[key] = v;
+            }
+          } else {
+            c[key] = value;
+          }
+        }
+        return c;
+      }, {});
+      return poolConfig;
+    }
+    function parseIntoClientConfig(str) {
+      return toClientConfig(parse(str));
+    }
     module2.exports = parse;
     parse.parse = parse;
+    parse.toClientConfig = toClientConfig;
+    parse.parseIntoClientConfig = parseIntoClientConfig;
   }
 });
 
@@ -21930,7 +22022,7 @@ var require_connection_parameters = __commonJS({
   "node_modules/pg/lib/connection-parameters.js"(exports2, module2) {
     "use strict";
     var dns = require("dns");
-    var defaults = require_defaults2();
+    var defaults2 = require_defaults2();
     var parse = require_pg_connection_string().parse;
     var val = function(key, config, envVar) {
       if (envVar === void 0) {
@@ -21939,7 +22031,7 @@ var require_connection_parameters = __commonJS({
       } else {
         envVar = process.env[envVar];
       }
-      return config[key] || envVar || defaults[key];
+      return config[key] || envVar || defaults2[key];
     };
     var readSSLConfigFromEnvironment = function() {
       switch (process.env.PGSSLMODE) {
@@ -21953,13 +22045,13 @@ var require_connection_parameters = __commonJS({
         case "no-verify":
           return { rejectUnauthorized: false };
       }
-      return defaults.ssl;
+      return defaults2.ssl;
     };
     var quoteParamValue = function(value) {
       return "'" + ("" + value).replace(/\\/g, "\\\\").replace(/'/g, "\\'") + "'";
     };
     var add = function(params, config, paramName) {
-      var value = config[paramName];
+      const value = config[paramName];
       if (value !== void 0 && value !== null) {
         params.push(paramName + "=" + quoteParamValue(value));
       }
@@ -22023,7 +22115,7 @@ var require_connection_parameters = __commonJS({
         }
       }
       getLibpqConnectionString(cb) {
-        var params = [];
+        const params = [];
         add(params, this, "user");
         add(params, this, "password");
         add(params, this, "port");
@@ -22031,7 +22123,7 @@ var require_connection_parameters = __commonJS({
         add(params, this, "fallback_application_name");
         add(params, this, "connect_timeout");
         add(params, this, "options");
-        var ssl = typeof this.ssl === "object" ? this.ssl : this.ssl ? { sslmode: this.ssl } : {};
+        const ssl = typeof this.ssl === "object" ? this.ssl : this.ssl ? { sslmode: this.ssl } : {};
         add(params, ssl, "sslmode");
         add(params, ssl, "sslca");
         add(params, ssl, "sslkey");
@@ -22067,17 +22159,17 @@ var require_connection_parameters = __commonJS({
 var require_result = __commonJS({
   "node_modules/pg/lib/result.js"(exports2, module2) {
     "use strict";
-    var types = require_pg_types();
+    var types2 = require_pg_types();
     var matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/;
-    var Result = class {
-      constructor(rowMode, types2) {
+    var Result2 = class {
+      constructor(rowMode, types3) {
         this.command = null;
         this.rowCount = null;
         this.oid = null;
         this.rows = [];
         this.fields = [];
         this._parsers = void 0;
-        this._types = types2;
+        this._types = types3;
         this.RowCtor = null;
         this.rowAsArray = rowMode === "array";
         if (this.rowAsArray) {
@@ -22087,7 +22179,7 @@ var require_result = __commonJS({
       }
       // adds a command complete message
       addCommandComplete(msg) {
-        var match;
+        let match;
         if (msg.text) {
           match = matchRegexp.exec(msg.text);
         } else {
@@ -22104,9 +22196,9 @@ var require_result = __commonJS({
         }
       }
       _parseRowAsArray(rowData) {
-        var row = new Array(rowData.length);
-        for (var i = 0, len = rowData.length; i < len; i++) {
-          var rawValue = rowData[i];
+        const row = new Array(rowData.length);
+        for (let i = 0, len = rowData.length; i < len; i++) {
+          const rawValue = rowData[i];
           if (rawValue !== null) {
             row[i] = this._parsers[i](rawValue);
           } else {
@@ -22116,12 +22208,13 @@ var require_result = __commonJS({
         return row;
       }
       parseRow(rowData) {
-        var row = { ...this._prebuiltEmptyResultObject };
-        for (var i = 0, len = rowData.length; i < len; i++) {
-          var rawValue = rowData[i];
-          var field = this.fields[i].name;
+        const row = { ...this._prebuiltEmptyResultObject };
+        for (let i = 0, len = rowData.length; i < len; i++) {
+          const rawValue = rowData[i];
+          const field = this.fields[i].name;
           if (rawValue !== null) {
-            row[field] = this._parsers[i](rawValue);
+            const v = this.fields[i].format === "binary" ? Buffer.from(rawValue) : rawValue;
+            row[field] = this._parsers[i](v);
           } else {
             row[field] = null;
           }
@@ -22136,20 +22229,20 @@ var require_result = __commonJS({
         if (this.fields.length) {
           this._parsers = new Array(fieldDescriptions.length);
         }
-        var row = {};
-        for (var i = 0; i < fieldDescriptions.length; i++) {
-          var desc = fieldDescriptions[i];
+        const row = {};
+        for (let i = 0; i < fieldDescriptions.length; i++) {
+          const desc = fieldDescriptions[i];
           row[desc.name] = null;
           if (this._types) {
             this._parsers[i] = this._types.getTypeParser(desc.dataTypeID, desc.format || "text");
           } else {
-            this._parsers[i] = types.getTypeParser(desc.dataTypeID, desc.format || "text");
+            this._parsers[i] = types2.getTypeParser(desc.dataTypeID, desc.format || "text");
           }
         }
         this._prebuiltEmptyResultObject = { ...row };
       }
     };
-    module2.exports = Result;
+    module2.exports = Result2;
   }
 });
 
@@ -22158,9 +22251,9 @@ var require_query3 = __commonJS({
   "node_modules/pg/lib/query.js"(exports2, module2) {
     "use strict";
     var { EventEmitter } = require("events");
-    var Result = require_result();
+    var Result2 = require_result();
     var utils = require_utils();
-    var Query = class extends EventEmitter {
+    var Query2 = class extends EventEmitter {
       constructor(config, values, callback) {
         super();
         config = utils.normalizeQueryConfig(config, values, callback);
@@ -22177,7 +22270,7 @@ var require_query3 = __commonJS({
         if (process.domain && config.callback) {
           this.callback = process.domain.bind(config.callback);
         }
-        this._result = new Result(this._rowMode, this.types);
+        this._result = new Result2(this._rowMode, this.types);
         this._results = this._result;
         this._canceledDueToError = false;
       }
@@ -22204,7 +22297,7 @@ var require_query3 = __commonJS({
           if (!Array.isArray(this._results)) {
             this._results = [this._result];
           }
-          this._result = new Result(this._rowMode, this._result._types);
+          this._result = new Result2(this._rowMode, this._result._types);
           this._results.push(this._result);
         }
       }
@@ -22242,7 +22335,7 @@ var require_query3 = __commonJS({
       // if a named prepared statement is created with empty query text
       // the backend will send an emptyQuery message but *not* a command complete message
       // since we pipeline sync immediately after execute we don't need to do anything here
-      // unless we have rows specified, in which case we did not pipeline the intial sync call
+      // unless we have rows specified, in which case we did not pipeline the initial sync call
       handleEmptyQuery(connection) {
         if (this.rows) {
           connection.sync();
@@ -22343,11 +22436,10 @@ var require_query3 = __commonJS({
       handleCopyInResponse(connection) {
         connection.sendCopyFail("No source stream defined");
       }
-      // eslint-disable-next-line no-unused-vars
       handleCopyData(msg, connection) {
       }
     };
-    module2.exports = Query;
+    module2.exports = Query2;
   }
 });
 
@@ -22389,14 +22481,14 @@ var require_messages = __commonJS({
       name: "copyDone",
       length: 4
     };
-    var DatabaseError = class extends Error {
+    var DatabaseError2 = class extends Error {
       constructor(message, length, name) {
         super(message);
         this.length = length;
         this.name = name;
       }
     };
-    exports2.DatabaseError = DatabaseError;
+    exports2.DatabaseError = DatabaseError2;
     var CopyDataMessage = class {
       constructor(length, chunk) {
         this.length = length;
@@ -22530,10 +22622,10 @@ var require_buffer_writer = __commonJS({
         this.buffer = Buffer.allocUnsafe(size);
       }
       ensure(size) {
-        var remaining = this.buffer.length - this.offset;
+        const remaining = this.buffer.length - this.offset;
         if (remaining < size) {
-          var oldBuffer = this.buffer;
-          var newSize = oldBuffer.length + (oldBuffer.length >> 1) + size;
+          const oldBuffer = this.buffer;
+          const newSize = oldBuffer.length + (oldBuffer.length >> 1) + size;
           this.buffer = Buffer.allocUnsafe(newSize);
           oldBuffer.copy(this.buffer);
         }
@@ -22556,7 +22648,7 @@ var require_buffer_writer = __commonJS({
         if (!string) {
           this.ensure(1);
         } else {
-          var len = Buffer.byteLength(string);
+          const len = Buffer.byteLength(string);
           this.ensure(len + 1);
           this.buffer.write(string, this.offset, "utf-8");
           this.offset += len;
@@ -22565,7 +22657,7 @@ var require_buffer_writer = __commonJS({
         return this;
       }
       addString(string = "") {
-        var len = Buffer.byteLength(string);
+        const len = Buffer.byteLength(string);
         this.ensure(len);
         this.buffer.write(string, this.offset);
         this.offset += len;
@@ -22586,7 +22678,7 @@ var require_buffer_writer = __commonJS({
         return this.buffer.slice(code ? 0 : 5, this.offset);
       }
       flush(code) {
-        var result = this.join(code);
+        const result = this.join(code);
         this.offset = 5;
         this.headerPosition = 0;
         this.buffer = Buffer.allocUnsafe(this.size);
@@ -22611,8 +22703,8 @@ var require_serializer = __commonJS({
         writer.addCString(key).addCString(opts[key]);
       }
       writer.addCString("client_encoding").addCString("UTF8");
-      var bodyBuffer = writer.addCString("").flush();
-      var length = bodyBuffer.length + 4;
+      const bodyBuffer = writer.addCString("").flush();
+      const length = bodyBuffer.length + 4;
       return new buffer_writer_1.Writer().addInt32(length).add(bodyBuffer).flush();
     };
     var requestSsl = () => {
@@ -22654,11 +22746,11 @@ var require_serializer = __commonJS({
         console.error("You supplied %s (%s)", name, name.length);
         console.error("This can cause conflicts and silent errors executing queries");
       }
-      const types = query2.types || emptyArray;
-      var len = types.length;
-      var buffer = writer.addCString(name).addCString(query2.text).addInt16(len);
-      for (var i = 0; i < len; i++) {
-        buffer.addInt32(types[i]);
+      const types2 = query2.types || emptyArray;
+      const len = types2.length;
+      const buffer = writer.addCString(name).addCString(query2.text).addInt16(len);
+      for (let i = 0; i < len; i++) {
+        buffer.addInt32(types2[i]);
       }
       return writer.flush(
         80
@@ -22703,6 +22795,7 @@ var require_serializer = __commonJS({
       writeValues(values, config.valueMapper);
       writer.addInt16(len);
       writer.add(paramWriter.flush());
+      writer.addInt16(1);
       writer.addInt16(
         binary ? 1 : 0
         /* ParamType.STRING */
@@ -23108,15 +23201,17 @@ var require_parser = __commonJS({
             }
             break;
           case 10:
-            message.name = "authenticationSASL";
-            message.mechanisms = [];
-            let mechanism;
-            do {
-              mechanism = this.reader.cstring();
-              if (mechanism) {
-                message.mechanisms.push(mechanism);
-              }
-            } while (mechanism);
+            {
+              message.name = "authenticationSASL";
+              message.mechanisms = [];
+              let mechanism;
+              do {
+                mechanism = this.reader.cstring();
+                if (mechanism) {
+                  message.mechanisms.push(mechanism);
+                }
+              } while (mechanism);
+            }
             break;
           case 11:
             message.name = "authenticationSASLContinue";
@@ -23189,14 +23284,11 @@ var require_dist = __commonJS({
 });
 
 // node_modules/pg-cloudflare/dist/empty.js
-var empty_exports = {};
-__export(empty_exports, {
-  default: () => empty_default
-});
-var empty_default;
-var init_empty = __esm({
-  "node_modules/pg-cloudflare/dist/empty.js"() {
-    empty_default = {};
+var require_empty = __commonJS({
+  "node_modules/pg-cloudflare/dist/empty.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.default = {};
   }
 });
 
@@ -23223,7 +23315,7 @@ var require_stream = __commonJS({
         return new net.Socket();
       }
       function getSecureStream2(options) {
-        var tls = require("tls");
+        const tls = require("tls");
         return tls.connect(options);
       }
       return {
@@ -23233,7 +23325,7 @@ var require_stream = __commonJS({
     }
     function getCloudflareStreamFuncs() {
       function getStream2(ssl) {
-        const { CloudflareSocket } = (init_empty(), __toCommonJS(empty_exports));
+        const { CloudflareSocket } = require_empty();
         return new CloudflareSocket(ssl);
       }
       function getSecureStream2(options) {
@@ -23276,7 +23368,7 @@ var require_connection4 = __commonJS({
     var flushBuffer = serialize.flush();
     var syncBuffer = serialize.sync();
     var endBuffer = serialize.end();
-    var Connection = class extends EventEmitter {
+    var Connection2 = class extends EventEmitter {
       constructor(config) {
         super();
         config = config || {};
@@ -23291,7 +23383,7 @@ var require_connection4 = __commonJS({
         this.ssl = config.ssl || false;
         this._ending = false;
         this._emitMessage = false;
-        var self2 = this;
+        const self2 = this;
         this.on("newListener", function(eventName) {
           if (eventName === "message") {
             self2._emitMessage = true;
@@ -23299,7 +23391,7 @@ var require_connection4 = __commonJS({
         });
       }
       connect(port, host) {
-        var self2 = this;
+        const self2 = this;
         this._connecting = true;
         this.stream.setNoDelay(true);
         this.stream.connect(port, host);
@@ -23323,7 +23415,7 @@ var require_connection4 = __commonJS({
           return this.attachListeners(this.stream);
         }
         this.stream.once("data", function(buffer) {
-          var responseCode = buffer.toString("utf8");
+          const responseCode = buffer.toString("utf8");
           switch (responseCode) {
             case "S":
               break;
@@ -23343,7 +23435,7 @@ var require_connection4 = __commonJS({
               options.key = self2.ssl.key;
             }
           }
-          var net = require("net");
+          const net = require("net");
           if (net.isIP && net.isIP(host) === 0) {
             options.servername = host;
           }
@@ -23359,7 +23451,7 @@ var require_connection4 = __commonJS({
       }
       attachListeners(stream) {
         parse(stream, (msg) => {
-          var eventName = msg.name === "error" ? "errorMessage" : msg.name;
+          const eventName = msg.name === "error" ? "errorMessage" : msg.name;
           if (this._emitMessage) {
             this.emit("message", msg);
           }
@@ -23446,7 +23538,7 @@ var require_connection4 = __commonJS({
         this._send(serialize.copyFail(msg));
       }
     };
-    module2.exports = Connection;
+    module2.exports = Connection2;
   }
 });
 
@@ -23750,11 +23842,11 @@ var require_client2 = __commonJS({
     var EventEmitter = require("events").EventEmitter;
     var utils = require_utils();
     var sasl = require_sasl();
-    var TypeOverrides = require_type_overrides();
+    var TypeOverrides2 = require_type_overrides();
     var ConnectionParameters = require_connection_parameters();
-    var Query = require_query3();
-    var defaults = require_defaults2();
-    var Connection = require_connection4();
+    var Query2 = require_query3();
+    var defaults2 = require_defaults2();
+    var Connection2 = require_connection4();
     var crypto = require_utils2();
     var Client2 = class extends EventEmitter {
       constructor(config) {
@@ -23771,9 +23863,9 @@ var require_client2 = __commonJS({
           value: this.connectionParameters.password
         });
         this.replication = this.connectionParameters.replication;
-        var c = config || {};
+        const c = config || {};
         this._Promise = c.Promise || global.Promise;
-        this._types = new TypeOverrides(c.types);
+        this._types = new TypeOverrides2(c.types);
         this._ending = false;
         this._ended = false;
         this._connecting = false;
@@ -23781,7 +23873,7 @@ var require_client2 = __commonJS({
         this._connectionError = false;
         this._queryable = true;
         this.enableChannelBinding = Boolean(c.enableChannelBinding);
-        this.connection = c.connection || new Connection({
+        this.connection = c.connection || new Connection2({
           stream: c.stream,
           ssl: this.connectionParameters.ssl,
           keepAlive: c.keepAlive || false,
@@ -23789,7 +23881,7 @@ var require_client2 = __commonJS({
           encoding: this.connectionParameters.client_encoding || "utf8"
         });
         this.queryQueue = [];
-        this.binary = c.binary || defaults.binary;
+        this.binary = c.binary || defaults2.binary;
         this.processID = null;
         this.secretKey = null;
         this.ssl = this.connectionParameters.ssl || false;
@@ -23814,8 +23906,8 @@ var require_client2 = __commonJS({
         this.queryQueue.length = 0;
       }
       _connect(callback) {
-        var self2 = this;
-        var con = this.connection;
+        const self2 = this;
+        const con = this.connection;
         this._connectionCallback = callback;
         if (this._connecting || this._connected) {
           const err = new Error("Client has already been connected. You cannot reuse a client.");
@@ -24011,7 +24103,7 @@ var require_client2 = __commonJS({
         }
         this._pulseQueryQueue();
       }
-      // if we receieve an error event or error message
+      // if we receive an error event or error message
       // during the connection process we handle it here
       _handleErrorWhileConnecting(err) {
         if (this._connectionError) {
@@ -24091,12 +24183,12 @@ var require_client2 = __commonJS({
         this.emit("notice", msg);
       }
       getStartupConf() {
-        var params = this.connectionParameters;
-        var data = {
+        const params = this.connectionParameters;
+        const data = {
           user: params.user,
           database: params.database
         };
-        var appName = params.application_name || params.fallback_application_name;
+        const appName = params.application_name || params.fallback_application_name;
         if (appName) {
           data.application_name = appName;
         }
@@ -24119,7 +24211,7 @@ var require_client2 = __commonJS({
       }
       cancel(client, query) {
         if (client.activeQuery === query) {
-          var con = this.connection;
+          const con = this.connection;
           if (this.host && this.host.indexOf("/") === 0) {
             con.connect(this.host + "/.s.PGSQL." + this.port);
           } else {
@@ -24168,11 +24260,11 @@ var require_client2 = __commonJS({
         }
       }
       query(config, values, callback) {
-        var query;
-        var result;
-        var readTimeout;
-        var readTimeoutTimer;
-        var queryCallback;
+        let query;
+        let result;
+        let readTimeout;
+        let readTimeoutTimer;
+        let queryCallback;
         if (config === null || config === void 0) {
           throw new TypeError("Client was passed a null or undefined query");
         } else if (typeof config.submit === "function") {
@@ -24183,7 +24275,7 @@ var require_client2 = __commonJS({
           }
         } else {
           readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
-          query = new Query(config, values, callback);
+          query = new Query2(config, values, callback);
           if (!query.callback) {
             result = new this._Promise((resolve, reject) => {
               query.callback = (err, res) => err ? reject(err) : resolve(res);
@@ -24196,14 +24288,14 @@ var require_client2 = __commonJS({
         if (readTimeout) {
           queryCallback = query.callback;
           readTimeoutTimer = setTimeout(() => {
-            var error = new Error("Query read timeout");
+            const error = new Error("Query read timeout");
             process.nextTick(() => {
               query.handleError(error, this.connection);
             });
             queryCallback(error);
             query.callback = () => {
             };
-            var index = this.queryQueue.indexOf(query);
+            const index = this.queryQueue.indexOf(query);
             if (index > -1) {
               this.queryQueue.splice(index, 1);
             }
@@ -24265,7 +24357,7 @@ var require_client2 = __commonJS({
         }
       }
     };
-    Client2.Query = Query;
+    Client2.Query = Query2;
     module2.exports = Client2;
   }
 });
@@ -24325,7 +24417,7 @@ var require_pg_pool = __commonJS({
         pool.emit("error", err, client);
       };
     }
-    var Pool = class extends EventEmitter {
+    var Pool2 = class extends EventEmitter {
       constructor(options, Client2) {
         super();
         this.options = Object.assign({}, options);
@@ -24343,6 +24435,7 @@ var require_pg_pool = __commonJS({
           });
         }
         this.options.max = this.options.max || this.options.poolSize || 10;
+        this.options.min = this.options.min || 0;
         this.options.maxUses = this.options.maxUses || Infinity;
         this.options.allowExitOnIdle = this.options.allowExitOnIdle || false;
         this.options.maxLifetimeSeconds = this.options.maxLifetimeSeconds || 0;
@@ -24364,6 +24457,9 @@ var require_pg_pool = __commonJS({
       _isFull() {
         return this._clients.length >= this.options.max;
       }
+      _isAboveMin() {
+        return this._clients.length > this.options.min;
+      }
       _pulseQueue() {
         this.log("pulse queue");
         if (this.ended) {
@@ -24404,14 +24500,19 @@ var require_pg_pool = __commonJS({
         }
         throw new Error("unexpected condition");
       }
-      _remove(client) {
+      _remove(client, callback) {
         const removed = removeWhere(this._idle, (item) => item.client === client);
         if (removed !== void 0) {
           clearTimeout(removed.timeoutId);
         }
         this._clients = this._clients.filter((c) => c !== client);
-        client.end();
-        this.emit("remove", client);
+        const context = this;
+        client.end(() => {
+          context.emit("remove", client);
+          if (typeof callback === "function") {
+            callback();
+          }
+        });
       }
       connect(cb) {
         if (this.ending) {
@@ -24549,23 +24650,19 @@ var require_pg_pool = __commonJS({
           if (client._poolUseCount >= this.options.maxUses) {
             this.log("remove expended client");
           }
-          this._remove(client);
-          this._pulseQueue();
-          return;
+          return this._remove(client, this._pulseQueue.bind(this));
         }
         const isExpired = this._expired.has(client);
         if (isExpired) {
           this.log("remove expired client");
           this._expired.delete(client);
-          this._remove(client);
-          this._pulseQueue();
-          return;
+          return this._remove(client, this._pulseQueue.bind(this));
         }
         let tid;
-        if (this.options.idleTimeoutMillis) {
+        if (this.options.idleTimeoutMillis && this._isAboveMin()) {
           tid = setTimeout(() => {
             this.log("remove idle client");
-            this._remove(client);
+            this._remove(client, this._pulseQueue.bind(this));
           }, this.options.idleTimeoutMillis);
           if (this.options.allowExitOnIdle) {
             tid.unref();
@@ -24652,7 +24749,7 @@ var require_pg_pool = __commonJS({
         return this._clients.length;
       }
     };
-    module2.exports = Pool;
+    module2.exports = Pool2;
   }
 });
 
@@ -24683,7 +24780,6 @@ var require_query4 = __commonJS({
     };
     util.inherits(NativeQuery, EventEmitter);
     var errorFieldMap = {
-      /* eslint-disable quote-props */
       sqlState: "code",
       statementPosition: "position",
       messagePrimary: "message",
@@ -24698,10 +24794,10 @@ var require_query4 = __commonJS({
       sourceFunction: "routine"
     };
     NativeQuery.prototype.handleError = function(err) {
-      var fields = this.native.pq.resultErrorFields();
+      const fields = this.native.pq.resultErrorFields();
       if (fields) {
-        for (var key in fields) {
-          var normalizedFieldName = errorFieldMap[key] || key;
+        for (const key in fields) {
+          const normalizedFieldName = errorFieldMap[key] || key;
           err[normalizedFieldName] = fields[key];
         }
       }
@@ -24730,10 +24826,10 @@ var require_query4 = __commonJS({
     };
     NativeQuery.prototype.submit = function(client) {
       this.state = "running";
-      var self2 = this;
+      const self2 = this;
       this.native = client.native;
       client.native.arrayMode = this._arrayMode;
-      var after = function(err, rows, results) {
+      let after = function(err, rows, results) {
         client.native.arrayMode = false;
         setImmediate(function() {
           self2.emit("_done");
@@ -24769,7 +24865,7 @@ var require_query4 = __commonJS({
           console.error("You supplied %s (%s)", this.name, this.name.length);
           console.error("This can cause conflicts and silent errors executing queries");
         }
-        var values = (this.values || []).map(utils.prepareValue);
+        const values = (this.values || []).map(utils.prepareValue);
         if (client.namedQueries[this.name]) {
           if (this.text && client.namedQueries[this.name] !== this.text) {
             const err = new Error(`Prepared statements must be unique - '${this.name}' was used for a different statement`);
@@ -24787,7 +24883,7 @@ var require_query4 = __commonJS({
           const err = new Error("Query values must be an array");
           return after(err);
         }
-        var vals = this.values.map(utils.prepareValue);
+        const vals = this.values.map(utils.prepareValue);
         client.native.query(this.text, vals, after);
       } else if (this.queryMode === "extended") {
         client.native.query(this.text, [], after);
@@ -24808,7 +24904,7 @@ var require_client3 = __commonJS({
     } catch (e) {
       throw e;
     }
-    var TypeOverrides = require_type_overrides();
+    var TypeOverrides2 = require_type_overrides();
     var EventEmitter = require("events").EventEmitter;
     var util = require("util");
     var ConnectionParameters = require_connection_parameters();
@@ -24817,7 +24913,7 @@ var require_client3 = __commonJS({
       EventEmitter.call(this);
       config = config || {};
       this._Promise = config.Promise || global.Promise;
-      this._types = new TypeOverrides(config.types);
+      this._types = new TypeOverrides2(config.types);
       this.native = new Native({
         types: this._types
       });
@@ -24826,7 +24922,7 @@ var require_client3 = __commonJS({
       this._connecting = false;
       this._connected = false;
       this._queryable = true;
-      var cp = this.connectionParameters = new ConnectionParameters(config);
+      const cp = this.connectionParameters = new ConnectionParameters(config);
       if (config.nativeConnectionString) cp.nativeConnectionString = config.nativeConnectionString;
       this.user = cp.user;
       Object.defineProperty(this, "password", {
@@ -24857,7 +24953,7 @@ var require_client3 = __commonJS({
       this._queryQueue.length = 0;
     };
     Client2.prototype._connect = function(cb) {
-      var self2 = this;
+      const self2 = this;
       if (this._connecting) {
         process.nextTick(() => cb(new Error("Client has already been connected. You cannot reuse a client.")));
         return;
@@ -24905,11 +25001,11 @@ var require_client3 = __commonJS({
       });
     };
     Client2.prototype.query = function(config, values, callback) {
-      var query;
-      var result;
-      var readTimeout;
-      var readTimeoutTimer;
-      var queryCallback;
+      let query;
+      let result;
+      let readTimeout;
+      let readTimeoutTimer;
+      let queryCallback;
       if (config === null || config === void 0) {
         throw new TypeError("Client was passed a null or undefined query");
       } else if (typeof config.submit === "function") {
@@ -24936,14 +25032,14 @@ var require_client3 = __commonJS({
       if (readTimeout) {
         queryCallback = query.callback;
         readTimeoutTimer = setTimeout(() => {
-          var error = new Error("Query read timeout");
+          const error = new Error("Query read timeout");
           process.nextTick(() => {
             query.handleError(error, this.connection);
           });
           queryCallback(error);
           query.callback = () => {
           };
-          var index = this._queryQueue.indexOf(query);
+          const index = this._queryQueue.indexOf(query);
           if (index > -1) {
             this._queryQueue.splice(index, 1);
           }
@@ -24973,12 +25069,12 @@ var require_client3 = __commonJS({
       return result;
     };
     Client2.prototype.end = function(cb) {
-      var self2 = this;
+      const self2 = this;
       this._ending = true;
       if (!this._connected) {
         this.once("connect", this.end.bind(this, cb));
       }
-      var result;
+      let result;
       if (!cb) {
         result = new this._Promise(function(resolve, reject) {
           cb = (err) => err ? reject(err) : resolve();
@@ -25003,7 +25099,7 @@ var require_client3 = __commonJS({
       if (this._hasActiveQuery()) {
         return;
       }
-      var query = this._queryQueue.shift();
+      const query = this._queryQueue.shift();
       if (!query) {
         if (!initialConnection) {
           this.emit("drain");
@@ -25012,7 +25108,7 @@ var require_client3 = __commonJS({
       }
       this._activeQuery = query;
       query.submit(this);
-      var self2 = this;
+      const self2 = this;
       query.once("_done", function() {
         self2._pulseQueryQueue();
       });
@@ -25051,29 +25147,35 @@ var require_lib6 = __commonJS({
   "node_modules/pg/lib/index.js"(exports2, module2) {
     "use strict";
     var Client2 = require_client2();
-    var defaults = require_defaults2();
-    var Connection = require_connection4();
-    var Pool = require_pg_pool();
-    var { DatabaseError } = require_dist();
-    var { escapeIdentifier, escapeLiteral } = require_utils();
+    var defaults2 = require_defaults2();
+    var Connection2 = require_connection4();
+    var Result2 = require_result();
+    var utils = require_utils();
+    var Pool2 = require_pg_pool();
+    var TypeOverrides2 = require_type_overrides();
+    var { DatabaseError: DatabaseError2 } = require_dist();
+    var { escapeIdentifier: escapeIdentifier2, escapeLiteral: escapeLiteral2 } = require_utils();
     var poolFactory = (Client3) => {
-      return class BoundPool extends Pool {
+      return class BoundPool extends Pool2 {
         constructor(options) {
           super(options, Client3);
         }
       };
     };
     var PG = function(clientConstructor) {
-      this.defaults = defaults;
+      this.defaults = defaults2;
       this.Client = clientConstructor;
       this.Query = this.Client.Query;
       this.Pool = poolFactory(this.Client);
       this._pools = [];
-      this.Connection = Connection;
+      this.Connection = Connection2;
       this.types = require_pg_types();
-      this.DatabaseError = DatabaseError;
-      this.escapeIdentifier = escapeIdentifier;
-      this.escapeLiteral = escapeLiteral;
+      this.DatabaseError = DatabaseError2;
+      this.TypeOverrides = TypeOverrides2;
+      this.escapeIdentifier = escapeIdentifier2;
+      this.escapeLiteral = escapeLiteral2;
+      this.Result = Result2;
+      this.utils = utils;
     };
     if (typeof process.env.NODE_PG_FORCE_NATIVE !== "undefined") {
       module2.exports = new PG(require_native());
@@ -25083,7 +25185,7 @@ var require_lib6 = __commonJS({
         configurable: true,
         enumerable: false,
         get() {
-          var native = null;
+          let native = null;
           try {
             native = new PG(require_native());
           } catch (err) {
@@ -25296,7 +25398,22 @@ var MysqlEngine = class extends AbstractEngine {
 // lambda/engine.postgresql.ts
 var fs2 = __toESM(require("fs"));
 var import_node_pg_format = __toESM(require_lib4());
-var import_pg = __toESM(require_lib6());
+
+// node_modules/pg/esm/index.mjs
+var import_lib = __toESM(require_lib6(), 1);
+var Client = import_lib.default.Client;
+var Pool = import_lib.default.Pool;
+var Connection = import_lib.default.Connection;
+var types = import_lib.default.types;
+var Query = import_lib.default.Query;
+var DatabaseError = import_lib.default.DatabaseError;
+var escapeIdentifier = import_lib.default.escapeIdentifier;
+var escapeLiteral = import_lib.default.escapeLiteral;
+var Result = import_lib.default.Result;
+var TypeOverrides = import_lib.default.TypeOverrides;
+var defaults = import_lib.default.defaults;
+
+// lambda/engine.postgresql.ts
 var PostgresqlEngine = class extends AbstractEngine {
   createDatabase(resourceId, props) {
     const owner = props?.Owner;
@@ -25522,7 +25639,7 @@ END$$;`,
       `Connecting to PostgreSQL host ${params.host}:${params.port}${ssl ? " using a secure connection" : ""}, database ${params.database} as ${params.user}`
     );
     this.log("Executing SQL", sql);
-    const pg_client = new import_pg.Client(params);
+    const pg_client = new Client(params);
     await pg_client.connect();
     try {
       if (typeof sql === "string") {
@@ -25631,8 +25748,9 @@ var handler = async (event) => {
       startingDelay: 500
     }
   );
-  if (!secret.SecretString)
+  if (!secret.SecretString) {
     throw `No secret string in ${event.ResourceProperties.SecretArn}`;
+  }
   const secretValues = JSON.parse(secret.SecretString);
   const engine = secretValues.engine || "postgresql";
   const dbEngine = EngineFactory.createEngine(engine);