@prisma/query-plan-executor 7.4.0-integration-parameterization.22 → 7.4.0

package/dist/index.js

@@ -101325,7 +101325,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.4.0-integration-parameterization.22";
+var version = "7.4.0";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -113886,8 +113886,9 @@ function mapArg(arg, argType) {
   return arg;
 }
 function mapRow(row, fields) {
-  return row.map((value, i2) => {
-    const type2 = fields?.[i2].type;
+  const values = Array.isArray(row) ? row : Object.values(row);
+  return values.map((value, i2) => {
+    const type2 = fields?.[i2]?.type;
     if (value === null) {
       return null;
     }
@@ -114464,25 +114465,66 @@ function mapIsolationLevelFromString(level) {
   }
 }
 var debug5 = Debug("prisma:driver-adapter:mssql:connection-string");
-function extractSchemaFromConnectionString(connectionString) {
-  const withoutProtocol = connectionString.replace(/^sqlserver:\/\//, "");
-  const parts = withoutProtocol.split(";");
-  for (const part of parts) {
-    const [key, value] = part.split("=", 2);
-    if (key?.trim() === "schema") {
-      return value?.trim();
+function splitRespectingBraces(str) {
+  const parts = [];
+  let current = "";
+  let braceDepth = 0;
+  let valueStartIndex = -1;
+  for (let i2 = 0; i2 < str.length; i2++) {
+    const char = str[i2];
+    if (char === "=") {
+      current += char;
+      if (braceDepth === 0) {
+        valueStartIndex = i2 + 1;
+      }
+    } else if (char === "{") {
+      const isFirstCharOfValue = i2 === valueStartIndex;
+      if (isFirstCharOfValue) {
+        braceDepth++;
+      } else if (braceDepth > 0) {
+        throw new Error(`Malformed connection string: nested '{' braces are not supported`);
+      }
+      current += char;
+    } else if (char === "}") {
+      if (braceDepth > 0) {
+        braceDepth--;
+      }
+      current += char;
+    } else if (char === ";" && braceDepth === 0) {
+      parts.push(current);
+      current = "";
+      valueStartIndex = -1;
+    } else {
+      current += char;
     }
   }
-  return void 0;
+  if (current) {
+    parts.push(current);
+  }
+  if (braceDepth !== 0) {
+    throw new Error(`Malformed connection string: unclosed '{' brace (braceDepth=${braceDepth})`);
+  }
+  return parts;
+}
+function unescapeValue(value) {
+  const trimmed = value.trim();
+  if (trimmed.startsWith("{") && trimmed.endsWith("}") && trimmed.length >= 2) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
 }
 function parseConnectionString(connectionString) {
   const withoutProtocol = connectionString.replace(/^sqlserver:\/\//, "");
-  const [hostPart, ...paramParts] = withoutProtocol.split(";");
+  const parts = splitRespectingBraces(withoutProtocol);
+  const [hostPart, ...paramParts] = parts;
   const config3 = {
     server: "",
     options: {},
     pool: {}
   };
+  if (!hostPart || hostPart.trim() === "") {
+    throw new Error("Server host is required in connection string");
+  }
   const [host, portStr] = hostPart.split(":");
   config3.server = host.trim();
   if (portStr) {
@@ -114494,13 +114536,14 @@ function parseConnectionString(connectionString) {
   }
   const parameters = {};
   for (const part of paramParts) {
-    const [key, value] = part.split("=", 2);
+    const [key, ...valueParts] = part.split("=");
     if (!key) continue;
     const trimmedKey = key.trim();
     if (trimmedKey in parameters) {
       throw new Error(`Duplication configuration parameter: ${trimmedKey}`);
     }
-    parameters[trimmedKey] = value.trim();
+    const value = valueParts.join("=");
+    parameters[trimmedKey] = unescapeValue(value);
     if (!handledParameters.includes(trimmedKey)) {
       debug5(`Unknown connection string parameter: ${trimmedKey}`);
     }
@@ -114591,7 +114634,8 @@ function parseConnectionString(connectionString) {
   if (!config3.server || config3.server.trim() === "") {
     throw new Error("Server host is required in connection string");
   }
-  return config3;
+  const schema = firstKey(parameters, "schema") ?? void 0;
+  return { config: config3, schema };
 }
 function parseAuthenticationOptions(parameters, authenticationValue) {
   switch (authenticationValue) {
@@ -114685,6 +114729,7 @@ var handledParameters = [
   "password",
   "poolTimeout",
   "pwd",
+  "schema",
   "socketTimeout",
   "trustServerCertificate",
   "uid",
@@ -115077,17 +115122,27 @@ var MssqlTransaction = class extends MssqlQueryable {
   }
   async commit() {
     debug22(`[js::commit]`);
-    await this.transaction.commit();
+    const release2 = await this.#mutex.acquire();
+    try {
+      await this.transaction.commit();
+    } finally {
+      release2();
+    }
   }
   async rollback() {
     debug22(`[js::rollback]`);
-    await this.transaction.rollback().catch((e2) => {
-      if (e2.code === "EABORT") {
-        debug22(`[js::rollback] Transaction already aborted`);
-        return;
-      }
-      throw e2;
-    });
+    const release2 = await this.#mutex.acquire();
+    try {
+      await this.transaction.rollback().catch((e2) => {
+        if (e2.code === "EABORT") {
+          debug22(`[js::rollback] Transaction already aborted`);
+          return;
+        }
+        throw e2;
+      });
+    } finally {
+      release2();
+    }
   }
 };
 var PrismaMssqlAdapter = class extends MssqlQueryable {
@@ -115138,11 +115193,11 @@ var PrismaMssqlAdapterFactory = class {
   #options;
   constructor(configOrString, options) {
     if (typeof configOrString === "string") {
-      this.#config = parseConnectionString(configOrString);
-      const extractedSchema = extractSchemaFromConnectionString(configOrString);
+      const { config: config3, schema } = parseConnectionString(configOrString);
+      this.#config = config3;
       this.#options = {
         ...options,
-        schema: options?.schema ?? extractedSchema
+        schema: options?.schema ?? schema
       };
     } else {
       this.#config = configOrString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "7.4.0-integration-parameterization.22",
+  "version": "7.4.0",
   "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-mariadb": "7.4.0-integration-parameterization.22",
-    "@prisma/adapter-mssql": "7.4.0-integration-parameterization.22",
-    "@prisma/adapter-pg": "7.4.0-integration-parameterization.22",
-    "@prisma/driver-adapter-utils": "7.4.0-integration-parameterization.22",
-    "@prisma/client-engine-runtime": "7.4.0-integration-parameterization.22"
+    "@prisma/adapter-pg": "7.4.0",
+    "@prisma/adapter-mariadb": "7.4.0",
+    "@prisma/client-engine-runtime": "7.4.0",
+    "@prisma/adapter-mssql": "7.4.0",
+    "@prisma/driver-adapter-utils": "7.4.0"
   },
   "files": [
     "dist"