@prisma/adapter-mssql 7.4.0-integration-parameterization.22 → 7.5.0-dev.1

package/dist/index.js

@@ -63,25 +63,66 @@ function mapIsolationLevelFromString(level) {
   }
 }
 var debug = (0, import_driver_adapter_utils.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 i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (char === "=") {
+      current += char;
+      if (braceDepth === 0) {
+        valueStartIndex = i + 1;
+      }
+    } else if (char === "{") {
+      const isFirstCharOfValue = i === 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 config = {
     server: "",
     options: {},
     pool: {}
   };
+  if (!hostPart || hostPart.trim() === "") {
+    throw new Error("Server host is required in connection string");
+  }
   const [host, portStr] = hostPart.split(":");
   config.server = host.trim();
   if (portStr) {
@@ -93,13 +134,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)) {
       debug(`Unknown connection string parameter: ${trimmedKey}`);
     }
@@ -190,7 +232,8 @@ function parseConnectionString(connectionString) {
   if (!config.server || config.server.trim() === "") {
     throw new Error("Server host is required in connection string");
   }
-  return config;
+  const schema = firstKey(parameters, "schema") ?? void 0;
+  return { config, schema };
 }
 function parseAuthenticationOptions(parameters, authenticationValue) {
   switch (authenticationValue) {
@@ -284,6 +327,7 @@ var handledParameters = [
   "password",
   "poolTimeout",
   "pwd",
+  "schema",
   "socketTimeout",
   "trustServerCertificate",
   "uid",
@@ -684,17 +728,27 @@ var MssqlTransaction = class extends MssqlQueryable {
   }
   async commit() {
     debug2(`[js::commit]`);
-    await this.transaction.commit();
+    const release = await this.#mutex.acquire();
+    try {
+      await this.transaction.commit();
+    } finally {
+      release();
+    }
   }
   async rollback() {
     debug2(`[js::rollback]`);
-    await this.transaction.rollback().catch((e) => {
-      if (e.code === "EABORT") {
-        debug2(`[js::rollback] Transaction already aborted`);
-        return;
-      }
-      throw e;
-    });
+    const release = await this.#mutex.acquire();
+    try {
+      await this.transaction.rollback().catch((e) => {
+        if (e.code === "EABORT") {
+          debug2(`[js::rollback] Transaction already aborted`);
+          return;
+        }
+        throw e;
+      });
+    } finally {
+      release();
+    }
   }
 };
 var PrismaMssqlAdapter = class extends MssqlQueryable {
@@ -745,11 +799,11 @@ var PrismaMssqlAdapterFactory = class {
   #options;
   constructor(configOrString, options) {
     if (typeof configOrString === "string") {
-      this.#config = parseConnectionString(configOrString);
-      const extractedSchema = extractSchemaFromConnectionString(configOrString);
+      const { config, schema } = parseConnectionString(configOrString);
+      this.#config = config;
       this.#options = {
         ...options,
-        schema: options?.schema ?? extractedSchema
+        schema: options?.schema ?? schema
       };
     } else {
       this.#config = configOrString;

package/dist/index.mjs

@@ -30,25 +30,66 @@ function mapIsolationLevelFromString(level) {
   }
 }
 var debug = 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 i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (char === "=") {
+      current += char;
+      if (braceDepth === 0) {
+        valueStartIndex = i + 1;
+      }
+    } else if (char === "{") {
+      const isFirstCharOfValue = i === 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 config = {
     server: "",
     options: {},
     pool: {}
   };
+  if (!hostPart || hostPart.trim() === "") {
+    throw new Error("Server host is required in connection string");
+  }
   const [host, portStr] = hostPart.split(":");
   config.server = host.trim();
   if (portStr) {
@@ -60,13 +101,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)) {
       debug(`Unknown connection string parameter: ${trimmedKey}`);
     }
@@ -157,7 +199,8 @@ function parseConnectionString(connectionString) {
   if (!config.server || config.server.trim() === "") {
     throw new Error("Server host is required in connection string");
   }
-  return config;
+  const schema = firstKey(parameters, "schema") ?? void 0;
+  return { config, schema };
 }
 function parseAuthenticationOptions(parameters, authenticationValue) {
   switch (authenticationValue) {
@@ -251,6 +294,7 @@ var handledParameters = [
   "password",
   "poolTimeout",
   "pwd",
+  "schema",
   "socketTimeout",
   "trustServerCertificate",
   "uid",
@@ -654,17 +698,27 @@ var MssqlTransaction = class extends MssqlQueryable {
   }
   async commit() {
     debug2(`[js::commit]`);
-    await this.transaction.commit();
+    const release = await this.#mutex.acquire();
+    try {
+      await this.transaction.commit();
+    } finally {
+      release();
+    }
   }
   async rollback() {
     debug2(`[js::rollback]`);
-    await this.transaction.rollback().catch((e) => {
-      if (e.code === "EABORT") {
-        debug2(`[js::rollback] Transaction already aborted`);
-        return;
-      }
-      throw e;
-    });
+    const release = await this.#mutex.acquire();
+    try {
+      await this.transaction.rollback().catch((e) => {
+        if (e.code === "EABORT") {
+          debug2(`[js::rollback] Transaction already aborted`);
+          return;
+        }
+        throw e;
+      });
+    } finally {
+      release();
+    }
   }
 };
 var PrismaMssqlAdapter = class extends MssqlQueryable {
@@ -715,11 +769,11 @@ var PrismaMssqlAdapterFactory = class {
   #options;
   constructor(configOrString, options) {
     if (typeof configOrString === "string") {
-      this.#config = parseConnectionString(configOrString);
-      const extractedSchema = extractSchemaFromConnectionString(configOrString);
+      const { config, schema } = parseConnectionString(configOrString);
+      this.#config = config;
       this.#options = {
         ...options,
-        schema: options?.schema ?? extractedSchema
+        schema: options?.schema ?? schema
       };
     } else {
       this.#config = configOrString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-mssql",
-  "version": "7.4.0-integration-parameterization.22",
+  "version": "7.5.0-dev.1",
   "description": "Prisma's driver adapter for \"mssql\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,7 +33,7 @@
   "dependencies": {
     "mssql": "^12.2.0",
     "async-mutex": "0.5.0",
-    "@prisma/driver-adapter-utils": "7.4.0-integration-parameterization.22"
+    "@prisma/driver-adapter-utils": "7.5.0-dev.1"
   },
   "devDependencies": {
     "@types/mssql": "9.1.8"