@prisma/query-plan-executor 7.10.0-dev.4 → 7.10.0-dev.5

package/dist/index.js

@@ -22009,7 +22009,7 @@ var require_promise = __commonJS({
         return Promise.reject(err);
       }
     };
-    module2.exports.createPool = function createPool2(opts) {
+    module2.exports.createPool = function createPool3(opts) {
       const options = new PoolOptions(opts);
       const pool2 = new PoolPromise(options);
       pool2.on("error", (err) => {
@@ -93473,7 +93473,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.10.0-dev.4";
+var version = "7.10.0-dev.5";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -106490,10 +106490,11 @@ var MariaDbTransaction = class extends MariaDbQueryable {
   }
 };
 var PrismaMariaDbAdapter = class extends MariaDbQueryable {
-  constructor(client, capabilities, mariadbOptions) {
+  constructor(client, capabilities, mariadbOptions, release) {
     super(client, mariadbOptions);
     this.capabilities = capabilities;
     this.mariadbOptions = mariadbOptions;
+    this.release = release;
   }
   executeScript(_script) {
     throw new Error("Not implemented yet");
@@ -106537,7 +106538,7 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
     }
   }
   async dispose() {
-    await this.client.end();
+    return this.release?.();
   }
   underlyingDriver() {
     return this.client;
@@ -106547,47 +106548,73 @@ var PrismaMariaDbAdapterFactory = class {
   provider = "mysql";
   adapterName = name;
   #capabilities;
-  #config;
+  #poolOrConfig;
   #options;
-  constructor(config3, options) {
-    if (typeof config3 === "string") {
-      try {
-        const url2 = new URL(config3);
-        if (!url2.searchParams.has("prepareCacheLength")) {
-          url2.searchParams.set("prepareCacheLength", "0");
-        }
-        this.#config = rewriteConnectionString(url2).toString();
-      } catch (error44) {
-        debug4("Error parsing connection string: %O", error44);
-        this.#config = config3;
-      }
-    } else {
-      if (config3.prepareCacheLength === void 0) {
-        this.#config = { ...config3, prepareCacheLength: 0 };
-      } else {
-        this.#config = config3;
-      }
-    }
+  #externalPoolClaimed = false;
+  /**
+   * Accepts either connection settings for a pool the adapter creates and owns, or an existing
+   * pool. Settings the adapter would normally apply to its own pool (such as defaulting
+   * `prepareCacheLength` to 0) are not applied to an externally created pool.
+   */
+  constructor(poolOrConfig, options) {
+    this.#poolOrConfig = isPool(poolOrConfig) ? { type: "pool", pool: poolOrConfig } : { type: "config", config: normalizeConfig(poolOrConfig) };
     this.#options = options;
   }
   async connect() {
-    let pool2;
-    try {
-      pool2 = mariadb.createPool(this.#config);
-    } catch (error44) {
-      if (error44 instanceof Error && error44.message.startsWith("error parsing connection string")) {
+    const poolOrConfig = this.#poolOrConfig;
+    const ownsPool = poolOrConfig.type === "config" || this.#options?.disposeExternalPool === true;
+    if (poolOrConfig.type === "pool" && ownsPool) {
+      if (this.#externalPoolClaimed) {
         throw new Error(
-          "error parsing connection string, format must be 'mariadb://[<user>[:<password>]@]<host>[:<port>]/[<db>[?<opt1>=<value1>[&<opt2>=<value2>]]]'"
+          "connect() can only be called once when `disposeExternalPool` is true, because the adapter ends the pool it was given and cannot create a replacement from it. Either pass connection settings instead of a pool, or set `disposeExternalPool: false` and end the pool yourself once you no longer need the adapter."
         );
       }
-      throw error44;
+      this.#externalPoolClaimed = true;
     }
+    const pool2 = poolOrConfig.type === "pool" ? poolOrConfig.pool : createPool2(poolOrConfig.config);
     if (this.#capabilities === void 0) {
       this.#capabilities = await getCapabilities(pool2);
     }
-    return new PrismaMariaDbAdapter(pool2, this.#capabilities, this.#options);
+    return new PrismaMariaDbAdapter(pool2, this.#capabilities, this.#options, async () => {
+      if (ownsPool) {
+        await pool2.end();
+      }
+    });
   }
 };
+function isPool(poolOrConfig) {
+  return typeof poolOrConfig === "object" && typeof poolOrConfig.getConnection === "function";
+}
+function normalizeConfig(config3) {
+  if (typeof config3 === "string") {
+    try {
+      const url2 = new URL(config3);
+      if (!url2.searchParams.has("prepareCacheLength")) {
+        url2.searchParams.set("prepareCacheLength", "0");
+      }
+      return rewriteConnectionString(url2).toString();
+    } catch {
+      debug4("Failed to parse the connection string, passing it to the driver as-is");
+      return config3;
+    }
+  }
+  if (config3.prepareCacheLength === void 0) {
+    return { ...config3, prepareCacheLength: 0 };
+  }
+  return config3;
+}
+function createPool2(config3) {
+  try {
+    return mariadb.createPool(config3);
+  } catch (error44) {
+    if (error44 instanceof Error && error44.message.startsWith("error parsing connection string")) {
+      throw new Error(
+        "error parsing connection string, format must be 'mariadb://[<user>[:<password>]@]<host>[:<port>]/[<db>[?<opt1>=<value1>[&<opt2>=<value2>]]]'"
+      );
+    }
+    throw error44;
+  }
+}
 async function getCapabilities(pool2) {
   const tag2 = "[js::getCapabilities]";
   try {

package/package.json

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