@prisma/client-engine-runtime 7.5.0-dev.3 → 7.5.0-dev.30

package/dist/index.d.mts

@@ -80,7 +80,7 @@ export declare type DecimalTaggedValue = {
     value: string;
 };
 
-export declare function deserializeJsonResponse(result: unknown): unknown;
+export declare function deserializeJsonObject(result: unknown): unknown;
 
 /**
  * Checks if two objects representing the names and values of key columns match. A match is
@@ -155,6 +155,9 @@ export declare type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+    itemPrefix: string;
+    itemSeparator: string;
+    itemSuffix: string;
 } | {
     type: 'parameterTupleList';
     itemPrefix: string;
@@ -187,7 +190,7 @@ export declare type JoinExpression = {
     isRelationUnique: boolean;
 };
 
-export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue | RawTaggedValue;
 
 export declare type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
 
@@ -421,6 +424,11 @@ export declare type RawResponse = {
     rows: unknown[][];
 };
 
+export declare type RawTaggedValue = {
+    $type: 'Raw';
+    value: unknown;
+};
+
 export declare type ResultNode = {
     type: 'affectedRows';
 } | {
@@ -492,6 +500,7 @@ export declare type TransactionOptions = {
     maxWait?: number;
     timeout?: number;
     isolationLevel?: IsolationLevel;
+    newTxId?: string;
 };
 
 export declare class UserFacingError extends Error {
@@ -511,14 +520,14 @@ export declare class UserFacingError extends Error {
 }
 
 export declare type ValidationError = {
-    error_identifier: 'RELATION_VIOLATION';
+    errorIdentifier: 'RELATION_VIOLATION';
     context: {
         relation: string;
         modelA: string;
         modelB: string;
     };
 } | {
-    error_identifier: 'MISSING_RELATED_RECORD';
+    errorIdentifier: 'MISSING_RELATED_RECORD';
     context: {
         model: string;
         relation: string;
@@ -527,24 +536,24 @@ export declare type ValidationError = {
         neededFor?: string;
     };
 } | {
-    error_identifier: 'MISSING_RECORD';
+    errorIdentifier: 'MISSING_RECORD';
     context: {
         operation: string;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_INPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_INPUT';
     context: {
         expectedRows: number;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_OUTPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_OUTPUT';
     context: {
         expectedRows: number;
         relation: string;
         relationType: string;
     };
 } | {
-    error_identifier: 'RECORDS_NOT_CONNECTED';
+    errorIdentifier: 'RECORDS_NOT_CONNECTED';
     context: {
         relation: string;
         parent: string;

package/dist/index.d.ts

@@ -80,7 +80,7 @@ export declare type DecimalTaggedValue = {
     value: string;
 };
 
-export declare function deserializeJsonResponse(result: unknown): unknown;
+export declare function deserializeJsonObject(result: unknown): unknown;
 
 /**
  * Checks if two objects representing the names and values of key columns match. A match is
@@ -155,6 +155,9 @@ export declare type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+    itemPrefix: string;
+    itemSeparator: string;
+    itemSuffix: string;
 } | {
     type: 'parameterTupleList';
     itemPrefix: string;
@@ -187,7 +190,7 @@ export declare type JoinExpression = {
     isRelationUnique: boolean;
 };
 
-export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue | RawTaggedValue;
 
 export declare type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
 
@@ -421,6 +424,11 @@ export declare type RawResponse = {
     rows: unknown[][];
 };
 
+export declare type RawTaggedValue = {
+    $type: 'Raw';
+    value: unknown;
+};
+
 export declare type ResultNode = {
     type: 'affectedRows';
 } | {
@@ -492,6 +500,7 @@ export declare type TransactionOptions = {
     maxWait?: number;
     timeout?: number;
     isolationLevel?: IsolationLevel;
+    newTxId?: string;
 };
 
 export declare class UserFacingError extends Error {
@@ -511,14 +520,14 @@ export declare class UserFacingError extends Error {
 }
 
 export declare type ValidationError = {
-    error_identifier: 'RELATION_VIOLATION';
+    errorIdentifier: 'RELATION_VIOLATION';
     context: {
         relation: string;
         modelA: string;
         modelB: string;
     };
 } | {
-    error_identifier: 'MISSING_RELATED_RECORD';
+    errorIdentifier: 'MISSING_RELATED_RECORD';
     context: {
         model: string;
         relation: string;
@@ -527,24 +536,24 @@ export declare type ValidationError = {
         neededFor?: string;
     };
 } | {
-    error_identifier: 'MISSING_RECORD';
+    errorIdentifier: 'MISSING_RECORD';
     context: {
         operation: string;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_INPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_INPUT';
     context: {
         expectedRows: number;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_OUTPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_OUTPUT';
     context: {
         expectedRows: number;
         relation: string;
         relationType: string;
     };
 } | {
-    error_identifier: 'RECORDS_NOT_CONNECTED';
+    errorIdentifier: 'RECORDS_NOT_CONNECTED';
     context: {
         relation: string;
         parent: string;

package/dist/index.js

@@ -37,7 +37,7 @@ __export(index_exports, {
   UserFacingError: () => UserFacingError,
   applySqlCommenters: () => applySqlCommenters,
   convertCompactedRows: () => convertCompactedRows,
-  deserializeJsonResponse: () => deserializeJsonResponse,
+  deserializeJsonObject: () => deserializeJsonObject,
   doKeysMatch: () => doKeysMatch,
   isDeepStrictEqual: () => isDeepStrictEqual,
   isPrismaValueGenerator: () => isPrismaValueGenerator,
@@ -170,7 +170,10 @@ function normalizeJsonProtocolValues(result) {
 function isTaggedValue(value) {
   return value !== null && typeof value == "object" && typeof value["$type"] === "string";
 }
-function normalizeTaggedValue({ $type, value }) {
+function normalizeTaggedValue({
+  $type,
+  value
+}) {
   switch ($type) {
     case "BigInt":
       return { $type, value: String(value) };
@@ -182,6 +185,12 @@ function normalizeTaggedValue({ $type, value }) {
       return { $type, value: String(new import_client_runtime_utils2.Decimal(value)) };
     case "Json":
       return { $type, value: JSON.stringify(JSON.parse(value)) };
+    case "Raw":
+      return { $type, value };
+    case "FieldRef":
+      return { $type, value };
+    case "Enum":
+      return { $type, value };
     default:
       assertNever(value, "Unknown tagged value");
   }
@@ -193,12 +202,12 @@ function mapObjectValues(object, mapper) {
   }
   return result;
 }
-function deserializeJsonResponse(result) {
+function deserializeJsonObject(result) {
   if (result === null) {
     return result;
   }
   if (Array.isArray(result)) {
-    return result.map(deserializeJsonResponse);
+    return result.map(deserializeJsonObject);
   }
   if (typeof result === "object") {
     if (isTaggedValue(result)) {
@@ -207,7 +216,7 @@ function deserializeJsonResponse(result) {
     if (result.constructor !== null && result.constructor.name !== "Object") {
       return result;
     }
-    return mapObjectValues(result, deserializeJsonResponse);
+    return mapObjectValues(result, deserializeJsonObject);
   }
   return result;
 }
@@ -225,6 +234,12 @@ function deserializeTaggedValue({ $type, value }) {
       return new import_client_runtime_utils2.Decimal(value);
     case "Json":
       return JSON.parse(value);
+    case "Raw":
+      return value;
+    case "FieldRef":
+      throw new Error("FieldRef tagged values cannot be deserialized to JavaScript values");
+    case "Enum":
+      return value;
     default:
       assertNever(value, "Unknown tagged value");
   }
@@ -456,7 +471,7 @@ function resolveArgPlaceholders(args, placeholderValues) {
 function convertCompactedRows(rows, compiledBatch, placeholderValues = {}) {
   const keysPerRow = rows.map(
     (item) => compiledBatch.keys.reduce((acc, key) => {
-      acc[key] = deserializeJsonResponse(item[key]);
+      acc[key] = deserializeJsonObject(item[key]);
       return acc;
     }, {})
   );
@@ -1121,7 +1136,10 @@ function renderFragment(fragment, placeholderFormat, ctx) {
     case "stringChunk":
       return fragment.chunk;
     case "parameterTuple": {
-      const placeholders = fragment.value.length == 0 ? "NULL" : fragment.value.map(() => formatPlaceholder(placeholderFormat, ctx.placeholderNumber++)).join(",");
+      const placeholders = fragment.value.length == 0 ? "NULL" : fragment.value.map(() => {
+        const item = formatPlaceholder(placeholderFormat, ctx.placeholderNumber++);
+        return `${fragment.itemPrefix}${item}${fragment.itemSuffix}`;
+      }).join(fragment.itemSeparator);
       return `(${placeholders})`;
     }
     case "parameterTupleList": {
@@ -1480,7 +1498,7 @@ function doesSatisfyRule(data, rule) {
   }
 }
 function renderMessage(data, error) {
-  switch (error.error_identifier) {
+  switch (error.errorIdentifier) {
     case "RELATION_VIOLATION":
       return `The change you are trying to make would violate the required relation '${error.context.relation}' between the \`${error.context.modelA}\` and \`${error.context.modelB}\` models.`;
     case "MISSING_RECORD":
@@ -1500,7 +1518,7 @@ function renderMessage(data, error) {
   }
 }
 function getErrorCode2(error) {
-  switch (error.error_identifier) {
+  switch (error.errorIdentifier) {
     case "RELATION_VIOLATION":
       return "P2014";
     case "RECORDS_NOT_CONNECTED":
@@ -2072,13 +2090,42 @@ var TransactionManager = class {
     );
   }
   async #startTransactionImpl(options) {
+    if (options.newTxId) {
+      return await this.#withActiveTransactionLock(options.newTxId, "start", async (existing) => {
+        if (existing.status !== "running") {
+          throw new TransactionInternalConsistencyError(
+            `Transaction in invalid state ${existing.status} when starting a nested transaction.`
+          );
+        }
+        if (!existing.transaction) {
+          throw new TransactionInternalConsistencyError(
+            `Transaction missing underlying driver transaction when starting a nested transaction.`
+          );
+        }
+        existing.depth += 1;
+        const savepointName = this.#nextSavepointName(existing);
+        existing.savepoints.push(savepointName);
+        try {
+          await this.#requiredCreateSavepoint(existing.transaction)(savepointName);
+        } catch (e) {
+          existing.depth -= 1;
+          existing.savepoints.pop();
+          throw e;
+        }
+        return { id: existing.id };
+      });
+    }
     const transaction = {
       id: await randomUUID(),
       status: "waiting",
       timer: void 0,
       timeout: options.timeout,
       startedAt: Date.now(),
-      transaction: void 0
+      transaction: void 0,
+      operationQueue: Promise.resolve(),
+      depth: 1,
+      savepoints: [],
+      savepointCounter: 0
     };
     const abortController = new AbortController();
     const startTimer = createTimeoutIfDefined(() => abortController.abort(), options.maxWait);
@@ -2112,14 +2159,49 @@ var TransactionManager = class {
   }
   async commitTransaction(transactionId) {
     return await this.tracingHelper.runInChildSpan("commit_transaction", async () => {
-      const txw = this.#getActiveOrClosingTransaction(transactionId, "commit");
-      await this.#closeTransaction(txw, "committed");
+      await this.#withActiveTransactionLock(transactionId, "commit", async (txw) => {
+        if (txw.depth > 1) {
+          if (!txw.transaction) throw new TransactionNotFoundError();
+          const savepointName = txw.savepoints.at(-1);
+          if (!savepointName) {
+            throw new TransactionInternalConsistencyError(
+              `Missing savepoint for nested commit. Depth: ${txw.depth}, transactionId: ${txw.id}`
+            );
+          }
+          try {
+            await this.#releaseSavepoint(txw.transaction, savepointName);
+          } finally {
+            txw.savepoints.pop();
+            txw.depth -= 1;
+          }
+          return;
+        }
+        await this.#closeTransaction(txw, "committed");
+      });
     });
   }
   async rollbackTransaction(transactionId) {
     return await this.tracingHelper.runInChildSpan("rollback_transaction", async () => {
-      const txw = this.#getActiveOrClosingTransaction(transactionId, "rollback");
-      await this.#closeTransaction(txw, "rolled_back");
+      await this.#withActiveTransactionLock(transactionId, "rollback", async (txw) => {
+        if (txw.depth > 1) {
+          if (!txw.transaction) throw new TransactionNotFoundError();
+          const savepointName = txw.savepoints.at(-1);
+          if (!savepointName) {
+            throw new TransactionInternalConsistencyError(
+              `Missing savepoint for nested rollback. Depth: ${txw.depth}, transactionId: ${txw.id}`
+            );
+          }
+          try {
+            await this.#requiredRollbackToSavepoint(txw.transaction)(savepointName);
+            await this.#releaseSavepoint(txw.transaction, savepointName);
+          } finally {
+            txw.savepoints.pop();
+            txw.depth -= 1;
+          }
+          return;
+        }
+        await this.#closeTransaction(txw, "rolled_back");
+      });
     });
   }
   async getTransaction(txInfo, operation) {
@@ -2163,22 +2245,90 @@ var TransactionManager = class {
     return transaction;
   }
   async cancelAllTransactions() {
-    await Promise.allSettled([...this.transactions.values()].map((tx) => this.#closeTransaction(tx, "rolled_back")));
+    await Promise.allSettled(
+      [...this.transactions.values()].map(
+        (tx) => this.#runSerialized(tx, async () => {
+          const current = this.transactions.get(tx.id);
+          if (current) {
+            await this.#closeTransaction(current, "rolled_back");
+          }
+        })
+      )
+    );
+  }
+  #nextSavepointName(transaction) {
+    return `prisma_sp_${transaction.savepointCounter++}`;
+  }
+  #requiredCreateSavepoint(transaction) {
+    if (transaction.createSavepoint) {
+      return transaction.createSavepoint.bind(transaction);
+    }
+    throw new TransactionManagerError(
+      `Nested transactions are not supported by adapter "${transaction.adapterName}" (${transaction.provider}): createSavepoint is not implemented.`
+    );
+  }
+  #requiredRollbackToSavepoint(transaction) {
+    if (transaction.rollbackToSavepoint) {
+      return transaction.rollbackToSavepoint.bind(transaction);
+    }
+    throw new TransactionManagerError(
+      `Nested transactions are not supported by adapter "${transaction.adapterName}" (${transaction.provider}): rollbackToSavepoint is not implemented.`
+    );
+  }
+  async #releaseSavepoint(transaction, name) {
+    if (transaction.releaseSavepoint) {
+      await transaction.releaseSavepoint(name);
+    }
+  }
+  #debugTransactionAlreadyClosedOnTimeout(transactionId) {
+    debug("Transaction already committed or rolled back when timeout happened.", transactionId);
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
     const timer = createTimeoutIfDefined(async () => {
       debug("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
       const tx = this.transactions.get(transactionId);
-      if (tx && ["running", "waiting"].includes(tx.status)) {
-        await this.#closeTransaction(tx, "timed_out");
-      } else {
-        debug("Transaction already committed or rolled back when timeout happened.", transactionId);
-      }
+      if (!tx) {
+        this.#debugTransactionAlreadyClosedOnTimeout(transactionId);
+        return;
+      }
+      await this.#runSerialized(tx, async () => {
+        const current = this.transactions.get(transactionId);
+        if (current && ["running", "waiting"].includes(current.status)) {
+          await this.#closeTransaction(current, "timed_out");
+        } else {
+          this.#debugTransactionAlreadyClosedOnTimeout(transactionId);
+        }
+      });
     }, timeout);
     timer?.unref?.();
     return timer;
   }
+  // Any operation that mutates or closes a transaction must run through this lock so
+  // status/savepoint/depth checks and updates happen against a stable view of state.
+  async #withActiveTransactionLock(transactionId, operation, callback) {
+    const tx = this.#getActiveOrClosingTransaction(transactionId, operation);
+    return await this.#runSerialized(tx, async () => {
+      const current = this.#getActiveOrClosingTransaction(transactionId, operation);
+      return await callback(current);
+    });
+  }
+  // Serializes operations per transaction id to prevent interleaving across awaits.
+  // This avoids races where one operation mutates savepoint/depth state while another
+  // operation is suspended, which could otherwise corrupt cleanup logic.
+  async #runSerialized(tx, callback) {
+    const previousOperation = tx.operationQueue;
+    let releaseOperationLock;
+    tx.operationQueue = new Promise((resolve) => {
+      releaseOperationLock = resolve;
+    });
+    await previousOperation;
+    try {
+      return await callback();
+    } finally {
+      releaseOperationLock();
+    }
+  }
   async #closeTransaction(tx, status) {
     const createClosingPromise = async () => {
       debug("Closing transaction.", { transactionId: tx.id, status });
@@ -2266,7 +2416,7 @@ function createTimeoutIfDefined(cb, ms) {
   UserFacingError,
   applySqlCommenters,
   convertCompactedRows,
-  deserializeJsonResponse,
+  deserializeJsonObject,
   doKeysMatch,
   isDeepStrictEqual,
   isPrismaValueGenerator,

package/dist/index.mjs

@@ -119,7 +119,10 @@ function normalizeJsonProtocolValues(result) {
 function isTaggedValue(value) {
   return value !== null && typeof value == "object" && typeof value["$type"] === "string";
 }
-function normalizeTaggedValue({ $type, value }) {
+function normalizeTaggedValue({
+  $type,
+  value
+}) {
   switch ($type) {
     case "BigInt":
       return { $type, value: String(value) };
@@ -131,6 +134,12 @@ function normalizeTaggedValue({ $type, value }) {
       return { $type, value: String(new Decimal2(value)) };
     case "Json":
       return { $type, value: JSON.stringify(JSON.parse(value)) };
+    case "Raw":
+      return { $type, value };
+    case "FieldRef":
+      return { $type, value };
+    case "Enum":
+      return { $type, value };
     default:
       assertNever(value, "Unknown tagged value");
   }
@@ -142,12 +151,12 @@ function mapObjectValues(object, mapper) {
   }
   return result;
 }
-function deserializeJsonResponse(result) {
+function deserializeJsonObject(result) {
   if (result === null) {
     return result;
   }
   if (Array.isArray(result)) {
-    return result.map(deserializeJsonResponse);
+    return result.map(deserializeJsonObject);
   }
   if (typeof result === "object") {
     if (isTaggedValue(result)) {
@@ -156,7 +165,7 @@ function deserializeJsonResponse(result) {
     if (result.constructor !== null && result.constructor.name !== "Object") {
       return result;
     }
-    return mapObjectValues(result, deserializeJsonResponse);
+    return mapObjectValues(result, deserializeJsonObject);
   }
   return result;
 }
@@ -174,6 +183,12 @@ function deserializeTaggedValue({ $type, value }) {
       return new Decimal2(value);
     case "Json":
       return JSON.parse(value);
+    case "Raw":
+      return value;
+    case "FieldRef":
+      throw new Error("FieldRef tagged values cannot be deserialized to JavaScript values");
+    case "Enum":
+      return value;
     default:
       assertNever(value, "Unknown tagged value");
   }
@@ -405,7 +420,7 @@ function resolveArgPlaceholders(args, placeholderValues) {
 function convertCompactedRows(rows, compiledBatch, placeholderValues = {}) {
   const keysPerRow = rows.map(
     (item) => compiledBatch.keys.reduce((acc, key) => {
-      acc[key] = deserializeJsonResponse(item[key]);
+      acc[key] = deserializeJsonObject(item[key]);
       return acc;
     }, {})
   );
@@ -1070,7 +1085,10 @@ function renderFragment(fragment, placeholderFormat, ctx) {
     case "stringChunk":
       return fragment.chunk;
     case "parameterTuple": {
-      const placeholders = fragment.value.length == 0 ? "NULL" : fragment.value.map(() => formatPlaceholder(placeholderFormat, ctx.placeholderNumber++)).join(",");
+      const placeholders = fragment.value.length == 0 ? "NULL" : fragment.value.map(() => {
+        const item = formatPlaceholder(placeholderFormat, ctx.placeholderNumber++);
+        return `${fragment.itemPrefix}${item}${fragment.itemSuffix}`;
+      }).join(fragment.itemSeparator);
       return `(${placeholders})`;
     }
     case "parameterTupleList": {
@@ -1429,7 +1447,7 @@ function doesSatisfyRule(data, rule) {
   }
 }
 function renderMessage(data, error) {
-  switch (error.error_identifier) {
+  switch (error.errorIdentifier) {
     case "RELATION_VIOLATION":
       return `The change you are trying to make would violate the required relation '${error.context.relation}' between the \`${error.context.modelA}\` and \`${error.context.modelB}\` models.`;
     case "MISSING_RECORD":
@@ -1449,7 +1467,7 @@ function renderMessage(data, error) {
   }
 }
 function getErrorCode2(error) {
-  switch (error.error_identifier) {
+  switch (error.errorIdentifier) {
     case "RELATION_VIOLATION":
       return "P2014";
     case "RECORDS_NOT_CONNECTED":
@@ -2021,13 +2039,42 @@ var TransactionManager = class {
     );
   }
   async #startTransactionImpl(options) {
+    if (options.newTxId) {
+      return await this.#withActiveTransactionLock(options.newTxId, "start", async (existing) => {
+        if (existing.status !== "running") {
+          throw new TransactionInternalConsistencyError(
+            `Transaction in invalid state ${existing.status} when starting a nested transaction.`
+          );
+        }
+        if (!existing.transaction) {
+          throw new TransactionInternalConsistencyError(
+            `Transaction missing underlying driver transaction when starting a nested transaction.`
+          );
+        }
+        existing.depth += 1;
+        const savepointName = this.#nextSavepointName(existing);
+        existing.savepoints.push(savepointName);
+        try {
+          await this.#requiredCreateSavepoint(existing.transaction)(savepointName);
+        } catch (e) {
+          existing.depth -= 1;
+          existing.savepoints.pop();
+          throw e;
+        }
+        return { id: existing.id };
+      });
+    }
     const transaction = {
       id: await randomUUID(),
       status: "waiting",
       timer: void 0,
       timeout: options.timeout,
       startedAt: Date.now(),
-      transaction: void 0
+      transaction: void 0,
+      operationQueue: Promise.resolve(),
+      depth: 1,
+      savepoints: [],
+      savepointCounter: 0
     };
     const abortController = new AbortController();
     const startTimer = createTimeoutIfDefined(() => abortController.abort(), options.maxWait);
@@ -2061,14 +2108,49 @@ var TransactionManager = class {
   }
   async commitTransaction(transactionId) {
     return await this.tracingHelper.runInChildSpan("commit_transaction", async () => {
-      const txw = this.#getActiveOrClosingTransaction(transactionId, "commit");
-      await this.#closeTransaction(txw, "committed");
+      await this.#withActiveTransactionLock(transactionId, "commit", async (txw) => {
+        if (txw.depth > 1) {
+          if (!txw.transaction) throw new TransactionNotFoundError();
+          const savepointName = txw.savepoints.at(-1);
+          if (!savepointName) {
+            throw new TransactionInternalConsistencyError(
+              `Missing savepoint for nested commit. Depth: ${txw.depth}, transactionId: ${txw.id}`
+            );
+          }
+          try {
+            await this.#releaseSavepoint(txw.transaction, savepointName);
+          } finally {
+            txw.savepoints.pop();
+            txw.depth -= 1;
+          }
+          return;
+        }
+        await this.#closeTransaction(txw, "committed");
+      });
     });
   }
   async rollbackTransaction(transactionId) {
     return await this.tracingHelper.runInChildSpan("rollback_transaction", async () => {
-      const txw = this.#getActiveOrClosingTransaction(transactionId, "rollback");
-      await this.#closeTransaction(txw, "rolled_back");
+      await this.#withActiveTransactionLock(transactionId, "rollback", async (txw) => {
+        if (txw.depth > 1) {
+          if (!txw.transaction) throw new TransactionNotFoundError();
+          const savepointName = txw.savepoints.at(-1);
+          if (!savepointName) {
+            throw new TransactionInternalConsistencyError(
+              `Missing savepoint for nested rollback. Depth: ${txw.depth}, transactionId: ${txw.id}`
+            );
+          }
+          try {
+            await this.#requiredRollbackToSavepoint(txw.transaction)(savepointName);
+            await this.#releaseSavepoint(txw.transaction, savepointName);
+          } finally {
+            txw.savepoints.pop();
+            txw.depth -= 1;
+          }
+          return;
+        }
+        await this.#closeTransaction(txw, "rolled_back");
+      });
     });
   }
   async getTransaction(txInfo, operation) {
@@ -2112,22 +2194,90 @@ var TransactionManager = class {
     return transaction;
   }
   async cancelAllTransactions() {
-    await Promise.allSettled([...this.transactions.values()].map((tx) => this.#closeTransaction(tx, "rolled_back")));
+    await Promise.allSettled(
+      [...this.transactions.values()].map(
+        (tx) => this.#runSerialized(tx, async () => {
+          const current = this.transactions.get(tx.id);
+          if (current) {
+            await this.#closeTransaction(current, "rolled_back");
+          }
+        })
+      )
+    );
+  }
+  #nextSavepointName(transaction) {
+    return `prisma_sp_${transaction.savepointCounter++}`;
+  }
+  #requiredCreateSavepoint(transaction) {
+    if (transaction.createSavepoint) {
+      return transaction.createSavepoint.bind(transaction);
+    }
+    throw new TransactionManagerError(
+      `Nested transactions are not supported by adapter "${transaction.adapterName}" (${transaction.provider}): createSavepoint is not implemented.`
+    );
+  }
+  #requiredRollbackToSavepoint(transaction) {
+    if (transaction.rollbackToSavepoint) {
+      return transaction.rollbackToSavepoint.bind(transaction);
+    }
+    throw new TransactionManagerError(
+      `Nested transactions are not supported by adapter "${transaction.adapterName}" (${transaction.provider}): rollbackToSavepoint is not implemented.`
+    );
+  }
+  async #releaseSavepoint(transaction, name) {
+    if (transaction.releaseSavepoint) {
+      await transaction.releaseSavepoint(name);
+    }
+  }
+  #debugTransactionAlreadyClosedOnTimeout(transactionId) {
+    debug("Transaction already committed or rolled back when timeout happened.", transactionId);
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
     const timer = createTimeoutIfDefined(async () => {
       debug("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
       const tx = this.transactions.get(transactionId);
-      if (tx && ["running", "waiting"].includes(tx.status)) {
-        await this.#closeTransaction(tx, "timed_out");
-      } else {
-        debug("Transaction already committed or rolled back when timeout happened.", transactionId);
-      }
+      if (!tx) {
+        this.#debugTransactionAlreadyClosedOnTimeout(transactionId);
+        return;
+      }
+      await this.#runSerialized(tx, async () => {
+        const current = this.transactions.get(transactionId);
+        if (current && ["running", "waiting"].includes(current.status)) {
+          await this.#closeTransaction(current, "timed_out");
+        } else {
+          this.#debugTransactionAlreadyClosedOnTimeout(transactionId);
+        }
+      });
     }, timeout);
     timer?.unref?.();
     return timer;
   }
+  // Any operation that mutates or closes a transaction must run through this lock so
+  // status/savepoint/depth checks and updates happen against a stable view of state.
+  async #withActiveTransactionLock(transactionId, operation, callback) {
+    const tx = this.#getActiveOrClosingTransaction(transactionId, operation);
+    return await this.#runSerialized(tx, async () => {
+      const current = this.#getActiveOrClosingTransaction(transactionId, operation);
+      return await callback(current);
+    });
+  }
+  // Serializes operations per transaction id to prevent interleaving across awaits.
+  // This avoids races where one operation mutates savepoint/depth state while another
+  // operation is suspended, which could otherwise corrupt cleanup logic.
+  async #runSerialized(tx, callback) {
+    const previousOperation = tx.operationQueue;
+    let releaseOperationLock;
+    tx.operationQueue = new Promise((resolve) => {
+      releaseOperationLock = resolve;
+    });
+    await previousOperation;
+    try {
+      return await callback();
+    } finally {
+      releaseOperationLock();
+    }
+  }
   async #closeTransaction(tx, status) {
     const createClosingPromise = async () => {
       debug("Closing transaction.", { transactionId: tx.id, status });
@@ -2214,7 +2364,7 @@ export {
   UserFacingError,
   applySqlCommenters,
   convertCompactedRows,
-  deserializeJsonResponse,
+  deserializeJsonObject,
   doKeysMatch,
   isDeepStrictEqual,
   isPrismaValueGenerator,

package/dist/json-protocol.d.ts

@@ -29,10 +29,14 @@ export type JsonTaggedValue = {
     $type: 'Json';
     value: string;
 };
-export type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+export type RawTaggedValue = {
+    $type: 'Raw';
+    value: unknown;
+};
+export type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue | RawTaggedValue;
 export type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
 export type JsOutputValue = null | string | number | boolean | bigint | Uint8Array | Date | Decimal | JsOutputValue[] | {
     [key: string]: JsOutputValue;
 };
 export declare function normalizeJsonProtocolValues(result: unknown): unknown;
-export declare function deserializeJsonResponse(result: unknown): unknown;
+export declare function deserializeJsonObject(result: unknown): unknown;

package/dist/query-plan.d.ts

@@ -56,6 +56,9 @@ export type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+    itemPrefix: string;
+    itemSeparator: string;
+    itemSuffix: string;
 } | {
     type: 'parameterTupleList';
     itemPrefix: string;
@@ -227,14 +230,14 @@ export type DataRule = {
     type: 'never';
 };
 export type ValidationError = {
-    error_identifier: 'RELATION_VIOLATION';
+    errorIdentifier: 'RELATION_VIOLATION';
     context: {
         relation: string;
         modelA: string;
         modelB: string;
     };
 } | {
-    error_identifier: 'MISSING_RELATED_RECORD';
+    errorIdentifier: 'MISSING_RELATED_RECORD';
     context: {
         model: string;
         relation: string;
@@ -243,24 +246,24 @@ export type ValidationError = {
         neededFor?: string;
     };
 } | {
-    error_identifier: 'MISSING_RECORD';
+    errorIdentifier: 'MISSING_RECORD';
     context: {
         operation: string;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_INPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_INPUT';
     context: {
         expectedRows: number;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_OUTPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_OUTPUT';
     context: {
         expectedRows: number;
         relation: string;
         relationType: string;
     };
 } | {
-    error_identifier: 'RECORDS_NOT_CONNECTED';
+    errorIdentifier: 'RECORDS_NOT_CONNECTED';
     context: {
         relation: string;
         parent: string;

package/dist/transaction-manager/transaction.d.ts

@@ -3,6 +3,7 @@ export type Options = {
     maxWait?: number;
     timeout?: number;
     isolationLevel?: IsolationLevel;
+    newTxId?: string;
 };
 export type TransactionInfo = {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "7.5.0-dev.3",
+  "version": "7.5.0-dev.30",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,19 +31,16 @@
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/debug": "7.5.0-dev.3",
-    "@prisma/sqlcommenter": "7.5.0-dev.3",
-    "@prisma/driver-adapter-utils": "7.5.0-dev.3",
-    "@prisma/client-runtime-utils": "7.5.0-dev.3"
+    "@prisma/client-runtime-utils": "7.5.0-dev.30",
+    "@prisma/debug": "7.5.0-dev.30",
+    "@prisma/sqlcommenter": "7.5.0-dev.30",
+    "@prisma/driver-adapter-utils": "7.5.0-dev.30"
   },
   "devDependencies": {
     "@codspeed/benchmark.js-plugin": "4.0.0",
     "@types/benchmark": "2.1.5",
-    "@types/jest": "29.5.14",
     "@types/node": "~20.19.24",
-    "benchmark": "2.1.4",
-    "jest": "29.7.0",
-    "jest-junit": "16.0.0"
+    "benchmark": "2.1.4"
   },
   "files": [
     "dist"
@@ -52,6 +49,6 @@
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",
     "build": "tsx helpers/build.ts",
-    "test": "jest"
+    "test": "vitest run"
   }
 }