@prisma/query-plan-executor 7.5.0-dev.3 → 7.5.0-dev.31

package/dist/index.d.ts

@@ -668,6 +668,7 @@ json: {
 timeout?: number | undefined;
 maxWait?: number | undefined;
 isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SNAPSHOT" | "SERIALIZABLE" | undefined;
+newTxId?: string | undefined;
 };
 };
 output: {
@@ -844,6 +845,10 @@ declare interface ExecutionContext {
      * For compatibility with Wrangler 4.x.
      */
     props: any;
+    /**
+     * For compatibility with Wrangler 4.x.
+     */
+    exports?: any;
 }
 
 /**
@@ -955,6 +960,9 @@ declare type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+    itemPrefix: string;
+    itemSeparator: string;
+    itemSuffix: string;
 } | {
     type: 'parameterTupleList';
     itemPrefix: string;
@@ -2406,7 +2414,7 @@ declare interface Queryable<Query, Result> extends AdapterInfo {
 declare type QueryEvent = {
     timestamp: Date;
     query: string;
-    params: unknown[];
+    params: readonly unknown[];
     duration: number;
 };
 
@@ -2477,6 +2485,7 @@ declare type QueryPlanNode = {
     args: {
         parent: QueryPlanNode;
         children: JoinExpression[];
+        canAssumeStrictEquality: boolean;
     };
 } | {
     type: 'mapField';
@@ -3248,6 +3257,18 @@ declare interface Transaction extends AdapterInfo, SqlQueryable {
      * Roll back the transaction.
      */
     rollback(): Promise<void>;
+    /**
+     * Creates a savepoint within the currently running transaction.
+     */
+    createSavepoint?(name: string): Promise<void>;
+    /**
+     * Rolls back transaction state to a previously created savepoint.
+     */
+    rollbackToSavepoint?(name: string): Promise<void>;
+    /**
+     * Releases a previously created savepoint. Optional because not every connector supports this operation.
+     */
+    releaseSavepoint?(name: string): Promise<void>;
 }
 
 declare type TransactionInfo = {
@@ -3289,6 +3310,7 @@ declare type TransactionOptions_2 = {
     maxWait?: number;
     timeout?: number;
     isolationLevel?: IsolationLevel;
+    newTxId?: string;
 };
 
 declare type TypedResponse<T = unknown, U extends StatusCode = StatusCode, F extends ResponseFormat = T extends string ? 'text' : T extends JSONValue ? 'json' : ResponseFormat> = {
@@ -3312,14 +3334,14 @@ declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) e
 declare type UnofficialStatusCode = -1;
 
 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;
@@ -3328,24 +3350,24 @@ 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

@@ -101325,7 +101325,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.5.0-dev.3";
+var version = "7.5.0-dev.31";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -106189,7 +106189,7 @@ function createConsoleLogger(logFormat, logLevel) {
   return new Logger(sink);
 }
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/url.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/utils/url.js
 var splitPath = (path3) => {
   const paths = path3.split("/");
   if (paths[0] === "") {
@@ -106264,9 +106264,11 @@ var getPath = (request3) => {
     const charCode = url2.charCodeAt(i2);
     if (charCode === 37) {
       const queryIndex = url2.indexOf("?", i2);
-      const path3 = url2.slice(start, queryIndex === -1 ? void 0 : queryIndex);
+      const hashIndex = url2.indexOf("#", i2);
+      const end = queryIndex === -1 ? hashIndex === -1 ? void 0 : hashIndex : hashIndex === -1 ? queryIndex : Math.min(queryIndex, hashIndex);
+      const path3 = url2.slice(start, end);
       return tryDecodeURI(path3.includes("%25") ? path3.replace(/%25/g, "%2525") : path3);
-    } else if (charCode === 63) {
+    } else if (charCode === 63 || charCode === 35) {
       break;
     }
   }
@@ -106391,7 +106393,7 @@ var getQueryParams = (url2, key) => {
 };
 var decodeURIComponent_ = decodeURIComponent;
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/cookie.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/utils/cookie.js
 var validCookieNameRegEx = /^[\w!#$%&'*.^`|~+-]+$/;
 var validCookieValueRegEx = /^[ !#-:<-[\]-~]*$/;
 var parse = (cookie, name6) => {
@@ -106424,7 +106426,7 @@ var parse = (cookie, name6) => {
   return parsedCookie;
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/helper/cookie/index.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/helper/cookie/index.js
 var getCookie = (c2, key, prefix) => {
   const cookie = c2.req.raw.headers.get("Cookie");
   if (typeof key === "string") {
@@ -106447,7 +106449,7 @@ var getCookie = (c2, key, prefix) => {
   return obj;
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/http-exception.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/http-exception.js
 var HTTPException = class extends Error {
   res;
   status;
@@ -106480,7 +106482,7 @@ var HTTPException = class extends Error {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/buffer.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/utils/buffer.js
 var bufferToFormData = (arrayBuffer, contentType) => {
   const response = new Response(arrayBuffer, {
     headers: {
@@ -106490,7 +106492,7 @@ var bufferToFormData = (arrayBuffer, contentType) => {
   return response.formData();
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/validator/validator.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/validator/validator.js
 var jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/;
 var multipartRegex = /^multipart\/form-data(;\s?boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/;
 var urlencodedRegex = /^application\/x-www-form-urlencoded(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/;
@@ -106571,7 +106573,7 @@ var validator = (target, validationFunc) => {
   };
 };
 
-// ../../node_modules/.pnpm/@hono+zod-validator@0.7.2_hono@4.11.7_zod@4.1.3/node_modules/@hono/zod-validator/dist/index.js
+// ../../node_modules/.pnpm/@hono+zod-validator@0.7.2_hono@4.12.0_zod@4.1.3/node_modules/@hono/zod-validator/dist/index.js
 var zValidator = (target, schema, hook, options) => (
   // @ts-expect-error not typed well
   validator(target, async (value, c2) => {
@@ -109757,7 +109759,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) };
@@ -109769,6 +109774,12 @@ function normalizeTaggedValue({ $type, value }) {
       return { $type, value: String(new 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");
   }
@@ -110487,8 +110498,11 @@ function paginateSingleList(list, { cursor, skip, take }) {
   const end = take !== null ? start + take : list.length;
   return list.slice(start, end);
 }
-function getRecordKey(record2, fields) {
-  return JSON.stringify(fields.map((field) => record2[field]));
+function getRecordKey(record2, fields, mappers) {
+  const array2 = fields.map(
+    (field, index) => mappers?.[index] ? record2[field] !== null ? mappers[index](record2[field]) : null : record2[field]
+  );
+  return JSON.stringify(array2);
 }
 function isPrismaValuePlaceholder(value) {
   return typeof value === "object" && value !== null && value["prisma__type"] === "param";
@@ -110579,7 +110593,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": {
@@ -110933,7 +110950,7 @@ function doesSatisfyRule(data, rule) {
   }
 }
 function renderMessage(data, error44) {
-  switch (error44.error_identifier) {
+  switch (error44.errorIdentifier) {
     case "RELATION_VIOLATION":
       return `The change you are trying to make would violate the required relation '${error44.context.relation}' between the \`${error44.context.modelA}\` and \`${error44.context.modelB}\` models.`;
     case "MISSING_RECORD":
@@ -110953,7 +110970,7 @@ function renderMessage(data, error44) {
   }
 }
 function getErrorCode2(error44) {
-  switch (error44.error_identifier) {
+  switch (error44.errorIdentifier) {
     case "RELATION_VIOLATION":
       return "P2014";
     case "RECORDS_NOT_CONNECTED":
@@ -111066,7 +111083,7 @@ var QueryInterpreter = class _QueryInterpreter {
           sum2 += await this.#withQuerySpanAndEvent(
             commentedQuery,
             context2.queryable,
-            () => context2.queryable.executeRaw(commentedQuery).catch(
+            () => context2.queryable.executeRaw(cloneObject(commentedQuery)).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -111081,7 +111098,7 @@ var QueryInterpreter = class _QueryInterpreter {
           const result = await this.#withQuerySpanAndEvent(
             commentedQuery,
             context2.queryable,
-            () => context2.queryable.queryRaw(commentedQuery).catch(
+            () => context2.queryable.queryRaw(cloneObject(commentedQuery)).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -111133,7 +111150,7 @@ var QueryInterpreter = class _QueryInterpreter {
             childRecords: (await this.interpretNode(joinExpr.child, context2)).value
           }))
         );
-        return { value: attachChildrenToParents(parent, children), lastInsertId };
+        return { value: attachChildrenToParents(parent, children, node.args.canAssumeStrictEquality), lastInsertId };
       }
       case "transaction": {
         if (!context2.transactionManager.enabled) {
@@ -111180,8 +111197,9 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "process": {
         const { value, lastInsertId } = await this.interpretNode(node.args.expr, context2);
-        evaluateProcessingParameters(node.args.operations, context2.scope, context2.generators);
-        return { value: processRecords(value, node.args.operations), lastInsertId };
+        const ops = cloneObject(node.args.operations);
+        evaluateProcessingParameters(ops, context2.scope, context2.generators);
+        return { value: processRecords(value, ops), lastInsertId };
       }
       case "initializeRecord": {
         const { lastInsertId } = await this.interpretNode(node.args.expr, context2);
@@ -111274,12 +111292,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(([k2]) => k2);
     const childKeys = joinExpr.on.map(([, k2]) => k2);
     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]) {
@@ -111292,11 +111311,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;
@@ -111308,6 +111328,40 @@ function attachChildrenToParents(parentRecords, children) {
   }
   return parentRecords;
 }
+function inferKeyCasts(rows, keys) {
+  function getKeyCast(type2) {
+    switch (type2) {
+      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 [i2, key] of keys.entries()) {
+      if (parentRecord[key] !== null && keyCasts[i2] === void 0) {
+        const keyCast = getKeyCast(typeof parentRecord[key]);
+        if (keyCast !== void 0) {
+          keyCasts[i2] = keyCast;
+        }
+        keysFound++;
+      }
+    }
+    if (keysFound === keys.length) {
+      break;
+    }
+  }
+  return keyCasts;
+}
 function evalFieldInitializer(initializer3, lastInsertId, scope, generators) {
   switch (initializer3.type) {
     case "value":
@@ -111367,6 +111421,9 @@ function evaluateProcessingParameters(ops, scope, generators) {
     evaluateProcessingParameters(nested, scope, generators);
   }
 }
+function cloneObject(value) {
+  return klona(value);
+}
 async function getCrypto() {
   return globalThis.crypto ?? await import("node:crypto");
 }
@@ -111483,13 +111540,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 (e2) {
+          existing.depth -= 1;
+          existing.savepoints.pop();
+          throw e2;
+        }
+        return { id: existing.id };
+      });
+    }
     const transaction = {
       id: await randomUUID2(),
       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);
@@ -111523,14 +111609,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) {
@@ -111574,22 +111695,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, name6) {
+    if (transaction.releaseSavepoint) {
+      await transaction.releaseSavepoint(name6);
+    }
+  }
+  #debugTransactionAlreadyClosedOnTimeout(transactionId) {
+    debug3("Transaction already committed or rolled back when timeout happened.", transactionId);
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
     const timer = createTimeoutIfDefined(async () => {
       debug3("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 {
-        debug3("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 () => {
       debug3("Closing transaction.", { transactionId: tx.id, status });
@@ -111669,7 +111858,7 @@ function createTimeoutIfDefined(cb, ms) {
   return ms !== void 0 ? setTimeout(cb, ms) : void 0;
 }
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/compose.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
   return (context2, next) => {
     let index = -1;
@@ -111713,10 +111902,10 @@ var compose = (middleware, onError, onNotFound) => {
   };
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/request/constants.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/request/constants.js
 var GET_MATCH_RESULT = /* @__PURE__ */ Symbol();
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/body.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/utils/body.js
 var parseBody = async (request3, options = /* @__PURE__ */ Object.create(null)) => {
   const { all = false, dot = false } = options;
   const headers = request3 instanceof HonoRequest ? request3.raw.headers : request3.headers;
@@ -111785,7 +111974,7 @@ var handleParsingNestedValues = (form, key, value) => {
   });
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/request.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/request.js
 var tryDecodeURIComponent = (str) => tryDecode(str, decodeURIComponent_);
 var HonoRequest = class {
   /**
@@ -112053,7 +112242,7 @@ var HonoRequest = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/html.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1,
   BeforeStream: 2,
@@ -112095,7 +112284,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context2, buffer) =>
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/context.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/context.js
 var TEXT_PLAIN = "text/plain; charset=UTF-8";
 var setDefaultContentType = (contentType, headers) => {
   return {
@@ -112103,6 +112292,7 @@ var setDefaultContentType = (contentType, headers) => {
     ...headers
   };
 };
+var createResponseInstance = (body, init3) => new Response(body, init3);
 var Context = class {
   #rawRequest;
   #req;
@@ -112201,7 +112391,7 @@ var Context = class {
    * The Response object for the current request.
    */
   get res() {
-    return this.#res ||= new Response(null, {
+    return this.#res ||= createResponseInstance(null, {
       headers: this.#preparedHeaders ??= new Headers()
     });
   }
@@ -112212,7 +112402,7 @@ var Context = class {
    */
   set res(_res) {
     if (this.#res && _res) {
-      _res = new Response(_res.body, _res);
+      _res = createResponseInstance(_res.body, _res);
       for (const [k2, v2] of this.#res.headers.entries()) {
         if (k2 === "content-type") {
           continue;
@@ -112302,7 +112492,7 @@ var Context = class {
    */
   header = (name6, value, options) => {
     if (this.finalized) {
-      this.#res = new Response(this.#res.body, this.#res);
+      this.#res = createResponseInstance(this.#res.body, this.#res);
     }
     const headers = this.#res ? this.#res.headers : this.#preparedHeaders ??= new Headers();
     if (value === void 0) {
@@ -112391,7 +112581,7 @@ var Context = class {
       }
     }
     const status = typeof arg === "number" ? arg : arg?.status ?? this.#status;
-    return new Response(data, { status, headers: responseHeaders });
+    return createResponseInstance(data, { status, headers: responseHeaders });
   }
   newResponse = (...args) => this.#newResponse(...args);
   /**
@@ -112416,6 +112606,9 @@ var Context = class {
    * ```
    */
   body = (data, arg, headers) => this.#newResponse(data, arg, headers);
+  #useFastPath() {
+    return !this.#preparedHeaders && !this.#status && !this.finalized;
+  }
   /**
    * `.text()` can render text as `Content-Type:text/plain`.
    *
@@ -112429,7 +112622,7 @@ var Context = class {
    * ```
    */
   text = (text, arg, headers) => {
-    return !this.#preparedHeaders && !this.#status && !arg && !headers && !this.finalized ? new Response(text) : this.#newResponse(
+    return this.#useFastPath() && !arg && !headers ? createResponseInstance(text) : this.#newResponse(
       text,
       arg,
       setDefaultContentType(TEXT_PLAIN, headers)
@@ -112448,7 +112641,7 @@ var Context = class {
    * ```
    */
   json = (object2, arg, headers) => {
-    return this.#newResponse(
+    return this.#useFastPath() && !arg && !headers ? Response.json(object2) : this.#newResponse(
       JSON.stringify(object2),
       arg,
       setDefaultContentType("application/json", headers)
@@ -112496,12 +112689,12 @@ var Context = class {
    * ```
    */
   notFound = () => {
-    this.#notFoundHandler ??= () => new Response();
+    this.#notFoundHandler ??= () => createResponseInstance();
     return this.#notFoundHandler(this);
   };
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router.js
 var METHOD_NAME_ALL = "ALL";
 var METHOD_NAME_ALL_LOWERCASE = "all";
 var METHODS = ["get", "post", "put", "delete", "options", "patch"];
@@ -112509,10 +112702,10 @@ var MESSAGE_MATCHER_IS_ALREADY_BUILT = "Can not add a route since the matcher is
 var UnsupportedPathError = class extends Error {
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/constants.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/utils/constants.js
 var COMPOSED_HANDLER = "__COMPOSED_HANDLER";
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/hono-base.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/hono-base.js
 var notFoundHandler = (c2) => {
   return c2.text("404 Not Found", 404);
 };
@@ -112883,7 +113076,7 @@ var Hono = class _Hono {
   };
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router/reg-exp-router/matcher.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router/reg-exp-router/matcher.js
 var emptyParam = [];
 function match(method, path3) {
   const matchers = this.buildAllMatchers();
@@ -112904,7 +113097,7 @@ function match(method, path3) {
   return match2(method, path3);
 }
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router/reg-exp-router/node.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router/reg-exp-router/node.js
 var LABEL_REG_EXP_STR = "[^/]+";
 var ONLY_WILDCARD_REG_EXP_STR = ".*";
 var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
@@ -113012,7 +113205,7 @@ var Node = class _Node {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router/reg-exp-router/trie.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router/reg-exp-router/trie.js
 var Trie = class {
   #context = { varIndex: 0 };
   #root = new Node();
@@ -113068,7 +113261,7 @@ var Trie = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router/reg-exp-router/router.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router/reg-exp-router/router.js
 var nullMatcher = [/^$/, [], /* @__PURE__ */ Object.create(null)];
 var wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 function buildWildcardRegExp(path3) {
@@ -113247,7 +113440,7 @@ var RegExpRouter = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router/smart-router/router.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router/smart-router/router.js
 var SmartRouter = class {
   name = "SmartRouter";
   #routers = [];
@@ -113302,8 +113495,14 @@ var SmartRouter = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router/trie-router/node.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router/trie-router/node.js
 var emptyParams = /* @__PURE__ */ Object.create(null);
+var hasChildren = (children) => {
+  for (const _3 in children) {
+    return true;
+  }
+  return false;
+};
 var Node2 = class _Node2 {
   #methods;
   #children;
@@ -113353,8 +113552,7 @@ var Node2 = class _Node2 {
     });
     return curNode;
   }
-  #getHandlerSets(node, method, nodeParams, params) {
-    const handlerSets = [];
+  #pushHandlerSets(handlerSets, node, method, nodeParams, params) {
     for (let i2 = 0, len = node.#methods.length; i2 < len; i2++) {
       const m2 = node.#methods[i2];
       const handlerSet = m2[method] || m2[METHOD_NAME_ALL];
@@ -113372,7 +113570,6 @@ var Node2 = class _Node2 {
         }
       }
     }
-    return handlerSets;
   }
   search(method, path3) {
     const handlerSets = [];
@@ -113381,7 +113578,9 @@ var Node2 = class _Node2 {
     let curNodes = [curNode];
     const parts = splitPath(path3);
     const curNodesQueue = [];
-    for (let i2 = 0, len = parts.length; i2 < len; i2++) {
+    const len = parts.length;
+    let partOffsets = null;
+    for (let i2 = 0; i2 < len; i2++) {
       const part = parts[i2];
       const isLast = i2 === len - 1;
       const tempNodes = [];
@@ -113392,11 +113591,9 @@ var Node2 = class _Node2 {
           nextNode.#params = node.#params;
           if (isLast) {
             if (nextNode.#children["*"]) {
-              handlerSets.push(
-                ...this.#getHandlerSets(nextNode.#children["*"], method, node.#params)
-              );
+              this.#pushHandlerSets(handlerSets, nextNode.#children["*"], method, node.#params);
             }
-            handlerSets.push(...this.#getHandlerSets(nextNode, method, node.#params));
+            this.#pushHandlerSets(handlerSets, nextNode, method, node.#params);
           } else {
             tempNodes.push(nextNode);
           }
@@ -113407,7 +113604,7 @@ var Node2 = class _Node2 {
           if (pattern === "*") {
             const astNode = node.#children["*"];
             if (astNode) {
-              handlerSets.push(...this.#getHandlerSets(astNode, method, node.#params));
+              this.#pushHandlerSets(handlerSets, astNode, method, node.#params);
               astNode.#params = params;
               tempNodes.push(astNode);
             }
@@ -113418,13 +113615,21 @@ var Node2 = class _Node2 {
             continue;
           }
           const child = node.#children[key];
-          const restPathString = parts.slice(i2).join("/");
           if (matcher instanceof RegExp) {
+            if (partOffsets === null) {
+              partOffsets = new Array(len);
+              let offset = path3[0] === "/" ? 1 : 0;
+              for (let p2 = 0; p2 < len; p2++) {
+                partOffsets[p2] = offset;
+                offset += parts[p2].length + 1;
+              }
+            }
+            const restPathString = path3.substring(partOffsets[i2]);
             const m2 = matcher.exec(restPathString);
             if (m2) {
               params[name6] = m2[0];
-              handlerSets.push(...this.#getHandlerSets(child, method, node.#params, params));
-              if (Object.keys(child.#children).length) {
+              this.#pushHandlerSets(handlerSets, child, method, node.#params, params);
+              if (hasChildren(child.#children)) {
                 child.#params = params;
                 const componentCount = m2[0].match(/\//)?.length ?? 0;
                 const targetCurNodes = curNodesQueue[componentCount] ||= [];
@@ -113436,10 +113641,14 @@ var Node2 = class _Node2 {
           if (matcher === true || matcher.test(part)) {
             params[name6] = part;
             if (isLast) {
-              handlerSets.push(...this.#getHandlerSets(child, method, params, node.#params));
+              this.#pushHandlerSets(handlerSets, child, method, params, node.#params);
               if (child.#children["*"]) {
-                handlerSets.push(
-                  ...this.#getHandlerSets(child.#children["*"], method, params, node.#params)
+                this.#pushHandlerSets(
+                  handlerSets,
+                  child.#children["*"],
+                  method,
+                  params,
+                  node.#params
                 );
               }
             } else {
@@ -113449,7 +113658,8 @@ var Node2 = class _Node2 {
           }
         }
       }
-      curNodes = tempNodes.concat(curNodesQueue.shift() ?? []);
+      const shifted = curNodesQueue.shift();
+      curNodes = shifted ? tempNodes.concat(shifted) : tempNodes;
     }
     if (handlerSets.length > 1) {
       handlerSets.sort((a2, b2) => {
@@ -113460,7 +113670,7 @@ var Node2 = class _Node2 {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/router/trie-router/router.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/router/trie-router/router.js
 var TrieRouter = class {
   name = "TrieRouter";
   #node;
@@ -113482,7 +113692,7 @@ var TrieRouter = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/hono.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/hono.js
 var Hono2 = class extends Hono {
   /**
    * Creates an instance of the Hono class.
@@ -113806,7 +114016,7 @@ function runInActiveSpan(nameOrOptions, fn2) {
 var mariadb = __toESM(require_promise(), 1);
 var name = "@prisma/adapter-mariadb";
 var UNSIGNED_FLAG = 1 << 5;
-var BINARY_FLAG = 1 << 7;
+var BINARY_COLLATION_INDEX = 63;
 function mapColumnType(field) {
   switch (field.type) {
     case "TINY":
@@ -113849,7 +114059,7 @@ function mapColumnType(field) {
     case "LONG_BLOB":
       if (field["dataTypeFormat"] === "json") {
         return ColumnTypeEnum.Json;
-      } else if (field.flags.valueOf() & BINARY_FLAG) {
+      } else if (field.collation.index === BINARY_COLLATION_INDEX) {
         return ColumnTypeEnum.Bytes;
       } else {
         return ColumnTypeEnum.Text;
@@ -114128,6 +114338,15 @@ var MariaDbTransaction = class extends MariaDbQueryable {
     this.cleanup?.();
     await this.client.end();
   }
+  async createSavepoint(name22) {
+    await this.executeRaw({ sql: `SAVEPOINT ${name22}`, args: [], argTypes: [] });
+  }
+  async rollbackToSavepoint(name22) {
+    await this.executeRaw({ sql: `ROLLBACK TO ${name22}`, args: [], argTypes: [] });
+  }
+  async releaseSavepoint(name22) {
+    await this.executeRaw({ sql: `RELEASE SAVEPOINT ${name22}`, args: [], argTypes: [] });
+  }
 };
 var PrismaMariaDbAdapter = class extends MariaDbQueryable {
   constructor(client, capabilities, options) {
@@ -114235,7 +114454,7 @@ function inferCapabilities(version5) {
   const [versionStr, suffix] = version5.split("-");
   const [major2, minor, patch] = versionStr.split(".").map((n2) => parseInt(n2, 10));
   const isMariaDB = suffix?.toLowerCase()?.includes("mariadb") ?? false;
-  const supportsRelationJoins = !isMariaDB && (major2 > 8 || major2 === 8 && minor >= 0 && patch >= 13);
+  const supportsRelationJoins = !isMariaDB && (major2 > 8 || major2 === 8 && (minor > 0 || minor === 0 && patch >= 13));
   return { supportsRelationJoins };
 }
 function rewriteConnectionString(config3) {
@@ -115156,6 +115375,12 @@ var MssqlTransaction = class extends MssqlQueryable {
       release2();
     }
   }
+  async createSavepoint(name22) {
+    await this.executeRaw({ sql: `SAVE TRANSACTION ${name22}`, args: [], argTypes: [] });
+  }
+  async rollbackToSavepoint(name22) {
+    await this.executeRaw({ sql: `ROLLBACK TRANSACTION ${name22}`, args: [], argTypes: [] });
+  }
 };
 var PrismaMssqlAdapter = class extends MssqlQueryable {
   constructor(pool2, options) {
@@ -115898,6 +116123,15 @@ var PgTransaction = class extends PgQueryable {
     this.cleanup?.();
     this.client.release();
   }
+  async createSavepoint(name22) {
+    await this.executeRaw({ sql: `SAVEPOINT ${name22}`, args: [], argTypes: [] });
+  }
+  async rollbackToSavepoint(name22) {
+    await this.executeRaw({ sql: `ROLLBACK TO SAVEPOINT ${name22}`, args: [], argTypes: [] });
+  }
+  async releaseSavepoint(name22) {
+    await this.executeRaw({ sql: `RELEASE SAVEPOINT ${name22}`, args: [], argTypes: [] });
+  }
 };
 var PrismaPgAdapter = class extends PgQueryable {
   constructor(client, pgOptions, release2) {
@@ -116094,13 +116328,15 @@ function createConnectionStringRegex(protocols) {
 }
 function wrapFactory(protocols, factory) {
   return {
-    ...factory,
+    adapterName: factory.adapterName,
+    provider: factory.provider,
     connect: () => factory.connect().then(wrapAdapter.bind(null, protocols), rethrowSanitizedError.bind(null, protocols))
   };
 }
 function wrapAdapter(protocols, adapter) {
   return {
-    ...adapter,
+    adapterName: adapter.adapterName,
+    provider: adapter.provider,
     dispose: () => adapter.dispose().catch(rethrowSanitizedError.bind(null, protocols)),
     executeRaw: (query2) => adapter.executeRaw(query2).catch(rethrowSanitizedError.bind(null, protocols)),
     queryRaw: (query2) => adapter.queryRaw(query2).catch(rethrowSanitizedError.bind(null, protocols)),
@@ -116111,11 +116347,16 @@ function wrapAdapter(protocols, adapter) {
 }
 function wrapTransaction(protocols, tx) {
   return {
-    ...tx,
+    adapterName: tx.adapterName,
+    provider: tx.provider,
+    options: tx.options,
     commit: () => tx.commit().catch(rethrowSanitizedError.bind(null, protocols)),
     rollback: () => tx.rollback().catch(rethrowSanitizedError.bind(null, protocols)),
     executeRaw: (query2) => tx.executeRaw(query2).catch(rethrowSanitizedError.bind(null, protocols)),
-    queryRaw: (query2) => tx.queryRaw(query2).catch(rethrowSanitizedError.bind(null, protocols))
+    queryRaw: (query2) => tx.queryRaw(query2).catch(rethrowSanitizedError.bind(null, protocols)),
+    createSavepoint: tx.createSavepoint ? (name6) => tx.createSavepoint(name6).catch(rethrowSanitizedError.bind(null, protocols)) : void 0,
+    rollbackToSavepoint: tx.rollbackToSavepoint ? (name6) => tx.rollbackToSavepoint(name6).catch(rethrowSanitizedError.bind(null, protocols)) : void 0,
+    releaseSavepoint: tx.releaseSavepoint ? (name6) => tx.releaseSavepoint(name6).catch(rethrowSanitizedError.bind(null, protocols)) : void 0
   };
 }
 
@@ -116238,7 +116479,7 @@ function logQuery(event) {
   });
 }
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/helper/factory/index.js
+// ../../node_modules/.pnpm/hono@4.12.0/node_modules/hono/dist/helper/factory/index.js
 var createMiddleware = (middleware) => middleware;
 
 // src/server/middleware/client-telemetry.ts
@@ -128420,7 +128661,8 @@ var QueryRequestBody = external_exports.object({
 var TransactionStartRequestBody = external_exports.object({
   timeout: external_exports.number().optional(),
   maxWait: external_exports.number().optional(),
-  isolationLevel: external_exports.enum(["READ UNCOMMITTED", "READ COMMITTED", "REPEATABLE READ", "SNAPSHOT", "SERIALIZABLE"]).optional()
+  isolationLevel: external_exports.enum(["READ UNCOMMITTED", "READ COMMITTED", "REPEATABLE READ", "SNAPSHOT", "SERIALIZABLE"]).optional(),
+  newTxId: external_exports.string().optional()
 });
 
 // src/server/server.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "7.5.0-dev.3",
+  "version": "7.5.0-dev.31",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,13 +18,12 @@
     "@opentelemetry/sdk-trace-base": "2.1.0",
     "hono": "4.11.7",
     "temporal-polyfill": "0.3.0",
-    "vitest": "3.2.4",
     "zod": "4.1.3",
-    "@prisma/adapter-pg": "7.5.0-dev.3",
-    "@prisma/adapter-mariadb": "7.5.0-dev.3",
-    "@prisma/adapter-mssql": "7.5.0-dev.3",
-    "@prisma/driver-adapter-utils": "7.5.0-dev.3",
-    "@prisma/client-engine-runtime": "7.5.0-dev.3"
+    "@prisma/adapter-pg": "7.5.0-dev.31",
+    "@prisma/adapter-mariadb": "7.5.0-dev.31",
+    "@prisma/adapter-mssql": "7.5.0-dev.31",
+    "@prisma/driver-adapter-utils": "7.5.0-dev.31",
+    "@prisma/client-engine-runtime": "7.5.0-dev.31"
   },
   "files": [
     "dist"