@prisma/client-engine-runtime 7.10.0-dev.38 → 7.10.0-dev.39

package/dist/index.js

@@ -803,6 +803,7 @@ function normalizeDateTime(dt) {
 }
 
 // src/interpreter/query-interpreter.ts
+var import_debug = require("@prisma/debug");
 var import_klona2 = require("klona");
 
 // src/sql-commenter.ts
@@ -1595,6 +1596,7 @@ function getErrorCode2(error) {
 }
 
 // src/interpreter/query-interpreter.ts
+var debug = (0, import_debug.Debug)("prisma:client:queryInterpreter");
 var QueryInterpreter = class _QueryInterpreter {
   #onQuery;
   #generators = new GeneratorRegistry();
@@ -1685,42 +1687,46 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "execute": {
         const queries = renderQuery(node.args, context.scope, context.generators, this.#maxChunkSize());
-        let sum = 0;
-        for (const query of queries) {
-          const commentedQuery = applyComments(query, context.sqlCommenter);
-          sum += await this.#withQuerySpanAndEvent(
-            commentedQuery,
-            context.queryable,
-            () => context.queryable.executeRaw(cloneObject(commentedQuery)).catch(
-              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
-            )
-          );
-        }
-        return { value: sum };
+        return this.#withChunkTransaction(queries.length, context, async (context2) => {
+          let sum = 0;
+          for (const query of queries) {
+            const commentedQuery = applyComments(query, context2.sqlCommenter);
+            sum += await this.#withQuerySpanAndEvent(
+              commentedQuery,
+              context2.queryable,
+              () => context2.queryable.executeRaw(cloneObject(commentedQuery)).catch(
+                (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+              )
+            );
+          }
+          return { value: sum };
+        });
       }
       case "query": {
         const queries = renderQuery(node.args, context.scope, context.generators, this.#maxChunkSize());
-        let results;
-        for (const query of queries) {
-          const commentedQuery = applyComments(query, context.sqlCommenter);
-          const result = await this.#withQuerySpanAndEvent(
-            commentedQuery,
-            context.queryable,
-            () => context.queryable.queryRaw(cloneObject(commentedQuery)).catch(
-              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
-            )
-          );
-          if (results === void 0) {
-            results = result;
-          } else {
-            appendToArray(results.rows, result.rows);
-            results.lastInsertId = result.lastInsertId;
+        return this.#withChunkTransaction(queries.length, context, async (context2) => {
+          let results;
+          for (const query of queries) {
+            const commentedQuery = applyComments(query, context2.sqlCommenter);
+            const result = await this.#withQuerySpanAndEvent(
+              commentedQuery,
+              context2.queryable,
+              () => context2.queryable.queryRaw(cloneObject(commentedQuery)).catch(
+                (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+              )
+            );
+            if (results === void 0) {
+              results = result;
+            } else {
+              appendToArray(results.rows, result.rows);
+              results.lastInsertId = result.lastInsertId;
+            }
           }
-        }
-        return {
-          value: node.args.type === "rawSql" ? this.#rawSerializer(results) : this.#serializer(results),
-          lastInsertId: results?.lastInsertId
-        };
+          return {
+            value: node.args.type === "rawSql" ? this.#rawSerializer(results) : this.#serializer(results),
+            lastInsertId: results?.lastInsertId
+          };
+        });
       }
       case "reverse": {
         const { value, lastInsertId } = await this.interpretNode(node.args, context);
@@ -1761,20 +1767,7 @@ var QueryInterpreter = class _QueryInterpreter {
         return { value: attachChildrenToParents(parent, children, node.args.canAssumeStrictEquality), lastInsertId };
       }
       case "transaction": {
-        if (!context.transactionManager.enabled) {
-          return this.interpretNode(node.args, context);
-        }
-        const transactionManager = context.transactionManager.manager;
-        const transactionInfo = await transactionManager.startInternalTransaction();
-        const transaction = await transactionManager.getTransaction(transactionInfo, "query");
-        try {
-          const value = await this.interpretNode(node.args, { ...context, queryable: transaction });
-          await transactionManager.commitTransaction(transactionInfo.id);
-          return value;
-        } catch (e) {
-          await transactionManager.rollbackTransaction(transactionInfo.id);
-          throw e;
-        }
+        return this.#withInternalTransaction(context, (context2) => this.interpretNode(node.args, context2));
       }
       case "dataMap": {
         const { value, lastInsertId } = await this.interpretNode(node.args.expr, context);
@@ -1959,6 +1952,48 @@ var QueryInterpreter = class _QueryInterpreter {
         assertNever(node, `Unexpected node type: ${node.type}`);
     }
   }
+  /**
+   * Runs the statements of a `query` or `execute` node via `fn`, wrapping them in a
+   * transaction when a chunkable statement was split into multiple queries at render time,
+   * so that a partially applied write cannot be observed or left behind if a later chunk
+   * fails. A single statement is atomic on its own, so it runs on the current context.
+   */
+  #withChunkTransaction(statementCount, context, fn) {
+    if (statementCount <= 1) {
+      return fn(context);
+    }
+    return this.#withInternalTransaction(context, fn);
+  }
+  /**
+   * Runs `fn` with a context whose queryable is guaranteed to be a transaction, starting a
+   * new internal transaction and committing or rolling it back around the call.
+   *
+   * A disabled transaction manager means the queryable already is a transaction: executors
+   * pass `{ enabled: false }` when the plan runs inside an interactive transaction, and the
+   * context handed to `fn` carries it for the duration of an internal transaction. In that
+   * case `fn` runs on the current context, since the statements it issues are already
+   * covered by the surrounding transaction.
+   */
+  async #withInternalTransaction(context, fn) {
+    if (!context.transactionManager.enabled) {
+      return fn(context);
+    }
+    const transactionManager = context.transactionManager.manager;
+    const transactionInfo = await transactionManager.startInternalTransaction();
+    const transaction = await transactionManager.getTransaction(transactionInfo, "query");
+    try {
+      const result = await fn({ ...context, queryable: transaction, transactionManager: { enabled: false } });
+      await transactionManager.commitTransaction(transactionInfo.id);
+      return result;
+    } catch (e) {
+      try {
+        await transactionManager.rollbackTransaction(transactionInfo.id);
+      } catch (rollbackError) {
+        debug("failed to roll back an internal transaction", rollbackError);
+      }
+      throw e;
+    }
+  }
   #maxChunkSize() {
     if (this.#connectionInfo?.maxBindValues !== void 0) {
       return this.#connectionInfo.maxBindValues;
@@ -2736,7 +2771,7 @@ function normalizeValue(type, value) {
 }
 
 // src/transaction-manager/transaction-manager.ts
-var import_debug = require("@prisma/debug");
+var import_debug2 = require("@prisma/debug");
 
 // src/crypto.ts
 async function getCrypto() {
@@ -2812,7 +2847,7 @@ function trackStartingTransaction() {
   });
   return { abortController: new AbortController(), settled, markSettled };
 }
-var debug = (0, import_debug.Debug)("prisma:client:transactionManager");
+var debug2 = (0, import_debug2.Debug)("prisma:client:transactionManager");
 var COMMIT_QUERY = () => ({ sql: "COMMIT", args: [], argTypes: [] });
 var ROLLBACK_QUERY = () => ({ sql: "ROLLBACK", args: [], argTypes: [] });
 var PHANTOM_COMMIT_QUERY = () => ({
@@ -2981,7 +3016,7 @@ var TransactionManager = class {
         }
       }
     } catch (e) {
-      debug("error in discarded transaction:", e);
+      debug2("error in discarded transaction:", e);
     }
   }
   async commitTransaction(transactionId) {
@@ -3045,7 +3080,7 @@ var TransactionManager = class {
     if (!transaction) {
       const closedTransaction = this.closedTransactions.find((tx) => tx.id === transactionId);
       if (closedTransaction) {
-        debug("Transaction already closed.", { transactionId, status: closedTransaction.status });
+        debug2("Transaction already closed.", { transactionId, status: closedTransaction.status });
         switch (closedTransaction.status) {
           case "closing":
           case "waiting":
@@ -3062,7 +3097,7 @@ var TransactionManager = class {
             });
         }
       } else {
-        debug(`Transaction not found.`, transactionId);
+        debug2(`Transaction not found.`, transactionId);
         throw new TransactionNotFoundError();
       }
     }
@@ -3113,13 +3148,13 @@ var TransactionManager = class {
     }
   }
   #debugTransactionAlreadyClosedOnTimeout(transactionId) {
-    debug("Transaction already committed or rolled back when timeout happened.", transactionId);
+    debug2("Transaction already committed or rolled back when timeout happened.", transactionId);
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
     const timer = createTimeoutIfDefined(async () => {
       try {
-        debug("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
+        debug2("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
         const tx = this.transactions.get(transactionId);
         if (!tx) {
           this.#debugTransactionAlreadyClosedOnTimeout(transactionId);
@@ -3134,7 +3169,7 @@ var TransactionManager = class {
           }
         });
       } catch (error) {
-        debug("Error while closing timed-out transaction.", { transactionId, error });
+        debug2("Error while closing timed-out transaction.", { transactionId, error });
       }
     }, timeout);
     timer?.unref?.();
@@ -3167,7 +3202,7 @@ var TransactionManager = class {
   }
   async #closeTransaction(tx, status) {
     const createClosingPromise = async () => {
-      debug("Closing transaction.", { transactionId: tx.id, status });
+      debug2("Closing transaction.", { transactionId: tx.id, status });
       try {
         if (tx.transaction && status === "committed") {
           if (tx.transaction.options.usePhantomQuery) {

package/dist/index.mjs

@@ -750,6 +750,7 @@ function normalizeDateTime(dt) {
 }
 
 // src/interpreter/query-interpreter.ts
+import { Debug } from "@prisma/debug";
 import { klona as klona2 } from "klona";
 
 // src/sql-commenter.ts
@@ -1542,6 +1543,7 @@ function getErrorCode2(error) {
 }
 
 // src/interpreter/query-interpreter.ts
+var debug = Debug("prisma:client:queryInterpreter");
 var QueryInterpreter = class _QueryInterpreter {
   #onQuery;
   #generators = new GeneratorRegistry();
@@ -1632,42 +1634,46 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "execute": {
         const queries = renderQuery(node.args, context.scope, context.generators, this.#maxChunkSize());
-        let sum = 0;
-        for (const query of queries) {
-          const commentedQuery = applyComments(query, context.sqlCommenter);
-          sum += await this.#withQuerySpanAndEvent(
-            commentedQuery,
-            context.queryable,
-            () => context.queryable.executeRaw(cloneObject(commentedQuery)).catch(
-              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
-            )
-          );
-        }
-        return { value: sum };
+        return this.#withChunkTransaction(queries.length, context, async (context2) => {
+          let sum = 0;
+          for (const query of queries) {
+            const commentedQuery = applyComments(query, context2.sqlCommenter);
+            sum += await this.#withQuerySpanAndEvent(
+              commentedQuery,
+              context2.queryable,
+              () => context2.queryable.executeRaw(cloneObject(commentedQuery)).catch(
+                (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+              )
+            );
+          }
+          return { value: sum };
+        });
       }
       case "query": {
         const queries = renderQuery(node.args, context.scope, context.generators, this.#maxChunkSize());
-        let results;
-        for (const query of queries) {
-          const commentedQuery = applyComments(query, context.sqlCommenter);
-          const result = await this.#withQuerySpanAndEvent(
-            commentedQuery,
-            context.queryable,
-            () => context.queryable.queryRaw(cloneObject(commentedQuery)).catch(
-              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
-            )
-          );
-          if (results === void 0) {
-            results = result;
-          } else {
-            appendToArray(results.rows, result.rows);
-            results.lastInsertId = result.lastInsertId;
+        return this.#withChunkTransaction(queries.length, context, async (context2) => {
+          let results;
+          for (const query of queries) {
+            const commentedQuery = applyComments(query, context2.sqlCommenter);
+            const result = await this.#withQuerySpanAndEvent(
+              commentedQuery,
+              context2.queryable,
+              () => context2.queryable.queryRaw(cloneObject(commentedQuery)).catch(
+                (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+              )
+            );
+            if (results === void 0) {
+              results = result;
+            } else {
+              appendToArray(results.rows, result.rows);
+              results.lastInsertId = result.lastInsertId;
+            }
           }
-        }
-        return {
-          value: node.args.type === "rawSql" ? this.#rawSerializer(results) : this.#serializer(results),
-          lastInsertId: results?.lastInsertId
-        };
+          return {
+            value: node.args.type === "rawSql" ? this.#rawSerializer(results) : this.#serializer(results),
+            lastInsertId: results?.lastInsertId
+          };
+        });
       }
       case "reverse": {
         const { value, lastInsertId } = await this.interpretNode(node.args, context);
@@ -1708,20 +1714,7 @@ var QueryInterpreter = class _QueryInterpreter {
         return { value: attachChildrenToParents(parent, children, node.args.canAssumeStrictEquality), lastInsertId };
       }
       case "transaction": {
-        if (!context.transactionManager.enabled) {
-          return this.interpretNode(node.args, context);
-        }
-        const transactionManager = context.transactionManager.manager;
-        const transactionInfo = await transactionManager.startInternalTransaction();
-        const transaction = await transactionManager.getTransaction(transactionInfo, "query");
-        try {
-          const value = await this.interpretNode(node.args, { ...context, queryable: transaction });
-          await transactionManager.commitTransaction(transactionInfo.id);
-          return value;
-        } catch (e) {
-          await transactionManager.rollbackTransaction(transactionInfo.id);
-          throw e;
-        }
+        return this.#withInternalTransaction(context, (context2) => this.interpretNode(node.args, context2));
       }
       case "dataMap": {
         const { value, lastInsertId } = await this.interpretNode(node.args.expr, context);
@@ -1906,6 +1899,48 @@ var QueryInterpreter = class _QueryInterpreter {
         assertNever(node, `Unexpected node type: ${node.type}`);
     }
   }
+  /**
+   * Runs the statements of a `query` or `execute` node via `fn`, wrapping them in a
+   * transaction when a chunkable statement was split into multiple queries at render time,
+   * so that a partially applied write cannot be observed or left behind if a later chunk
+   * fails. A single statement is atomic on its own, so it runs on the current context.
+   */
+  #withChunkTransaction(statementCount, context, fn) {
+    if (statementCount <= 1) {
+      return fn(context);
+    }
+    return this.#withInternalTransaction(context, fn);
+  }
+  /**
+   * Runs `fn` with a context whose queryable is guaranteed to be a transaction, starting a
+   * new internal transaction and committing or rolling it back around the call.
+   *
+   * A disabled transaction manager means the queryable already is a transaction: executors
+   * pass `{ enabled: false }` when the plan runs inside an interactive transaction, and the
+   * context handed to `fn` carries it for the duration of an internal transaction. In that
+   * case `fn` runs on the current context, since the statements it issues are already
+   * covered by the surrounding transaction.
+   */
+  async #withInternalTransaction(context, fn) {
+    if (!context.transactionManager.enabled) {
+      return fn(context);
+    }
+    const transactionManager = context.transactionManager.manager;
+    const transactionInfo = await transactionManager.startInternalTransaction();
+    const transaction = await transactionManager.getTransaction(transactionInfo, "query");
+    try {
+      const result = await fn({ ...context, queryable: transaction, transactionManager: { enabled: false } });
+      await transactionManager.commitTransaction(transactionInfo.id);
+      return result;
+    } catch (e) {
+      try {
+        await transactionManager.rollbackTransaction(transactionInfo.id);
+      } catch (rollbackError) {
+        debug("failed to roll back an internal transaction", rollbackError);
+      }
+      throw e;
+    }
+  }
   #maxChunkSize() {
     if (this.#connectionInfo?.maxBindValues !== void 0) {
       return this.#connectionInfo.maxBindValues;
@@ -2683,7 +2718,7 @@ function normalizeValue(type, value) {
 }
 
 // src/transaction-manager/transaction-manager.ts
-import { Debug } from "@prisma/debug";
+import { Debug as Debug2 } from "@prisma/debug";
 
 // src/crypto.ts
 async function getCrypto() {
@@ -2759,7 +2794,7 @@ function trackStartingTransaction() {
   });
   return { abortController: new AbortController(), settled, markSettled };
 }
-var debug = Debug("prisma:client:transactionManager");
+var debug2 = Debug2("prisma:client:transactionManager");
 var COMMIT_QUERY = () => ({ sql: "COMMIT", args: [], argTypes: [] });
 var ROLLBACK_QUERY = () => ({ sql: "ROLLBACK", args: [], argTypes: [] });
 var PHANTOM_COMMIT_QUERY = () => ({
@@ -2928,7 +2963,7 @@ var TransactionManager = class {
         }
       }
     } catch (e) {
-      debug("error in discarded transaction:", e);
+      debug2("error in discarded transaction:", e);
     }
   }
   async commitTransaction(transactionId) {
@@ -2992,7 +3027,7 @@ var TransactionManager = class {
     if (!transaction) {
       const closedTransaction = this.closedTransactions.find((tx) => tx.id === transactionId);
       if (closedTransaction) {
-        debug("Transaction already closed.", { transactionId, status: closedTransaction.status });
+        debug2("Transaction already closed.", { transactionId, status: closedTransaction.status });
         switch (closedTransaction.status) {
           case "closing":
           case "waiting":
@@ -3009,7 +3044,7 @@ var TransactionManager = class {
             });
         }
       } else {
-        debug(`Transaction not found.`, transactionId);
+        debug2(`Transaction not found.`, transactionId);
         throw new TransactionNotFoundError();
       }
     }
@@ -3060,13 +3095,13 @@ var TransactionManager = class {
     }
   }
   #debugTransactionAlreadyClosedOnTimeout(transactionId) {
-    debug("Transaction already committed or rolled back when timeout happened.", transactionId);
+    debug2("Transaction already committed or rolled back when timeout happened.", transactionId);
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
     const timer = createTimeoutIfDefined(async () => {
       try {
-        debug("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
+        debug2("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
         const tx = this.transactions.get(transactionId);
         if (!tx) {
           this.#debugTransactionAlreadyClosedOnTimeout(transactionId);
@@ -3081,7 +3116,7 @@ var TransactionManager = class {
           }
         });
       } catch (error) {
-        debug("Error while closing timed-out transaction.", { transactionId, error });
+        debug2("Error while closing timed-out transaction.", { transactionId, error });
       }
     }, timeout);
     timer?.unref?.();
@@ -3114,7 +3149,7 @@ var TransactionManager = class {
   }
   async #closeTransaction(tx, status) {
     const createClosingPromise = async () => {
-      debug("Closing transaction.", { transactionId: tx.id, status });
+      debug2("Closing transaction.", { transactionId: tx.id, status });
       try {
         if (tx.transaction && status === "committed") {
           if (tx.transaction.options.usePhantomQuery) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "7.10.0-dev.38",
+  "version": "7.10.0-dev.39",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,20 +31,20 @@
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "14.0.0",
-    "@prisma/client-runtime-utils": "7.10.0-dev.38",
-    "@prisma/debug": "7.10.0-dev.38",
-    "@prisma/driver-adapter-utils": "7.10.0-dev.38",
-    "@prisma/sqlcommenter": "7.10.0-dev.38",
-    "@prisma/param-graph": "7.10.0-dev.38",
-    "@prisma/json-protocol": "7.10.0-dev.38"
+    "@prisma/client-runtime-utils": "7.10.0-dev.39",
+    "@prisma/debug": "7.10.0-dev.39",
+    "@prisma/driver-adapter-utils": "7.10.0-dev.39",
+    "@prisma/sqlcommenter": "7.10.0-dev.39",
+    "@prisma/param-graph": "7.10.0-dev.39",
+    "@prisma/json-protocol": "7.10.0-dev.39"
   },
   "devDependencies": {
     "@codspeed/benchmark.js-plugin": "4.0.0",
     "@types/benchmark": "2.1.5",
     "@types/node": "~20.19.24",
     "benchmark": "2.1.4",
-    "@prisma/get-dmmf": "7.10.0-dev.38",
-    "@prisma/param-graph-builder": "7.10.0-dev.38"
+    "@prisma/param-graph-builder": "7.10.0-dev.39",
+    "@prisma/get-dmmf": "7.10.0-dev.39"
   },
   "files": [
     "dist"