@prisma/client-engine-runtime 7.5.0-dev.5 → 7.5.0-dev.50

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;
     }, {})
   );
@@ -742,6 +757,9 @@ function normalizeDateTime(dt) {
   return dtWithTz;
 }
 
+// src/interpreter/query-interpreter.ts
+var import_klona2 = require("klona");
+
 // src/sql-commenter.ts
 var import_klona = require("klona");
 function formatSqlComment(tags) {
@@ -1025,8 +1043,11 @@ function paginateSingleList(list, { cursor, skip, take }) {
   const end = take !== null ? start + take : list.length;
   return list.slice(start, end);
 }
-function getRecordKey(record, fields) {
-  return JSON.stringify(fields.map((field) => record[field]));
+function getRecordKey(record, fields, mappers) {
+  const array = fields.map(
+    (field, index) => mappers?.[index] ? record[field] !== null ? mappers[index](record[field]) : null : record[field]
+  );
+  return JSON.stringify(array);
 }
 
 // src/query-plan.ts
@@ -1063,7 +1084,11 @@ function evaluateArg(arg, scope, generators) {
       if (found === void 0) {
         throw new Error(`Missing value for query variable ${arg.prisma__value.name}`);
       }
-      arg = found;
+      if (arg.prisma__value.type === "DateTime" && typeof found === "string") {
+        arg = new Date(found);
+      } else {
+        arg = found;
+      }
     } else if (isPrismaValueGenerator(arg)) {
       const { name, args } = arg.prisma__value;
       const generator = generators[name];
@@ -1121,7 +1146,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 +1508,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 +1528,7 @@ function renderMessage(data, error) {
   }
 }
 function getErrorCode2(error) {
-  switch (error.error_identifier) {
+  switch (error.errorIdentifier) {
     case "RELATION_VIOLATION":
       return "P2014";
     case "RECORDS_NOT_CONNECTED":
@@ -1615,7 +1643,7 @@ var QueryInterpreter = class _QueryInterpreter {
           sum += await this.#withQuerySpanAndEvent(
             commentedQuery,
             context.queryable,
-            () => context.queryable.executeRaw(commentedQuery).catch(
+            () => context.queryable.executeRaw(cloneObject(commentedQuery)).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1630,7 +1658,7 @@ var QueryInterpreter = class _QueryInterpreter {
           const result = await this.#withQuerySpanAndEvent(
             commentedQuery,
             context.queryable,
-            () => context.queryable.queryRaw(commentedQuery).catch(
+            () => context.queryable.queryRaw(cloneObject(commentedQuery)).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1682,7 +1710,7 @@ var QueryInterpreter = class _QueryInterpreter {
             childRecords: (await this.interpretNode(joinExpr.child, context)).value
           }))
         );
-        return { value: attachChildrenToParents(parent, children), lastInsertId };
+        return { value: attachChildrenToParents(parent, children, node.args.canAssumeStrictEquality), lastInsertId };
       }
       case "transaction": {
         if (!context.transactionManager.enabled) {
@@ -1729,8 +1757,9 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "process": {
         const { value, lastInsertId } = await this.interpretNode(node.args.expr, context);
-        evaluateProcessingParameters(node.args.operations, context.scope, context.generators);
-        return { value: processRecords(value, node.args.operations), lastInsertId };
+        const ops = cloneObject(node.args.operations);
+        evaluateProcessingParameters(ops, context.scope, context.generators);
+        return { value: processRecords(value, ops), lastInsertId };
       }
       case "initializeRecord": {
         const { lastInsertId } = await this.interpretNode(node.args.expr, context);
@@ -1823,12 +1852,13 @@ function mapField2(value, field) {
   }
   return value;
 }
-function attachChildrenToParents(parentRecords, children) {
+function attachChildrenToParents(parentRecords, children, canAssumeStrictEquality) {
   for (const { joinExpr, childRecords } of children) {
     const parentKeys = joinExpr.on.map(([k]) => k);
     const childKeys = joinExpr.on.map(([, k]) => k);
     const parentMap = {};
-    for (const parent of Array.isArray(parentRecords) ? parentRecords : [parentRecords]) {
+    const parentArray = Array.isArray(parentRecords) ? parentRecords : [parentRecords];
+    for (const parent of parentArray) {
       const parentRecord = asRecord(parent);
       const key = getRecordKey(parentRecord, parentKeys);
       if (!parentMap[key]) {
@@ -1841,11 +1871,12 @@ function attachChildrenToParents(parentRecords, children) {
         parentRecord[joinExpr.parentField] = [];
       }
     }
+    const mappers = canAssumeStrictEquality ? void 0 : inferKeyCasts(parentArray, parentKeys);
     for (const childRecord of Array.isArray(childRecords) ? childRecords : [childRecords]) {
       if (childRecord === null) {
         continue;
       }
-      const key = getRecordKey(asRecord(childRecord), childKeys);
+      const key = getRecordKey(asRecord(childRecord), childKeys, mappers);
       for (const parentRecord of parentMap[key] ?? []) {
         if (joinExpr.isRelationUnique) {
           parentRecord[joinExpr.parentField] = childRecord;
@@ -1857,6 +1888,40 @@ function attachChildrenToParents(parentRecords, children) {
   }
   return parentRecords;
 }
+function inferKeyCasts(rows, keys) {
+  function getKeyCast(type) {
+    switch (type) {
+      case "number":
+        return Number;
+      case "string":
+        return String;
+      case "boolean":
+        return Boolean;
+      case "bigint":
+        return BigInt;
+      default:
+        return;
+    }
+  }
+  const keyCasts = Array.from({ length: keys.length });
+  let keysFound = 0;
+  for (const parent of rows) {
+    const parentRecord = asRecord(parent);
+    for (const [i, key] of keys.entries()) {
+      if (parentRecord[key] !== null && keyCasts[i] === void 0) {
+        const keyCast = getKeyCast(typeof parentRecord[key]);
+        if (keyCast !== void 0) {
+          keyCasts[i] = keyCast;
+        }
+        keysFound++;
+      }
+    }
+    if (keysFound === keys.length) {
+      break;
+    }
+  }
+  return keyCasts;
+}
 function evalFieldInitializer(initializer, lastInsertId, scope, generators) {
   switch (initializer.type) {
     case "value":
@@ -1916,6 +1981,9 @@ function evaluateProcessingParameters(ops, scope, generators) {
     evaluateProcessingParameters(nested, scope, generators);
   }
 }
+function cloneObject(value) {
+  return (0, import_klona2.klona)(value);
+}
 
 // src/raw-json-protocol.ts
 var import_client_runtime_utils4 = require("@prisma/client-runtime-utils");
@@ -2072,13 +2140,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 +2209,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 +2295,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 +2466,7 @@ function createTimeoutIfDefined(cb, ms) {
   UserFacingError,
   applySqlCommenters,
   convertCompactedRows,
-  deserializeJsonResponse,
+  deserializeJsonObject,
   doKeysMatch,
   isDeepStrictEqual,
   isPrismaValueGenerator,