@prisma/client-engine-runtime 6.6.0-dev.7 → 6.6.0-dev.70

package/dist/QueryPlan.d.ts

@@ -12,9 +12,27 @@ export type QueryPlanBinding = {
     expr: QueryPlanNode;
 };
 export type QueryPlanDbQuery = {
-    query: string;
+    type: 'rawSql';
+    sql: string;
     params: PrismaValue[];
+} | {
+    type: 'templateSql';
+    fragments: Fragment[];
+    placeholderFormat: PlaceholderFormat;
+    params: PrismaValue[];
+};
+export type Fragment = {
+    type: 'stringChunk';
+    value: string;
+} | {
+    type: 'parameter';
+} | {
+    type: 'parameterTuple';
 };
+export interface PlaceholderFormat {
+    prefix: string;
+    hasNumbering: boolean;
+}
 export type JoinExpression = {
     child: QueryPlanNode;
     on: [left: string, right: string][];

package/dist/crypto.d.ts

@@ -0,0 +1 @@
+export declare function randomUUID(): Promise<string>;

package/dist/index.d.mts

@@ -1,14 +1,16 @@
-import { ErrorCapturingSqlConnection } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingSqlQueryable } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingTransaction } from '@prisma/driver-adapter-utils';
-
-export declare const enum IsolationLevel {
-    ReadUncommitted = "ReadUncommitted",
-    ReadCommitted = "ReadCommitted",
-    RepeatableRead = "RepeatableRead",
-    Snapshot = "Snapshot",
-    Serializable = "Serializable"
-}
+import type { IsolationLevel } from '@prisma/driver-adapter-utils';
+import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
+import { SqlQueryable } from '@prisma/driver-adapter-utils';
+import { Transaction } from '@prisma/driver-adapter-utils';
+
+export declare type Fragment = {
+    type: 'stringChunk';
+    value: string;
+} | {
+    type: 'parameter';
+} | {
+    type: 'parameterTuple';
+};
 
 export declare function isPrismaValuePlaceholder(value: unknown): value is PrismaValuePlaceholder;
 
@@ -18,6 +20,11 @@ export declare type JoinExpression = {
     parentField: string;
 };
 
+export declare interface PlaceholderFormat {
+    prefix: string;
+    hasNumbering: boolean;
+}
+
 export declare type PrismaValue = string | boolean | number | PrismaValue[] | null | Record<string, unknown> | PrismaValuePlaceholder;
 
 export declare type PrismaValuePlaceholder = {
@@ -43,7 +50,7 @@ export declare class QueryInterpreter {
 }
 
 export declare type QueryInterpreterOptions = {
-    queryable: ErrorCapturingSqlQueryable;
+    queryable: SqlQueryable;
     placeholderValues: Record<string, unknown>;
     onQuery?: (event: QueryEvent) => void;
 };
@@ -54,7 +61,13 @@ export declare type QueryPlanBinding = {
 };
 
 export declare type QueryPlanDbQuery = {
-    query: string;
+    type: 'rawSql';
+    sql: string;
+    params: PrismaValue[];
+} | {
+    type: 'templateSql';
+    fragments: Fragment[];
+    placeholderFormat: PlaceholderFormat;
     params: PrismaValue[];
 };
 
@@ -121,18 +134,17 @@ export declare class TransactionManager {
     private closedTransactions;
     private readonly driverAdapter;
     constructor({ driverAdapter }: {
-        driverAdapter: ErrorCapturingSqlConnection;
+        driverAdapter: SqlDriverAdapter;
     });
     startTransaction(options: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;
     rollbackTransaction(transactionId: string): Promise<void>;
-    getTransaction(txInfo: TransactionInfo, operation: string): ErrorCapturingTransaction;
+    getTransaction(txInfo: TransactionInfo, operation: string): Transaction;
     private getActiveTransaction;
     cancelAllTransactions(): Promise<void>;
     private startTransactionTimeout;
     private closeTransaction;
     private validateOptions;
-    private requiresSettingIsolationLevelFirst;
 }
 
 export declare class TransactionManagerError extends Error {

package/dist/index.d.ts

@@ -1,14 +1,16 @@
-import { ErrorCapturingSqlConnection } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingSqlQueryable } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingTransaction } from '@prisma/driver-adapter-utils';
-
-export declare const enum IsolationLevel {
-    ReadUncommitted = "ReadUncommitted",
-    ReadCommitted = "ReadCommitted",
-    RepeatableRead = "RepeatableRead",
-    Snapshot = "Snapshot",
-    Serializable = "Serializable"
-}
+import type { IsolationLevel } from '@prisma/driver-adapter-utils';
+import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
+import { SqlQueryable } from '@prisma/driver-adapter-utils';
+import { Transaction } from '@prisma/driver-adapter-utils';
+
+export declare type Fragment = {
+    type: 'stringChunk';
+    value: string;
+} | {
+    type: 'parameter';
+} | {
+    type: 'parameterTuple';
+};
 
 export declare function isPrismaValuePlaceholder(value: unknown): value is PrismaValuePlaceholder;
 
@@ -18,6 +20,11 @@ export declare type JoinExpression = {
     parentField: string;
 };
 
+export declare interface PlaceholderFormat {
+    prefix: string;
+    hasNumbering: boolean;
+}
+
 export declare type PrismaValue = string | boolean | number | PrismaValue[] | null | Record<string, unknown> | PrismaValuePlaceholder;
 
 export declare type PrismaValuePlaceholder = {
@@ -43,7 +50,7 @@ export declare class QueryInterpreter {
 }
 
 export declare type QueryInterpreterOptions = {
-    queryable: ErrorCapturingSqlQueryable;
+    queryable: SqlQueryable;
     placeholderValues: Record<string, unknown>;
     onQuery?: (event: QueryEvent) => void;
 };
@@ -54,7 +61,13 @@ export declare type QueryPlanBinding = {
 };
 
 export declare type QueryPlanDbQuery = {
-    query: string;
+    type: 'rawSql';
+    sql: string;
+    params: PrismaValue[];
+} | {
+    type: 'templateSql';
+    fragments: Fragment[];
+    placeholderFormat: PlaceholderFormat;
     params: PrismaValue[];
 };
 
@@ -121,18 +134,17 @@ export declare class TransactionManager {
     private closedTransactions;
     private readonly driverAdapter;
     constructor({ driverAdapter }: {
-        driverAdapter: ErrorCapturingSqlConnection;
+        driverAdapter: SqlDriverAdapter;
     });
     startTransaction(options: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;
     rollbackTransaction(transactionId: string): Promise<void>;
-    getTransaction(txInfo: TransactionInfo, operation: string): ErrorCapturingTransaction;
+    getTransaction(txInfo: TransactionInfo, operation: string): Transaction;
     private getActiveTransaction;
     cancelAllTransactions(): Promise<void>;
     private startTransactionTimeout;
     private closeTransaction;
     private validateOptions;
-    private requiresSettingIsolationLevelFirst;
 }
 
 export declare class TransactionManagerError extends Error {

package/dist/index.js

@@ -5,10 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -30,17 +26,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  IsolationLevel: () => IsolationLevel,
   QueryInterpreter: () => QueryInterpreter,
   TransactionManager: () => TransactionManager,
   TransactionManagerError: () => TransactionManagerError,
@@ -53,107 +42,25 @@ function isPrismaValuePlaceholder(value) {
   return typeof value === "object" && value !== null && value["prisma__type"] === "param";
 }
 
-// src/interpreter/renderQueryTemplate.ts
-var BEGIN_REPEAT = "/* prisma-comma-repeatable-start */";
-var END_REPEAT = "/* prisma-comma-repeatable-end */";
-function renderQueryTemplate({
-  query,
-  params
-}) {
-  if (!query.includes(BEGIN_REPEAT)) {
-    return { query, params };
-  }
-  const flattenedParams = [];
-  let lastParamId = 1;
-  let result = "";
-  let templatePos = 0;
-  let state = 0 /* Normal */;
-  let stateBeforeQuote = 0 /* Normal */;
-  while (templatePos < query.length) {
-    const nextChar = query[templatePos];
-    if (state === 1 /* Quoted */ && nextChar !== '"') {
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (nextChar === '"') {
-      if (state === 1 /* Quoted */) {
-        state = stateBeforeQuote;
-      } else {
-        stateBeforeQuote = state;
-        state = 1 /* Quoted */;
-      }
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + BEGIN_REPEAT.length) === BEGIN_REPEAT) {
-      if (state === 2 /* Repeating */) {
-        throw new Error("Nested repetition is not allowed");
-      }
-      state = 2 /* Repeating */;
-      templatePos += BEGIN_REPEAT.length;
-      result += "(";
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + END_REPEAT.length) === END_REPEAT) {
-      if (state === 0 /* Normal */) {
-        throw new Error("Unmatched repetition end");
-      }
-      state = 0 /* Normal */;
-      templatePos += END_REPEAT.length;
-      result += ")";
-      continue;
-    }
-    if (nextChar === "$") {
-      const paramMatch = query.slice(templatePos + 1).match(/^\d+/);
-      if (!paramMatch) {
-        result += "$";
-        templatePos++;
-        continue;
-      }
-      templatePos += paramMatch[0].length + 1;
-      const originalParamIdx = parseInt(paramMatch[0]);
-      const paramValue = params[originalParamIdx - 1];
-      switch (state) {
-        case 0 /* Normal */: {
-          flattenedParams.push(paramValue);
-          result += `$${lastParamId++}`;
-          break;
-        }
-        case 2 /* Repeating */: {
-          const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
-          if (paramArray.length === 0) {
-            result += "NULL";
-            break;
-          }
-          paramArray.forEach((value, idx) => {
-            flattenedParams.push(value);
-            result += `$${lastParamId++}`;
-            if (idx !== paramArray.length - 1) {
-              result += ", ";
-            }
-          });
-          break;
-        }
-        default: {
-          throw new Error(`Unexpected state: ${state}`);
-        }
-      }
-      continue;
-    }
-    result += nextChar;
-    templatePos++;
-  }
-  return {
-    query: result,
-    params: flattenedParams
-  };
+// src/utils.ts
+function assertNever(_, message) {
+  throw new Error(message);
 }
 
 // src/interpreter/renderQuery.ts
-function renderQuery({ query, params }, scope) {
-  const substitutedParams = params.map((param) => {
+function renderQuery(dbQuery, scope) {
+  const queryType = dbQuery.type;
+  switch (queryType) {
+    case "rawSql":
+      return renderRawSql(dbQuery.sql, substituteParams(dbQuery.params, scope));
+    case "templateSql":
+      return renderTemplateSql(dbQuery.fragments, dbQuery.placeholderFormat, substituteParams(dbQuery.params, scope));
+    default:
+      assertNever(queryType, `Invalid query type`);
+  }
+}
+function substituteParams(params, scope) {
+  return params.map((param) => {
     if (!isPrismaValuePlaceholder(param)) {
       return param;
     }
@@ -163,11 +70,48 @@ function renderQuery({ query, params }, scope) {
     }
     return value;
   });
-  const { query: renderedQuery, params: expandedParams } = renderQueryTemplate({ query, params: substitutedParams });
-  const argTypes = expandedParams.map((param) => toArgType(param));
+}
+function renderTemplateSql(fragments, placeholderFormat, params) {
+  let paramIndex = 0;
+  let placeholderNumber = 1;
+  const flattenedParams = [];
+  const sql = fragments.map((fragment) => {
+    const fragmentType = fragment.type;
+    switch (fragmentType) {
+      case "parameter":
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        flattenedParams.push(params[paramIndex++]);
+        return formatPlaceholder(placeholderFormat, placeholderNumber++);
+      case "stringChunk":
+        return fragment.value;
+      case "parameterTuple": {
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        const paramValue = params[paramIndex++];
+        const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
+        const placeholders = paramArray.length == 0 ? "NULL" : paramArray.map((value) => {
+          flattenedParams.push(value);
+          return formatPlaceholder(placeholderFormat, placeholderNumber++);
+        }).join(",");
+        return `(${placeholders})`;
+      }
+      default:
+        assertNever(fragmentType, "Invalid fragment type");
+    }
+  }).join("");
+  return renderRawSql(sql, flattenedParams);
+}
+function formatPlaceholder(placeholderFormat, placeholderNumber) {
+  return placeholderFormat.hasNumbering ? `${placeholderFormat.prefix}${placeholderNumber}` : placeholderFormat.prefix;
+}
+function renderRawSql(sql, params) {
+  const argTypes = params.map((param) => toArgType(param));
   return {
-    sql: renderedQuery,
-    args: expandedParams,
+    sql,
+    args: params,
     argTypes
   };
 }
@@ -236,19 +180,17 @@ function serialize(resultSet) {
 }
 
 // src/interpreter/QueryInterpreter.ts
-var _queryable, _placeholderValues, _onQuery, _QueryInterpreter_instances, withQueryEvent_fn;
 var QueryInterpreter = class {
+  #queryable;
+  #placeholderValues;
+  #onQuery;
   constructor({ queryable, placeholderValues, onQuery }) {
-    __privateAdd(this, _QueryInterpreter_instances);
-    __privateAdd(this, _queryable);
-    __privateAdd(this, _placeholderValues);
-    __privateAdd(this, _onQuery);
-    __privateSet(this, _queryable, queryable);
-    __privateSet(this, _placeholderValues, placeholderValues);
-    __privateSet(this, _onQuery, onQuery);
+    this.#queryable = queryable;
+    this.#placeholderValues = placeholderValues;
+    this.#onQuery = onQuery;
   }
   async run(queryPlan) {
-    return this.interpretNode(queryPlan, __privateGet(this, _placeholderValues));
+    return this.interpretNode(queryPlan, this.#placeholderValues);
   }
   async interpretNode(node, scope) {
     switch (node.type) {
@@ -287,24 +229,14 @@ var QueryInterpreter = class {
       }
       case "execute": {
         const query = renderQuery(node.args, scope);
-        return __privateMethod(this, _QueryInterpreter_instances, withQueryEvent_fn).call(this, query, async () => {
-          const result = await __privateGet(this, _queryable).executeRaw(query);
-          if (result.ok) {
-            return result.value;
-          } else {
-            throw result.error;
-          }
+        return this.#withQueryEvent(query, async () => {
+          return await this.#queryable.executeRaw(query);
         });
       }
       case "query": {
         const query = renderQuery(node.args, scope);
-        return __privateMethod(this, _QueryInterpreter_instances, withQueryEvent_fn).call(this, query, async () => {
-          const result = await __privateGet(this, _queryable).queryRaw(query);
-          if (result.ok) {
-            return serialize(result.value);
-          } else {
-            throw result.error;
-          }
+        return this.#withQueryEvent(query, async () => {
+          return serialize(await this.#queryable.queryRaw(query));
         });
       }
       case "reverse": {
@@ -354,24 +286,19 @@ var QueryInterpreter = class {
       }
     }
   }
-};
-_queryable = new WeakMap();
-_placeholderValues = new WeakMap();
-_onQuery = new WeakMap();
-_QueryInterpreter_instances = new WeakSet();
-withQueryEvent_fn = async function(query, execute) {
-  var _a;
-  const timestamp = /* @__PURE__ */ new Date();
-  const startInstant = performance.now();
-  const result = await execute();
-  const endInstant = performance.now();
-  (_a = __privateGet(this, _onQuery)) == null ? void 0 : _a.call(this, {
-    timestamp,
-    duration: endInstant - startInstant,
-    query: query.sql,
-    params: query.args
-  });
-  return result;
+  async #withQueryEvent(query, execute) {
+    const timestamp = /* @__PURE__ */ new Date();
+    const startInstant = performance.now();
+    const result = await execute();
+    const endInstant = performance.now();
+    this.#onQuery?.({
+      timestamp,
+      duration: endInstant - startInstant,
+      query: query.sql,
+      params: query.args
+    });
+    return result;
+  }
 };
 function isEmpty(value) {
   if (Array.isArray(value)) {
@@ -429,22 +356,16 @@ function childRecordMatchesParent(childRecord, parentRecord, joinExpr) {
   return true;
 }
 
-// src/transactionManager/Transaction.ts
-var IsolationLevel = /* @__PURE__ */ ((IsolationLevel2) => {
-  IsolationLevel2["ReadUncommitted"] = "ReadUncommitted";
-  IsolationLevel2["ReadCommitted"] = "ReadCommitted";
-  IsolationLevel2["RepeatableRead"] = "RepeatableRead";
-  IsolationLevel2["Snapshot"] = "Snapshot";
-  IsolationLevel2["Serializable"] = "Serializable";
-  return IsolationLevel2;
-})(IsolationLevel || {});
-
 // src/transactionManager/TransactionManager.ts
 var import_debug = __toESM(require("@prisma/debug"));
 
-// src/utils.ts
-function assertNever(_, message) {
-  throw new Error(message);
+// src/crypto.ts
+async function getCrypto() {
+  return globalThis.crypto ?? await import("node:crypto");
+}
+async function randomUUID() {
+  const crypto = await getCrypto();
+  return crypto.randomUUID();
 }
 
 // src/transactionManager/TransactionManagerErrors.ts
@@ -452,8 +373,8 @@ var TransactionManagerError = class extends Error {
   constructor(message, meta) {
     super("Transaction API error: " + message);
     this.meta = meta;
-    __publicField(this, "code", "P2028");
   }
+  code = "P2028";
 };
 var TransactionDriverAdapterError = class extends TransactionManagerError {
   constructor(message, errorParams) {
@@ -503,35 +424,23 @@ var InvalidTransactionIsolationLevelError = class extends TransactionManagerErro
 
 // src/transactionManager/TransactionManager.ts
 var MAX_CLOSED_TRANSACTIONS = 100;
-var isolationLevelMap = {
-  ReadUncommitted: "READ UNCOMMITTED",
-  ReadCommitted: "READ COMMITTED",
-  RepeatableRead: "REPEATABLE READ",
-  Snapshot: "SNAPSHOT",
-  Serializable: "SERIALIZABLE"
-};
 var debug = (0, import_debug.default)("prisma:client:transactionManager");
 var COMMIT_QUERY = () => ({ sql: "COMMIT", args: [], argTypes: [] });
 var ROLLBACK_QUERY = () => ({ sql: "ROLLBACK", args: [], argTypes: [] });
-var ISOLATION_LEVEL_QUERY = (isolationLevel) => ({
-  sql: "SET TRANSACTION ISOLATION LEVEL " + isolationLevelMap[isolationLevel],
-  args: [],
-  argTypes: []
-});
 var TransactionManager = class {
+  // The map of active transactions.
+  transactions = /* @__PURE__ */ new Map();
+  // List of last closed transactions. Max MAX_CLOSED_TRANSACTIONS entries.
+  // Used to provide better error messages than a generic "transaction not found".
+  closedTransactions = [];
+  driverAdapter;
   constructor({ driverAdapter }) {
-    // The map of active transactions.
-    __publicField(this, "transactions", /* @__PURE__ */ new Map());
-    // List of last closed transactions. Max MAX_CLOSED_TRANSACTIONS entries.
-    // Used to provide better error messages than a generic "transaction not found".
-    __publicField(this, "closedTransactions", []);
-    __publicField(this, "driverAdapter");
     this.driverAdapter = driverAdapter;
   }
   async startTransaction(options) {
     const validatedOptions = this.validateOptions(options);
     const transaction = {
-      id: globalThis.crypto.randomUUID(),
+      id: await randomUUID(),
       status: "waiting",
       timer: void 0,
       timeout: validatedOptions.timeout,
@@ -540,28 +449,17 @@ var TransactionManager = class {
     };
     this.transactions.set(transaction.id, transaction);
     transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const txContext = await this.driverAdapter.transactionContext();
-    if (!txContext.ok)
+    let startedTransaction;
+    try {
+      startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    } catch (error) {
       throw new TransactionDriverAdapterError("Failed to start transaction.", {
-        driverAdapterError: txContext.error
+        driverAdapterError: error
       });
-    if (this.requiresSettingIsolationLevelFirst() && validatedOptions.isolationLevel) {
-      await txContext.value.executeRaw(ISOLATION_LEVEL_QUERY(validatedOptions.isolationLevel));
-    }
-    const startedTransaction = await txContext.value.startTransaction();
-    if (!startedTransaction.ok)
-      throw new TransactionDriverAdapterError("Failed to start transaction.", {
-        driverAdapterError: startedTransaction.error
-      });
-    if (!startedTransaction.value.options.usePhantomQuery) {
-      await startedTransaction.value.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
-      if (!this.requiresSettingIsolationLevelFirst() && validatedOptions.isolationLevel) {
-        await txContext.value.executeRaw(ISOLATION_LEVEL_QUERY(validatedOptions.isolationLevel));
-      }
     }
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction.value;
+        transaction.transaction = startedTransaction;
         clearTimeout(transaction.timer);
         transaction.timer = void 0;
         transaction.status = "running";
@@ -641,20 +539,24 @@ var TransactionManager = class {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
     if (tx.transaction && status === "committed") {
-      const result = await tx.transaction.commit();
-      if (!result.ok)
+      try {
+        await tx.transaction.commit();
+      } catch (error) {
         throw new TransactionDriverAdapterError("Failed to commit transaction.", {
-          driverAdapterError: result.error
+          driverAdapterError: error
         });
+      }
       if (!tx.transaction.options.usePhantomQuery) {
         await tx.transaction.executeRaw(COMMIT_QUERY());
       }
     } else if (tx.transaction) {
-      const result = await tx.transaction.rollback();
-      if (!result.ok)
+      try {
+        await tx.transaction.rollback();
+      } catch (error) {
         throw new TransactionDriverAdapterError("Failed to rollback transaction.", {
-          driverAdapterError: result.error
+          driverAdapterError: error
         });
+      }
       if (!tx.transaction.options.usePhantomQuery) {
         await tx.transaction.executeRaw(ROLLBACK_QUERY());
       }
@@ -670,23 +572,16 @@ var TransactionManager = class {
   validateOptions(options) {
     if (!options.timeout) throw new TransactionManagerError("timeout is required");
     if (!options.maxWait) throw new TransactionManagerError("maxWait is required");
-    if (options.isolationLevel === "Snapshot" /* Snapshot */)
-      throw new InvalidTransactionIsolationLevelError(options.isolationLevel);
-    if (this.driverAdapter.provider === "sqlite" && options.isolationLevel && options.isolationLevel !== "Serializable" /* Serializable */)
-      throw new InvalidTransactionIsolationLevelError(options.isolationLevel);
+    if (options.isolationLevel === "SNAPSHOT") throw new InvalidTransactionIsolationLevelError(options.isolationLevel);
     return {
       ...options,
       timeout: options.timeout,
       maxWait: options.maxWait
     };
   }
-  requiresSettingIsolationLevelFirst() {
-    return this.driverAdapter.provider === "mysql";
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  IsolationLevel,
   QueryInterpreter,
   TransactionManager,
   TransactionManagerError,

package/dist/index.mjs

@@ -1,121 +1,27 @@
-var __defProp = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-
 // src/QueryPlan.ts
 function isPrismaValuePlaceholder(value) {
   return typeof value === "object" && value !== null && value["prisma__type"] === "param";
 }
 
-// src/interpreter/renderQueryTemplate.ts
-var BEGIN_REPEAT = "/* prisma-comma-repeatable-start */";
-var END_REPEAT = "/* prisma-comma-repeatable-end */";
-function renderQueryTemplate({
-  query,
-  params
-}) {
-  if (!query.includes(BEGIN_REPEAT)) {
-    return { query, params };
-  }
-  const flattenedParams = [];
-  let lastParamId = 1;
-  let result = "";
-  let templatePos = 0;
-  let state = 0 /* Normal */;
-  let stateBeforeQuote = 0 /* Normal */;
-  while (templatePos < query.length) {
-    const nextChar = query[templatePos];
-    if (state === 1 /* Quoted */ && nextChar !== '"') {
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (nextChar === '"') {
-      if (state === 1 /* Quoted */) {
-        state = stateBeforeQuote;
-      } else {
-        stateBeforeQuote = state;
-        state = 1 /* Quoted */;
-      }
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + BEGIN_REPEAT.length) === BEGIN_REPEAT) {
-      if (state === 2 /* Repeating */) {
-        throw new Error("Nested repetition is not allowed");
-      }
-      state = 2 /* Repeating */;
-      templatePos += BEGIN_REPEAT.length;
-      result += "(";
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + END_REPEAT.length) === END_REPEAT) {
-      if (state === 0 /* Normal */) {
-        throw new Error("Unmatched repetition end");
-      }
-      state = 0 /* Normal */;
-      templatePos += END_REPEAT.length;
-      result += ")";
-      continue;
-    }
-    if (nextChar === "$") {
-      const paramMatch = query.slice(templatePos + 1).match(/^\d+/);
-      if (!paramMatch) {
-        result += "$";
-        templatePos++;
-        continue;
-      }
-      templatePos += paramMatch[0].length + 1;
-      const originalParamIdx = parseInt(paramMatch[0]);
-      const paramValue = params[originalParamIdx - 1];
-      switch (state) {
-        case 0 /* Normal */: {
-          flattenedParams.push(paramValue);
-          result += `$${lastParamId++}`;
-          break;
-        }
-        case 2 /* Repeating */: {
-          const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
-          if (paramArray.length === 0) {
-            result += "NULL";
-            break;
-          }
-          paramArray.forEach((value, idx) => {
-            flattenedParams.push(value);
-            result += `$${lastParamId++}`;
-            if (idx !== paramArray.length - 1) {
-              result += ", ";
-            }
-          });
-          break;
-        }
-        default: {
-          throw new Error(`Unexpected state: ${state}`);
-        }
-      }
-      continue;
-    }
-    result += nextChar;
-    templatePos++;
-  }
-  return {
-    query: result,
-    params: flattenedParams
-  };
+// src/utils.ts
+function assertNever(_, message) {
+  throw new Error(message);
 }
 
 // src/interpreter/renderQuery.ts
-function renderQuery({ query, params }, scope) {
-  const substitutedParams = params.map((param) => {
+function renderQuery(dbQuery, scope) {
+  const queryType = dbQuery.type;
+  switch (queryType) {
+    case "rawSql":
+      return renderRawSql(dbQuery.sql, substituteParams(dbQuery.params, scope));
+    case "templateSql":
+      return renderTemplateSql(dbQuery.fragments, dbQuery.placeholderFormat, substituteParams(dbQuery.params, scope));
+    default:
+      assertNever(queryType, `Invalid query type`);
+  }
+}
+function substituteParams(params, scope) {
+  return params.map((param) => {
     if (!isPrismaValuePlaceholder(param)) {
       return param;
     }
@@ -125,11 +31,48 @@ function renderQuery({ query, params }, scope) {
     }
     return value;
   });
-  const { query: renderedQuery, params: expandedParams } = renderQueryTemplate({ query, params: substitutedParams });
-  const argTypes = expandedParams.map((param) => toArgType(param));
+}
+function renderTemplateSql(fragments, placeholderFormat, params) {
+  let paramIndex = 0;
+  let placeholderNumber = 1;
+  const flattenedParams = [];
+  const sql = fragments.map((fragment) => {
+    const fragmentType = fragment.type;
+    switch (fragmentType) {
+      case "parameter":
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        flattenedParams.push(params[paramIndex++]);
+        return formatPlaceholder(placeholderFormat, placeholderNumber++);
+      case "stringChunk":
+        return fragment.value;
+      case "parameterTuple": {
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        const paramValue = params[paramIndex++];
+        const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
+        const placeholders = paramArray.length == 0 ? "NULL" : paramArray.map((value) => {
+          flattenedParams.push(value);
+          return formatPlaceholder(placeholderFormat, placeholderNumber++);
+        }).join(",");
+        return `(${placeholders})`;
+      }
+      default:
+        assertNever(fragmentType, "Invalid fragment type");
+    }
+  }).join("");
+  return renderRawSql(sql, flattenedParams);
+}
+function formatPlaceholder(placeholderFormat, placeholderNumber) {
+  return placeholderFormat.hasNumbering ? `${placeholderFormat.prefix}${placeholderNumber}` : placeholderFormat.prefix;
+}
+function renderRawSql(sql, params) {
+  const argTypes = params.map((param) => toArgType(param));
   return {
-    sql: renderedQuery,
-    args: expandedParams,
+    sql,
+    args: params,
     argTypes
   };
 }
@@ -198,19 +141,17 @@ function serialize(resultSet) {
 }
 
 // src/interpreter/QueryInterpreter.ts
-var _queryable, _placeholderValues, _onQuery, _QueryInterpreter_instances, withQueryEvent_fn;
 var QueryInterpreter = class {
+  #queryable;
+  #placeholderValues;
+  #onQuery;
   constructor({ queryable, placeholderValues, onQuery }) {
-    __privateAdd(this, _QueryInterpreter_instances);
-    __privateAdd(this, _queryable);
-    __privateAdd(this, _placeholderValues);
-    __privateAdd(this, _onQuery);
-    __privateSet(this, _queryable, queryable);
-    __privateSet(this, _placeholderValues, placeholderValues);
-    __privateSet(this, _onQuery, onQuery);
+    this.#queryable = queryable;
+    this.#placeholderValues = placeholderValues;
+    this.#onQuery = onQuery;
   }
   async run(queryPlan) {
-    return this.interpretNode(queryPlan, __privateGet(this, _placeholderValues));
+    return this.interpretNode(queryPlan, this.#placeholderValues);
   }
   async interpretNode(node, scope) {
     switch (node.type) {
@@ -249,24 +190,14 @@ var QueryInterpreter = class {
       }
       case "execute": {
         const query = renderQuery(node.args, scope);
-        return __privateMethod(this, _QueryInterpreter_instances, withQueryEvent_fn).call(this, query, async () => {
-          const result = await __privateGet(this, _queryable).executeRaw(query);
-          if (result.ok) {
-            return result.value;
-          } else {
-            throw result.error;
-          }
+        return this.#withQueryEvent(query, async () => {
+          return await this.#queryable.executeRaw(query);
         });
       }
       case "query": {
         const query = renderQuery(node.args, scope);
-        return __privateMethod(this, _QueryInterpreter_instances, withQueryEvent_fn).call(this, query, async () => {
-          const result = await __privateGet(this, _queryable).queryRaw(query);
-          if (result.ok) {
-            return serialize(result.value);
-          } else {
-            throw result.error;
-          }
+        return this.#withQueryEvent(query, async () => {
+          return serialize(await this.#queryable.queryRaw(query));
         });
       }
       case "reverse": {
@@ -316,24 +247,19 @@ var QueryInterpreter = class {
       }
     }
   }
-};
-_queryable = new WeakMap();
-_placeholderValues = new WeakMap();
-_onQuery = new WeakMap();
-_QueryInterpreter_instances = new WeakSet();
-withQueryEvent_fn = async function(query, execute) {
-  var _a;
-  const timestamp = /* @__PURE__ */ new Date();
-  const startInstant = performance.now();
-  const result = await execute();
-  const endInstant = performance.now();
-  (_a = __privateGet(this, _onQuery)) == null ? void 0 : _a.call(this, {
-    timestamp,
-    duration: endInstant - startInstant,
-    query: query.sql,
-    params: query.args
-  });
-  return result;
+  async #withQueryEvent(query, execute) {
+    const timestamp = /* @__PURE__ */ new Date();
+    const startInstant = performance.now();
+    const result = await execute();
+    const endInstant = performance.now();
+    this.#onQuery?.({
+      timestamp,
+      duration: endInstant - startInstant,
+      query: query.sql,
+      params: query.args
+    });
+    return result;
+  }
 };
 function isEmpty(value) {
   if (Array.isArray(value)) {
@@ -391,22 +317,16 @@ function childRecordMatchesParent(childRecord, parentRecord, joinExpr) {
   return true;
 }
 
-// src/transactionManager/Transaction.ts
-var IsolationLevel = /* @__PURE__ */ ((IsolationLevel2) => {
-  IsolationLevel2["ReadUncommitted"] = "ReadUncommitted";
-  IsolationLevel2["ReadCommitted"] = "ReadCommitted";
-  IsolationLevel2["RepeatableRead"] = "RepeatableRead";
-  IsolationLevel2["Snapshot"] = "Snapshot";
-  IsolationLevel2["Serializable"] = "Serializable";
-  return IsolationLevel2;
-})(IsolationLevel || {});
-
 // src/transactionManager/TransactionManager.ts
 import Debug from "@prisma/debug";
 
-// src/utils.ts
-function assertNever(_, message) {
-  throw new Error(message);
+// src/crypto.ts
+async function getCrypto() {
+  return globalThis.crypto ?? await import("node:crypto");
+}
+async function randomUUID() {
+  const crypto = await getCrypto();
+  return crypto.randomUUID();
 }
 
 // src/transactionManager/TransactionManagerErrors.ts
@@ -414,8 +334,8 @@ var TransactionManagerError = class extends Error {
   constructor(message, meta) {
     super("Transaction API error: " + message);
     this.meta = meta;
-    __publicField(this, "code", "P2028");
   }
+  code = "P2028";
 };
 var TransactionDriverAdapterError = class extends TransactionManagerError {
   constructor(message, errorParams) {
@@ -465,35 +385,23 @@ var InvalidTransactionIsolationLevelError = class extends TransactionManagerErro
 
 // src/transactionManager/TransactionManager.ts
 var MAX_CLOSED_TRANSACTIONS = 100;
-var isolationLevelMap = {
-  ReadUncommitted: "READ UNCOMMITTED",
-  ReadCommitted: "READ COMMITTED",
-  RepeatableRead: "REPEATABLE READ",
-  Snapshot: "SNAPSHOT",
-  Serializable: "SERIALIZABLE"
-};
 var debug = Debug("prisma:client:transactionManager");
 var COMMIT_QUERY = () => ({ sql: "COMMIT", args: [], argTypes: [] });
 var ROLLBACK_QUERY = () => ({ sql: "ROLLBACK", args: [], argTypes: [] });
-var ISOLATION_LEVEL_QUERY = (isolationLevel) => ({
-  sql: "SET TRANSACTION ISOLATION LEVEL " + isolationLevelMap[isolationLevel],
-  args: [],
-  argTypes: []
-});
 var TransactionManager = class {
+  // The map of active transactions.
+  transactions = /* @__PURE__ */ new Map();
+  // List of last closed transactions. Max MAX_CLOSED_TRANSACTIONS entries.
+  // Used to provide better error messages than a generic "transaction not found".
+  closedTransactions = [];
+  driverAdapter;
   constructor({ driverAdapter }) {
-    // The map of active transactions.
-    __publicField(this, "transactions", /* @__PURE__ */ new Map());
-    // List of last closed transactions. Max MAX_CLOSED_TRANSACTIONS entries.
-    // Used to provide better error messages than a generic "transaction not found".
-    __publicField(this, "closedTransactions", []);
-    __publicField(this, "driverAdapter");
     this.driverAdapter = driverAdapter;
   }
   async startTransaction(options) {
     const validatedOptions = this.validateOptions(options);
     const transaction = {
-      id: globalThis.crypto.randomUUID(),
+      id: await randomUUID(),
       status: "waiting",
       timer: void 0,
       timeout: validatedOptions.timeout,
@@ -502,28 +410,17 @@ var TransactionManager = class {
     };
     this.transactions.set(transaction.id, transaction);
     transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const txContext = await this.driverAdapter.transactionContext();
-    if (!txContext.ok)
+    let startedTransaction;
+    try {
+      startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    } catch (error) {
       throw new TransactionDriverAdapterError("Failed to start transaction.", {
-        driverAdapterError: txContext.error
+        driverAdapterError: error
       });
-    if (this.requiresSettingIsolationLevelFirst() && validatedOptions.isolationLevel) {
-      await txContext.value.executeRaw(ISOLATION_LEVEL_QUERY(validatedOptions.isolationLevel));
-    }
-    const startedTransaction = await txContext.value.startTransaction();
-    if (!startedTransaction.ok)
-      throw new TransactionDriverAdapterError("Failed to start transaction.", {
-        driverAdapterError: startedTransaction.error
-      });
-    if (!startedTransaction.value.options.usePhantomQuery) {
-      await startedTransaction.value.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
-      if (!this.requiresSettingIsolationLevelFirst() && validatedOptions.isolationLevel) {
-        await txContext.value.executeRaw(ISOLATION_LEVEL_QUERY(validatedOptions.isolationLevel));
-      }
     }
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction.value;
+        transaction.transaction = startedTransaction;
         clearTimeout(transaction.timer);
         transaction.timer = void 0;
         transaction.status = "running";
@@ -603,20 +500,24 @@ var TransactionManager = class {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
     if (tx.transaction && status === "committed") {
-      const result = await tx.transaction.commit();
-      if (!result.ok)
+      try {
+        await tx.transaction.commit();
+      } catch (error) {
         throw new TransactionDriverAdapterError("Failed to commit transaction.", {
-          driverAdapterError: result.error
+          driverAdapterError: error
         });
+      }
       if (!tx.transaction.options.usePhantomQuery) {
         await tx.transaction.executeRaw(COMMIT_QUERY());
       }
     } else if (tx.transaction) {
-      const result = await tx.transaction.rollback();
-      if (!result.ok)
+      try {
+        await tx.transaction.rollback();
+      } catch (error) {
         throw new TransactionDriverAdapterError("Failed to rollback transaction.", {
-          driverAdapterError: result.error
+          driverAdapterError: error
         });
+      }
       if (!tx.transaction.options.usePhantomQuery) {
         await tx.transaction.executeRaw(ROLLBACK_QUERY());
       }
@@ -632,22 +533,15 @@ var TransactionManager = class {
   validateOptions(options) {
     if (!options.timeout) throw new TransactionManagerError("timeout is required");
     if (!options.maxWait) throw new TransactionManagerError("maxWait is required");
-    if (options.isolationLevel === "Snapshot" /* Snapshot */)
-      throw new InvalidTransactionIsolationLevelError(options.isolationLevel);
-    if (this.driverAdapter.provider === "sqlite" && options.isolationLevel && options.isolationLevel !== "Serializable" /* Serializable */)
-      throw new InvalidTransactionIsolationLevelError(options.isolationLevel);
+    if (options.isolationLevel === "SNAPSHOT") throw new InvalidTransactionIsolationLevelError(options.isolationLevel);
     return {
       ...options,
       timeout: options.timeout,
       maxWait: options.maxWait
     };
   }
-  requiresSettingIsolationLevelFirst() {
-    return this.driverAdapter.provider === "mysql";
-  }
 };
 export {
-  IsolationLevel,
   QueryInterpreter,
   TransactionManager,
   TransactionManagerError,

package/dist/interpreter/QueryInterpreter.d.ts

@@ -1,8 +1,8 @@
-import { ErrorCapturingSqlQueryable } from '@prisma/driver-adapter-utils';
+import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { QueryEvent } from '../events';
 import { QueryPlanNode } from '../QueryPlan';
 export type QueryInterpreterOptions = {
-    queryable: ErrorCapturingSqlQueryable;
+    queryable: SqlQueryable;
     placeholderValues: Record<string, unknown>;
     onQuery?: (event: QueryEvent) => void;
 };

package/dist/interpreter/renderQuery.d.ts

@@ -1,4 +1,4 @@
 import { SqlQuery } from '@prisma/driver-adapter-utils';
-import { QueryPlanDbQuery } from '../QueryPlan';
+import type { QueryPlanDbQuery } from '../QueryPlan';
 import { ScopeBindings } from './scope';
-export declare function renderQuery({ query, params }: QueryPlanDbQuery, scope: ScopeBindings): SqlQuery;
+export declare function renderQuery(dbQuery: QueryPlanDbQuery, scope: ScopeBindings): SqlQuery;

package/dist/transactionManager/Transaction.d.ts

@@ -1,10 +1,4 @@
-export declare const enum IsolationLevel {
-    ReadUncommitted = "ReadUncommitted",
-    ReadCommitted = "ReadCommitted",
-    RepeatableRead = "RepeatableRead",
-    Snapshot = "Snapshot",
-    Serializable = "Serializable"
-}
+import type { IsolationLevel } from '@prisma/driver-adapter-utils';
 export type Options = {
     maxWait?: number;
     timeout?: number;

package/dist/transactionManager/TransactionManager.d.ts

@@ -1,20 +1,19 @@
-import { ErrorCapturingSqlConnection, ErrorCapturingTransaction } from '@prisma/driver-adapter-utils';
+import { SqlDriverAdapter, Transaction } from '@prisma/driver-adapter-utils';
 import { Options, TransactionInfo } from './Transaction';
 export declare class TransactionManager {
     private transactions;
     private closedTransactions;
     private readonly driverAdapter;
     constructor({ driverAdapter }: {
-        driverAdapter: ErrorCapturingSqlConnection;
+        driverAdapter: SqlDriverAdapter;
     });
     startTransaction(options: Options): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;
     rollbackTransaction(transactionId: string): Promise<void>;
-    getTransaction(txInfo: TransactionInfo, operation: string): ErrorCapturingTransaction;
+    getTransaction(txInfo: TransactionInfo, operation: string): Transaction;
     private getActiveTransaction;
     cancelAllTransactions(): Promise<void>;
     private startTransactionTimeout;
     private closeTransaction;
     private validateOptions;
-    private requiresSettingIsolationLevelFirst;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.6.0-dev.7",
+  "version": "6.6.0-dev.70",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -20,12 +20,12 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/prisma/prisma.git",
-    "directory": "packages/accelerate-contract"
+    "directory": "packages/client-engine-runtime"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@prisma/debug": "6.6.0-dev.7",
-    "@prisma/driver-adapter-utils": "6.6.0-dev.7"
+    "@prisma/debug": "6.6.0-dev.70",
+    "@prisma/driver-adapter-utils": "6.6.0-dev.70"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",

package/dist/interpreter/renderQueryTemplate.d.ts

@@ -1,10 +0,0 @@
-import { Value } from './scope';
-/**
- * A `QueryPlanDbQuery` in which all placeholders have been substituted with
- * their values from the environment.
- */
-export type QueryWithSubstitutedPlaceholders = {
-    query: string;
-    params: Value[];
-};
-export declare function renderQueryTemplate({ query, params, }: QueryWithSubstitutedPlaceholders): QueryWithSubstitutedPlaceholders;