@prisma/query-plan-executor 6.16.2 → 6.16.3-dev.1

package/dist/index.js

@@ -19658,14 +19658,14 @@ var require_pool = __commonJS({
        * @param {Function} onError - Error callback
        * @param {number} timeoutEnd - Timestamp when connection attempt should time out
        */
-      _createPoolConnection(onSuccess, onError2, timeoutEnd) {
+      _createPoolConnection(onSuccess, onError, timeoutEnd) {
         const minTimeout = timeoutEnd - Date.now();
         const connectionOpts = Object.assign({}, this.opts.connOptions, {
           connectTimeout: Math.max(1, Math.min(minTimeout, this.opts.connOptions.connectTimeout || Number.MAX_SAFE_INTEGER))
         });
         const conn = new Connection(connectionOpts);
         this._connectionCreationTask = null;
-        conn.connect().then((conn2) => this._prepareNewConnection(conn2, onSuccess, onError2)).catch((err) => this._handleConnectionCreationError(err, onSuccess, onError2, timeoutEnd));
+        conn.connect().then((conn2) => this._prepareNewConnection(conn2, onSuccess, onError)).catch((err) => this._handleConnectionCreationError(err, onSuccess, onError, timeoutEnd));
       }
       /**
        * Sets up a newly created connection for use in the pool
@@ -19673,10 +19673,10 @@ var require_pool = __commonJS({
        * @param {Function} onSuccess - Success callback
        * @param {Function} onError - Error callback
        */
-      _prepareNewConnection(conn, onSuccess, onError2) {
+      _prepareNewConnection(conn, onSuccess, onError) {
         if (this.#closed) {
           this._cleanupConnection(conn, "pool_closed");
-          onError2(
+          onError(
             new Errors2.createFatalError(
               "Cannot create new connection to pool, pool closed",
               Errors2.ER_ADD_CONNECTION_CLOSED_POOL
@@ -19750,7 +19750,7 @@ var require_pool = __commonJS({
        * @param {Function} onError - Error callback
        * @param {number} timeoutEnd - Timestamp when connection attempt should time out
        */
-      _handleConnectionCreationError(err, onSuccess, onError2, timeoutEnd) {
+      _handleConnectionCreationError(err, onSuccess, onError, timeoutEnd) {
         if (err instanceof AggregateError) {
           err = err.errors[0];
         }
@@ -19759,11 +19759,11 @@ var require_pool = __commonJS({
         if (isFatalError) {
           err.message = err.message + this._errorMsgAddon();
           this._connectionCreationTask = null;
-          onError2(err);
+          onError(err);
           return;
         }
         this._connectionCreationTask = setTimeout(
-          () => this._createPoolConnection(onSuccess, onError2, timeoutEnd),
+          () => this._createPoolConnection(onSuccess, onError, timeoutEnd),
           Math.min(500, timeoutEnd - Date.now())
         );
       }
@@ -40021,19 +40021,19 @@ var require_dist2 = __commonJS({
         function cleanup() {
           signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", cleanup);
           emitter.removeListener(name6, onEvent);
-          emitter.removeListener("error", onError2);
+          emitter.removeListener("error", onError);
         }
         function onEvent(...args) {
           cleanup();
           resolve(args);
         }
-        function onError2(err) {
+        function onError(err) {
           cleanup();
           reject(err);
         }
         signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", cleanup);
         emitter.on(name6, onEvent);
-        emitter.on("error", onError2);
+        emitter.on("error", onError);
       });
     }
     exports2.default = once;
@@ -61846,7 +61846,7 @@ var require_sender = __commonJS({
       return await new Promise((resolve, reject) => {
         const sockets = [];
         let errorCount = 0;
-        const onError2 = (err) => {
+        const onError = (err) => {
           errorCount++;
           if (errorCount === addresses.length) {
             signal.removeEventListener("abort", onAbort);
@@ -61865,7 +61865,7 @@ var require_sender = __commonJS({
         };
         const clearSockets = () => {
           for (const socket of sockets) {
-            socket.removeListener("error", onError2);
+            socket.removeListener("error", onError);
             socket.removeListener("message", onMessage);
             socket.close();
           }
@@ -61877,7 +61877,7 @@ var require_sender = __commonJS({
           const udpType = addresses[j2].family === 6 ? "udp6" : "udp4";
           const socket = _dgram.default.createSocket(udpType);
           sockets.push(socket);
-          socket.on("error", onError2);
+          socket.on("error", onError);
           socket.on("message", onMessage);
           socket.send(request3, 0, request3.length, port, addresses[j2].address);
         }
@@ -69106,12 +69106,12 @@ var require_pipeline = __commonJS({
         const end = reading || (opts === null || opts === void 0 ? void 0 : opts.end) !== false;
         const isLastStream = i2 === streams.length - 1;
         if (isNodeStream(stream)) {
-          let onError3 = function(err) {
+          let onError2 = function(err) {
             if (err && err.name !== "AbortError" && err.code !== "ERR_STREAM_PREMATURE_CLOSE") {
               finish(err);
             }
           };
-          var onError2 = onError3;
+          var onError = onError2;
           if (end) {
             const { destroy: destroy2, cleanup } = destroyer(stream, reading, writing);
             destroys.push(destroy2);
@@ -69119,10 +69119,10 @@ var require_pipeline = __commonJS({
               lastStreamCleanup.push(cleanup);
             }
           }
-          stream.on("error", onError3);
+          stream.on("error", onError2);
           if (isReadable(stream) && isLastStream) {
             lastStreamCleanup.push(() => {
-              stream.removeListener("error", onError3);
+              stream.removeListener("error", onError2);
             });
           }
         }
@@ -70800,7 +70800,7 @@ var require_message_io = __commonJS({
           };
           const onSecureConnect = () => {
             securePair.encrypted.removeListener("readable", onReadable);
-            securePair.cleartext.removeListener("error", onError2);
+            securePair.cleartext.removeListener("error", onError);
             securePair.cleartext.removeListener("secureConnect", onSecureConnect);
             securePair.cleartext.once("error", (err) => {
               this.socket.destroy(err);
@@ -70820,9 +70820,9 @@ var require_message_io = __commonJS({
             this.tlsNegotiationComplete = true;
             resolve();
           };
-          const onError2 = (err) => {
+          const onError = (err) => {
             securePair.encrypted.removeListener("readable", onReadable);
-            securePair.cleartext.removeListener("error", onError2);
+            securePair.cleartext.removeListener("error", onError);
             securePair.cleartext.removeListener("secureConnect", onSecureConnect);
             securePair.cleartext.destroy();
             securePair.encrypted.destroy();
@@ -70844,9 +70844,9 @@ var require_message_io = __commonJS({
               for await (const data of response) {
                 securePair.encrypted.write(data);
               }
-            }).catch(onError2);
+            }).catch(onError);
           };
-          securePair.cleartext.once("error", onError2);
+          securePair.cleartext.once("error", onError);
           securePair.cleartext.once("secureConnect", onSecureConnect);
           securePair.encrypted.once("readable", onReadable);
         });
@@ -87366,9 +87366,9 @@ var require_connector = __commonJS({
       return await new Promise((resolve, reject) => {
         const sockets = new Array(addresses.length);
         const errors = [];
-        function onError2(err) {
+        function onError(err) {
           errors.push(err);
-          this.removeListener("error", onError2);
+          this.removeListener("error", onError);
           this.removeListener("connect", onConnect);
           this.destroy();
           if (errors.length === addresses.length) {
@@ -87383,7 +87383,7 @@ var require_connector = __commonJS({
             if (this === socket) {
               continue;
             }
-            socket.removeListener("error", onError2);
+            socket.removeListener("error", onError);
             socket.removeListener("connect", onConnect);
             socket.destroy();
           }
@@ -87392,7 +87392,7 @@ var require_connector = __commonJS({
         const onAbort = () => {
           for (let j2 = 0; j2 < sockets.length; j2++) {
             const socket = sockets[j2];
-            socket.removeListener("error", onError2);
+            socket.removeListener("error", onError);
             socket.removeListener("connect", onConnect);
             socket.destroy();
           }
@@ -87404,7 +87404,7 @@ var require_connector = __commonJS({
             host: addresses[i2].address,
             family: addresses[i2].family
           });
-          socket.on("error", onError2);
+          socket.on("error", onError);
           socket.on("connect", onConnect);
         }
         signal.addEventListener("abort", onAbort, {
@@ -87427,28 +87427,28 @@ var require_connector = __commonJS({
               family: address.family
             });
             const onAbort = () => {
-              socket.removeListener("error", onError2);
+              socket.removeListener("error", onError);
               socket.removeListener("connect", onConnect);
               socket.destroy();
               reject(new _abortError.default());
             };
-            const onError2 = (err) => {
+            const onError = (err) => {
               signal.removeEventListener("abort", onAbort);
-              socket.removeListener("error", onError2);
+              socket.removeListener("error", onError);
               socket.removeListener("connect", onConnect);
               socket.destroy();
               reject(err);
             };
             const onConnect = () => {
               signal.removeEventListener("abort", onAbort);
-              socket.removeListener("error", onError2);
+              socket.removeListener("error", onError);
               socket.removeListener("connect", onConnect);
               resolve(socket);
             };
             signal.addEventListener("abort", onAbort, {
               once: true
             });
-            socket.on("error", onError2);
+            socket.on("error", onError);
             socket.on("connect", onConnect);
           });
         } catch (err) {
@@ -88940,15 +88940,15 @@ var require_connection2 = __commonJS({
         }
         if (connectListener) {
           const onConnect = (err) => {
-            this.removeListener("error", onError2);
+            this.removeListener("error", onError);
             connectListener(err);
           };
-          const onError2 = (err) => {
+          const onError = (err) => {
             this.removeListener("connect", onConnect);
             connectListener(err);
           };
           this.once("connect", onConnect);
-          this.once("error", onError2);
+          this.once("error", onError);
         }
         this.transitionTo(this.STATE.CONNECTING);
       }
@@ -89150,28 +89150,28 @@ var require_connection2 = __commonJS({
           };
           const encryptsocket = tls.connect(encryptOptions);
           const onAbort = () => {
-            encryptsocket.removeListener("error", onError2);
+            encryptsocket.removeListener("error", onError);
             encryptsocket.removeListener("connect", onConnect);
             encryptsocket.destroy();
             reject(signal.reason);
           };
-          const onError2 = (err) => {
+          const onError = (err) => {
             signal.removeEventListener("abort", onAbort);
-            encryptsocket.removeListener("error", onError2);
+            encryptsocket.removeListener("error", onError);
             encryptsocket.removeListener("connect", onConnect);
             encryptsocket.destroy();
             reject(err);
           };
           const onConnect = () => {
             signal.removeEventListener("abort", onAbort);
-            encryptsocket.removeListener("error", onError2);
+            encryptsocket.removeListener("error", onError);
             encryptsocket.removeListener("connect", onConnect);
             resolve(encryptsocket);
           };
           signal.addEventListener("abort", onAbort, {
             once: true
           });
-          encryptsocket.on("error", onError2);
+          encryptsocket.on("error", onError);
           encryptsocket.on("secureConnect", onConnect);
         });
       }
@@ -96458,7 +96458,7 @@ var require_pg_pool = __commonJS({
             return cb(err);
           }
           let clientReleased = false;
-          const onError2 = (err2) => {
+          const onError = (err2) => {
             if (clientReleased) {
               return;
             }
@@ -96466,12 +96466,12 @@ var require_pg_pool = __commonJS({
             client.release(err2);
             cb(err2);
           };
-          client.once("error", onError2);
+          client.once("error", onError);
           this.log("dispatching query");
           try {
             client.query(text, values, (err2, res) => {
               this.log("query dispatched");
-              client.removeListener("error", onError2);
+              client.removeListener("error", onError);
               if (clientReleased) {
                 return;
               }
@@ -106984,7 +106984,7 @@ var TransactionManager = class {
 };
 
 // ../../node_modules/.pnpm/hono@4.9.4/node_modules/hono/dist/compose.js
-var compose = (middleware, onError2, onNotFound) => {
+var compose = (middleware, onError, onNotFound) => {
   return (context2, next) => {
     let index = -1;
     return dispatch(0);
@@ -107006,9 +107006,9 @@ var compose = (middleware, onError2, onNotFound) => {
         try {
           res = await handler(context2, () => dispatch(i2 + 1));
         } catch (err) {
-          if (err instanceof Error && onError2) {
+          if (err instanceof Error && onError) {
             context2.error = err;
-            res = await onError2(err, context2);
+            res = await onError(err, context2);
             isError2 = true;
           } else {
             throw err;
@@ -108555,7 +108555,7 @@ function isPromiseLike(value) {
 }
 
 // package.json
-var version = "6.16.2";
+var version = "6.16.3-dev.1";
 
 // src/utils/error.ts
 function extractErrorFromUnknown(value) {
@@ -108882,25 +108882,28 @@ var MariaDbQueryable = class {
       return await this.client.query(req, values);
     } catch (e2) {
       const error44 = e2;
-      onError(error44);
+      this.onError(error44);
     }
   }
+  onError(error44) {
+    debug4("Error in performIO: %O", error44);
+    throw new DriverAdapterError(convertDriverError(error44));
+  }
 };
-function onError(error44) {
-  debug4("Error in performIO: %O", error44);
-  throw new DriverAdapterError(convertDriverError(error44));
-}
 var MariaDbTransaction = class extends MariaDbQueryable {
-  constructor(conn, options) {
+  constructor(conn, options, cleanup) {
     super(conn);
     this.options = options;
+    this.cleanup = cleanup;
   }
   async commit() {
     debug4(`[js::commit]`);
+    this.cleanup?.();
     await this.client.end();
   }
   async rollback() {
     debug4(`[js::rollback]`);
+    this.cleanup?.();
     await this.client.end();
   }
 };
@@ -108925,13 +108928,17 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
     };
     const tag2 = "[js::startTransaction]";
     debug4("%s options: %O", tag2, options);
-    const conn = await this.client.getConnection().catch((error44) => onError(error44));
-    conn.on("error", (err) => {
+    const conn = await this.client.getConnection().catch((error44) => this.onError(error44));
+    const onError = (err) => {
       debug4(`Error from connection: ${err.message} %O`, err);
       this.options?.onConnectionError?.(err);
-    });
+    };
+    conn.on("error", onError);
+    const cleanup = () => {
+      conn.removeListener("error", onError);
+    };
     try {
-      const tx = new MariaDbTransaction(conn, options);
+      const tx = new MariaDbTransaction(conn, options, cleanup);
       if (isolationLevel) {
         await tx.executeRaw({
           sql: `SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`,
@@ -108943,7 +108950,8 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
       return tx;
     } catch (error44) {
       await conn.end();
-      onError(error44);
+      cleanup();
+      this.onError(error44);
     }
   }
   async dispose() {
@@ -110504,13 +110512,13 @@ var PrismaPgAdapter = class extends PgQueryable {
     const tag2 = "[js::startTransaction]";
     debug6("%s options: %O", tag2, options);
     const conn = await this.client.connect().catch((error44) => this.onError(error44));
-    const onError2 = (err) => {
+    const onError = (err) => {
       debug6(`Error from pool connection: ${err.message} %O`, err);
       this.pgOptions?.onConnectionError?.(err);
     };
-    conn.on("error", onError2);
+    conn.on("error", onError);
     const cleanup = () => {
-      conn.removeListener("error", onError2);
+      conn.removeListener("error", onError);
     };
     try {
       const tx = new PgTransaction(conn, options, this.pgOptions, cleanup);
@@ -110601,24 +110609,65 @@ var PrismaPgAdapterFactory = class {
 
 // src/logic/adapter.ts
 function createAdapter(url2) {
-  if (url2.startsWith("postgres://") || url2.startsWith("postgresql://")) {
-    return new PrismaPgAdapterFactory({
-      connectionString: url2
-    });
-  } else if (url2.startsWith("mysql://") || url2.startsWith("mariadb://")) {
-    return new PrismaMariaDbAdapterFactory(url2);
-  } else if (url2.startsWith("sqlserver://")) {
-    return new PrismaMssqlAdapterFactory(url2);
-  } else {
-    let urlObj;
-    try {
-      urlObj = new URL(url2);
-    } catch {
-      throw new Error("Invalid database URL");
+  for (const factory of factories) {
+    if (factory.protocols.some((protocol) => url2.startsWith(`${protocol}://`))) {
+      return factory.create(url2);
     }
-    throw new Error(`Unsupported protocol in database URL: ${urlObj.protocol}`);
   }
+  let urlObj;
+  try {
+    urlObj = new URL(url2);
+  } catch {
+    throw new Error("Invalid database URL");
+  }
+  throw new Error(`Unsupported protocol in database URL: ${urlObj.protocol}`);
 }
+var factories = [
+  {
+    protocols: ["postgres", "postgresql"],
+    create(connectionString) {
+      const url2 = new URL(connectionString);
+      if (["sslcert", "sslkey", "sslrootcert"].some((param) => url2.searchParams.has(param))) {
+        throw new Error(
+          "Unsupported parameters in connection string: uploading and using custom TLS certificates is not currently supported"
+        );
+      }
+      let sslmode = url2.searchParams.get("sslmode");
+      if (sslmode === null && url2.searchParams.get("ssl") === "true") {
+        sslmode = "require";
+      }
+      const ssl = (() => {
+        switch (sslmode) {
+          case null:
+          case "disable":
+            return false;
+          case "prefer":
+          case "require":
+          case "no-verify":
+            return { rejectUnauthorized: false };
+          case "verify-ca":
+          case "verify-full":
+            return true;
+          default:
+            throw new Error(`Unsupported sslmode: ${sslmode}`);
+        }
+      })();
+      return new PrismaPgAdapterFactory({ connectionString, ssl });
+    }
+  },
+  {
+    protocols: ["mysql", "mariadb"],
+    create(url2) {
+      return new PrismaMariaDbAdapterFactory(url2);
+    }
+  },
+  {
+    protocols: ["sqlserver"],
+    create(url2) {
+      return new PrismaMssqlAdapterFactory(url2);
+    }
+  }
+];
 
 // src/logic/resource-limits.ts
 var ResourceLimitError = class extends Error {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "6.16.2",
+  "version": "6.16.3-dev.1",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,11 +20,11 @@
     "temporal-polyfill": "0.3.0",
     "vitest": "3.2.4",
     "zod": "4.1.3",
-    "@prisma/adapter-pg": "6.16.2",
-    "@prisma/adapter-mariadb": "6.16.2",
-    "@prisma/client-engine-runtime": "6.16.2",
-    "@prisma/adapter-mssql": "6.16.2",
-    "@prisma/driver-adapter-utils": "6.16.2"
+    "@prisma/adapter-mariadb": "6.16.3-dev.1",
+    "@prisma/client-engine-runtime": "6.16.3-dev.1",
+    "@prisma/driver-adapter-utils": "6.16.3-dev.1",
+    "@prisma/adapter-pg": "6.16.3-dev.1",
+    "@prisma/adapter-mssql": "6.16.3-dev.1"
   },
   "files": [
     "dist"