@prisma/query-plan-executor 7.2.0-integration-fix-sqlite-deadlock-fix.2 → 7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1

package/dist/index.js

@@ -97773,7 +97773,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.2.0-integration-fix-sqlite-deadlock-fix.2";
+var version = "7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -107859,14 +107859,16 @@ var TransactionManager = class {
     const abortController = new AbortController();
     const startTimer = createTimeoutIfDefined(() => abortController.abort(), options.maxWait);
     startTimer?.unref?.();
+    const startTransactionPromise = this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
     transaction.transaction = await Promise.race([
-      this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing).finally(() => clearTimeout(startTimer)),
+      startTransactionPromise.finally(() => clearTimeout(startTimer)),
       once(abortController.signal, "abort").then(() => void 0)
     ]);
     this.transactions.set(transaction.id, transaction);
     switch (transaction.status) {
       case "waiting":
         if (abortController.signal.aborted) {
+          void startTransactionPromise.then((tx) => tx.rollback()).catch((e2) => debug3("error in discarded transaction:", e2));
           await this.#closeTransaction(transaction, "timed_out");
           throw new TransactionStartTimeoutError();
         }
@@ -109470,7 +109472,7 @@ var SpanProxy = class {
       parentId,
       attributes,
       links,
-      name: `prisma:engine:${this.#name}`,
+      name: `prisma:accelerate:${this.#name}`,
       kind: serializeSpanKind(this.#kind),
       startTime: this.#startTime,
       endTime: instantToHrTime(endTime)
@@ -111895,59 +111897,49 @@ var App = class _App {
    * @param transactionId - Transaction ID if running within a transaction
    */
   async query(queryPlan, placeholderValues, comments, resourceLimits, transactionId) {
-    return await this.#tracingHandler.runInChildSpan("query", async () => {
-      const queryable = transactionId !== null ? await this.#transactionManager.getTransaction({ id: transactionId }, "query") : this.#db;
-      const sqlCommenter = comments && Object.keys(comments).length > 0 ? {
-        plugins: [() => comments],
-        // For pre-computed comments, we use a placeholder queryInfo since the actual
-        // query info was already used on the client side to compute the comments
-        queryInfo: { type: "single", action: "queryRaw", query: {} }
-      } : void 0;
-      const queryInterpreter = QueryInterpreter.forSql({
-        placeholderValues,
-        tracingHelper: this.#tracingHandler,
-        transactionManager: transactionId === null ? { enabled: true, manager: this.#transactionManager } : { enabled: false },
-        onQuery: logQuery,
-        sqlCommenter
-      });
-      const result = await Promise.race([
-        queryInterpreter.run(queryPlan, queryable),
-        import_promises3.default.setTimeout(resourceLimits.queryTimeout.total("milliseconds"), void 0, { ref: false }).then(() => {
-          throw new ResourceLimitError("Query timeout exceeded");
-        })
-      ]);
-      return normalizeJsonProtocolValues(result);
+    const queryable = transactionId !== null ? await this.#transactionManager.getTransaction({ id: transactionId }, "query") : this.#db;
+    const sqlCommenter = comments && Object.keys(comments).length > 0 ? {
+      plugins: [() => comments],
+      // For pre-computed comments, we use a placeholder queryInfo since the actual
+      // query info was already used on the client side to compute the comments
+      queryInfo: { type: "single", action: "queryRaw", query: {} }
+    } : void 0;
+    const queryInterpreter = QueryInterpreter.forSql({
+      placeholderValues,
+      tracingHelper: this.#tracingHandler,
+      transactionManager: transactionId === null ? { enabled: true, manager: this.#transactionManager } : { enabled: false },
+      onQuery: logQuery,
+      sqlCommenter
     });
+    const result = await Promise.race([
+      queryInterpreter.run(queryPlan, queryable),
+      import_promises3.default.setTimeout(resourceLimits.queryTimeout.total("milliseconds"), void 0, { ref: false }).then(() => {
+        throw new ResourceLimitError("Query timeout exceeded");
+      })
+    ]);
+    return normalizeJsonProtocolValues(result);
   }
   /**
    * Starts a new transaction.
    */
   async startTransaction(options, resourceLimits) {
-    return await this.#tracingHandler.runInChildSpan("start_transaction", () => {
-      const timeout = Math.min(options.timeout ?? Infinity, resourceLimits.maxTransactionTimeout.total("milliseconds"));
-      return this.#transactionManager.startTransaction({
-        ...options,
-        timeout
-      });
+    const timeout = Math.min(options.timeout ?? Infinity, resourceLimits.maxTransactionTimeout.total("milliseconds"));
+    return this.#transactionManager.startTransaction({
+      ...options,
+      timeout
     });
   }
   /**
    * Commits a transaction.
    */
-  async commitTransaction(transactionId) {
-    return await this.#tracingHandler.runInChildSpan(
-      "commit_transaction",
-      () => this.#transactionManager.commitTransaction(transactionId)
-    );
+  commitTransaction(transactionId) {
+    return this.#transactionManager.commitTransaction(transactionId);
   }
   /**
    * Rolls back a transaction.
    */
-  async rollbackTransaction(transactionId) {
-    return await this.#tracingHandler.runInChildSpan(
-      "rollback_transaction",
-      () => this.#transactionManager.rollbackTransaction(transactionId)
-    );
+  rollbackTransaction(transactionId) {
+    return this.#transactionManager.rollbackTransaction(transactionId);
   }
   /**
    * Retrieves connection information necessary for building the queries.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "7.2.0-integration-fix-sqlite-deadlock-fix.2",
+  "version": "7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,11 +20,11 @@
     "temporal-polyfill": "0.3.0",
     "vitest": "3.2.4",
     "zod": "4.1.3",
-    "@prisma/adapter-pg": "7.2.0-integration-fix-sqlite-deadlock-fix.2",
-    "@prisma/adapter-mariadb": "7.2.0-integration-fix-sqlite-deadlock-fix.2",
-    "@prisma/adapter-mssql": "7.2.0-integration-fix-sqlite-deadlock-fix.2",
-    "@prisma/client-engine-runtime": "7.2.0-integration-fix-sqlite-deadlock-fix.2",
-    "@prisma/driver-adapter-utils": "7.2.0-integration-fix-sqlite-deadlock-fix.2"
+    "@prisma/adapter-pg": "7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1",
+    "@prisma/adapter-mssql": "7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1",
+    "@prisma/driver-adapter-utils": "7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1",
+    "@prisma/client-engine-runtime": "7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1",
+    "@prisma/adapter-mariadb": "7.2.0-integration-engines-7-2-0-3-aqrln-zpupkzknszlw-04d61c41ec1a025cabe14093fa3121a5f45040ab.1"
   },
   "files": [
     "dist"