@prisma/client-engine-runtime 7.2.0 → 7.3.0-integration-fix-6-19-0-cloudflare-accelerate-engine.1

package/dist/index.d.mts

@@ -2,24 +2,15 @@ import { ArgType } from '@prisma/driver-adapter-utils';
 import { Arity } from '@prisma/driver-adapter-utils';
 import { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import { Context } from '@opentelemetry/api';
-import { Decimal } from '@prisma/client-runtime-utils';
+import { Decimal } from 'decimal.js';
 import type { IsolationLevel } from '@prisma/driver-adapter-utils';
 import { Span } from '@opentelemetry/api';
 import { SpanOptions } from '@opentelemetry/api';
-import type { SqlCommenterContext } from '@prisma/sqlcommenter';
-import type { SqlCommenterPlugin } from '@prisma/sqlcommenter';
-import type { SqlCommenterQueryInfo } from '@prisma/sqlcommenter';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
-/**
- * Applies SQL commenter plugins and returns the merged key-value pairs.
- * Keys with undefined values are filtered out.
- */
-export declare function applySqlCommenters(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): Record<string, string>;
-
 export declare type BatchResponse = MultiBatchResponse | CompactedBatchResponse;
 
 export declare type BigIntTaggedValue = {
@@ -47,11 +38,8 @@ export declare type CompactedBatchResponse = {
  */
 export declare function convertCompactedRows(rows: {}[], compiledBatch: CompactedBatchResponse): unknown[];
 
-export declare class DataMapperError extends UserFacingError {
+export declare class DataMapperError extends Error {
     name: string;
-    constructor(message: string, options?: {
-        cause?: unknown;
-    });
 }
 
 export declare type DataRule = {
@@ -246,7 +234,7 @@ export declare type QueryEvent = {
 
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, sqlCommenter, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
@@ -254,7 +242,6 @@ export declare class QueryInterpreter {
         tracingHelper: TracingHelper;
         provider?: SchemaProvider;
         connectionInfo?: ConnectionInfo;
-        sqlCommenter?: QueryInterpreterSqlCommenter;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;
@@ -269,12 +256,6 @@ export declare type QueryInterpreterOptions = {
     rawSerializer?: (results: SqlResultSet) => Value;
     provider?: SchemaProvider;
     connectionInfo?: ConnectionInfo;
-    sqlCommenter?: QueryInterpreterSqlCommenter;
-};
-
-export declare type QueryInterpreterSqlCommenter = {
-    plugins: SqlCommenterPlugin[];
-    queryInfo: SqlCommenterQueryInfo;
 };
 
 export declare type QueryInterpreterTransactionManager = {

package/dist/index.d.ts

@@ -2,24 +2,15 @@ import { ArgType } from '@prisma/driver-adapter-utils';
 import { Arity } from '@prisma/driver-adapter-utils';
 import { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import { Context } from '@opentelemetry/api';
-import { Decimal } from '@prisma/client-runtime-utils';
+import { Decimal } from 'decimal.js';
 import type { IsolationLevel } from '@prisma/driver-adapter-utils';
 import { Span } from '@opentelemetry/api';
 import { SpanOptions } from '@opentelemetry/api';
-import type { SqlCommenterContext } from '@prisma/sqlcommenter';
-import type { SqlCommenterPlugin } from '@prisma/sqlcommenter';
-import type { SqlCommenterQueryInfo } from '@prisma/sqlcommenter';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
-/**
- * Applies SQL commenter plugins and returns the merged key-value pairs.
- * Keys with undefined values are filtered out.
- */
-export declare function applySqlCommenters(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): Record<string, string>;
-
 export declare type BatchResponse = MultiBatchResponse | CompactedBatchResponse;
 
 export declare type BigIntTaggedValue = {
@@ -47,11 +38,8 @@ export declare type CompactedBatchResponse = {
  */
 export declare function convertCompactedRows(rows: {}[], compiledBatch: CompactedBatchResponse): unknown[];
 
-export declare class DataMapperError extends UserFacingError {
+export declare class DataMapperError extends Error {
     name: string;
-    constructor(message: string, options?: {
-        cause?: unknown;
-    });
 }
 
 export declare type DataRule = {
@@ -246,7 +234,7 @@ export declare type QueryEvent = {
 
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, sqlCommenter, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
@@ -254,7 +242,6 @@ export declare class QueryInterpreter {
         tracingHelper: TracingHelper;
         provider?: SchemaProvider;
         connectionInfo?: ConnectionInfo;
-        sqlCommenter?: QueryInterpreterSqlCommenter;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;
@@ -269,12 +256,6 @@ export declare type QueryInterpreterOptions = {
     rawSerializer?: (results: SqlResultSet) => Value;
     provider?: SchemaProvider;
     connectionInfo?: ConnectionInfo;
-    sqlCommenter?: QueryInterpreterSqlCommenter;
-};
-
-export declare type QueryInterpreterSqlCommenter = {
-    plugins: SqlCommenterPlugin[];
-    queryInfo: SqlCommenterQueryInfo;
 };
 
 export declare type QueryInterpreterTransactionManager = {

package/dist/index.js

@@ -35,7 +35,6 @@ __export(index_exports, {
   TransactionManager: () => TransactionManager,
   TransactionManagerError: () => TransactionManagerError,
   UserFacingError: () => UserFacingError,
-  applySqlCommenters: () => applySqlCommenters,
   convertCompactedRows: () => convertCompactedRows,
   deserializeJsonResponse: () => deserializeJsonResponse,
   doKeysMatch: () => doKeysMatch,
@@ -50,10 +49,10 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/json-protocol.ts
-var import_client_runtime_utils2 = require("@prisma/client-runtime-utils");
+var import_decimal2 = require("decimal.js");
 
 // src/utils.ts
-var import_client_runtime_utils = require("@prisma/client-runtime-utils");
+var import_decimal = __toESM(require("decimal.js"));
 function assertNever(_, message) {
   throw new Error(message);
 }
@@ -68,7 +67,7 @@ function doKeysMatch(lhs, rhs) {
     if (typeof lhs[key] === typeof rhs[key] && typeof lhs[key] !== "object") {
       return lhs[key] === rhs[key];
     }
-    if (import_client_runtime_utils.Decimal.isDecimal(lhs[key]) || import_client_runtime_utils.Decimal.isDecimal(rhs[key])) {
+    if (import_decimal.default.isDecimal(lhs[key]) || import_decimal.default.isDecimal(rhs[key])) {
       const lhsDecimal = asDecimal(lhs[key]);
       const rhsDecimal = asDecimal(rhs[key]);
       return lhsDecimal && rhsDecimal && lhsDecimal.equals(rhsDecimal);
@@ -87,10 +86,10 @@ function doKeysMatch(lhs, rhs) {
   });
 }
 function asDecimal(value) {
-  if (import_client_runtime_utils.Decimal.isDecimal(value)) {
+  if (import_decimal.default.isDecimal(value)) {
     return value;
   } else if (typeof value === "number" || typeof value === "string") {
-    return new import_client_runtime_utils.Decimal(value);
+    return new import_decimal.default(value);
   } else {
     return;
   }
@@ -179,7 +178,7 @@ function normalizeTaggedValue({ $type, value }) {
     case "DateTime":
       return { $type, value: new Date(value).toISOString() };
     case "Decimal":
-      return { $type, value: String(new import_client_runtime_utils2.Decimal(value)) };
+      return { $type, value: String(new import_decimal2.Decimal(value)) };
     case "Json":
       return { $type, value: JSON.stringify(JSON.parse(value)) };
     default:
@@ -222,7 +221,7 @@ function deserializeTaggedValue({ $type, value }) {
     case "DateTime":
       return new Date(value);
     case "Decimal":
-      return new import_client_runtime_utils2.Decimal(value);
+      return new import_decimal2.Decimal(value);
     case "Json":
       return JSON.parse(value);
     default:
@@ -300,8 +299,6 @@ function getErrorCode(err) {
       return "P2002";
     case "ForeignKeyConstraintViolation":
       return "P2003";
-    case "InvalidInputValue":
-      return "P2007";
     case "UnsupportedNativeDataType":
       return "P2010";
     case "NullConstraintViolation":
@@ -398,8 +395,6 @@ function renderErrorMessage(err) {
       return `Error in external connector (id ${err.cause.id})`;
     case "TooManyConnections":
       return `Too many database connections opened: ${err.cause.cause}`;
-    case "InvalidInputValue":
-      return `Invalid input value: ${err.cause.message}`;
     case "sqlite":
     case "postgres":
     case "mysql":
@@ -448,12 +443,9 @@ function convertCompactedRows(rows, compiledBatch) {
 }
 
 // src/interpreter/data-mapper.ts
-var import_client_runtime_utils3 = require("@prisma/client-runtime-utils");
-var DataMapperError = class extends UserFacingError {
+var import_decimal3 = __toESM(require("decimal.js"));
+var DataMapperError = class extends Error {
   name = "DataMapperError";
-  constructor(message, options) {
-    super(message, "P2023", options);
-  }
 };
 function applyDataMap(data, structure, enums) {
   switch (structure.type) {
@@ -604,7 +596,7 @@ function mapValue(value, columnName, scalarType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
-      if (Array.isArray(value) || value instanceof Uint8Array) {
+      if (Array.isArray(value)) {
         for (const byte of value) {
           if (byte !== 0) return true;
         }
@@ -613,7 +605,7 @@ function mapValue(value, columnName, scalarType, enums) {
       throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "decimal":
-      if (typeof value !== "number" && typeof value !== "string" && !import_client_runtime_utils3.Decimal.isDecimal(value)) {
+      if (typeof value !== "number" && typeof value !== "string" && !import_decimal3.default.isDecimal(value)) {
         throw new DataMapperError(`Expected a decimal in column '${columnName}', got ${typeof value}: ${value}`);
       }
       return { $type: "Decimal", value };
@@ -699,43 +691,6 @@ function normalizeDateTime(dt) {
   return dtWithTz;
 }
 
-// src/sql-commenter.ts
-function formatSqlComment(tags) {
-  const entries = Object.entries(tags);
-  if (entries.length === 0) {
-    return "";
-  }
-  entries.sort(([a], [b]) => a.localeCompare(b));
-  const parts = entries.map(([key, value]) => {
-    const encodedKey = encodeURIComponent(key);
-    const encodedValue = encodeURIComponent(value).replace(/'/g, "\\'");
-    return `${encodedKey}='${encodedValue}'`;
-  });
-  return `/*${parts.join(",")}*/`;
-}
-function applySqlCommenters(plugins, context) {
-  const merged = {};
-  for (const plugin of plugins) {
-    const tags = plugin(context);
-    for (const [key, value] of Object.entries(tags)) {
-      if (value !== void 0) {
-        merged[key] = value;
-      }
-    }
-  }
-  return merged;
-}
-function buildSqlComment(plugins, context) {
-  const tags = applySqlCommenters(plugins, context);
-  return formatSqlComment(tags);
-}
-function appendSqlComment(sql, comment) {
-  if (!comment) {
-    return sql;
-  }
-  return `${sql} ${comment}`;
-}
-
 // src/tracing.ts
 var import_api = require("@opentelemetry/api");
 var noopTracingHelper = {
@@ -1301,6 +1256,17 @@ function serializeRawValue(value, type) {
         throw new Error(`Cannot serialize value of type ${typeof value} as JsonArray`);
       }
       return value.map((v) => serializeRawValue(v, import_driver_adapter_utils2.ColumnTypeEnum.Json));
+    case import_driver_adapter_utils2.ColumnTypeEnum.Bytes:
+      if (Array.isArray(value)) {
+        return new Uint8Array(value);
+      } else {
+        throw new Error(`Cannot serialize value of type ${typeof value} as Bytes`);
+      }
+    case import_driver_adapter_utils2.ColumnTypeEnum.BytesArray:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as BytesArray`);
+      }
+      return value.map((v) => serializeRawValue(v, import_driver_adapter_utils2.ColumnTypeEnum.Bytes));
     case import_driver_adapter_utils2.ColumnTypeEnum.Boolean:
       switch (typeof value) {
         case "boolean":
@@ -1475,8 +1441,7 @@ var QueryInterpreter = class _QueryInterpreter {
   #serializer;
   #rawSerializer;
   #provider;
-  #connectionInfo;
-  #sqlCommenter;
+  #connectioInfo;
   constructor({
     transactionManager,
     placeholderValues,
@@ -1485,8 +1450,7 @@ var QueryInterpreter = class _QueryInterpreter {
     serializer,
     rawSerializer,
     provider,
-    connectionInfo,
-    sqlCommenter
+    connectionInfo
   }) {
     this.#transactionManager = transactionManager;
     this.#placeholderValues = placeholderValues;
@@ -1495,8 +1459,7 @@ var QueryInterpreter = class _QueryInterpreter {
     this.#serializer = serializer;
     this.#rawSerializer = rawSerializer ?? serializer;
     this.#provider = provider;
-    this.#connectionInfo = connectionInfo;
-    this.#sqlCommenter = sqlCommenter;
+    this.#connectioInfo = connectionInfo;
   }
   static forSql(options) {
     return new _QueryInterpreter({
@@ -1507,8 +1470,7 @@ var QueryInterpreter = class _QueryInterpreter {
       serializer: serializeSql,
       rawSerializer: serializeRawSql,
       provider: options.provider,
-      connectionInfo: options.connectionInfo,
-      sqlCommenter: options.sqlCommenter
+      connectionInfo: options.connectionInfo
     });
   }
   async run(queryPlan, queryable) {
@@ -1572,11 +1534,10 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let sum = 0;
         for (const query of queries) {
-          const commentedQuery = this.#applyComments(query);
           sum += await this.#withQuerySpanAndEvent(
-            commentedQuery,
+            query,
             queryable,
-            () => queryable.executeRaw(commentedQuery).catch(
+            () => queryable.executeRaw(query).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1587,11 +1548,10 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let results;
         for (const query of queries) {
-          const commentedQuery = this.#applyComments(query);
           const result = await this.#withQuerySpanAndEvent(
-            commentedQuery,
+            query,
             queryable,
-            () => queryable.queryRaw(commentedQuery).catch(
+            () => queryable.queryRaw(query).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1713,8 +1673,8 @@ var QueryInterpreter = class _QueryInterpreter {
     }
   }
   #maxChunkSize() {
-    if (this.#connectionInfo?.maxBindValues !== void 0) {
-      return this.#connectionInfo.maxBindValues;
+    if (this.#connectioInfo?.maxBindValues !== void 0) {
+      return this.#connectioInfo.maxBindValues;
     }
     return this.#providerMaxChunkSize();
   }
@@ -1749,22 +1709,6 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: this.#onQuery
     });
   }
-  #applyComments(query) {
-    if (!this.#sqlCommenter || this.#sqlCommenter.plugins.length === 0) {
-      return query;
-    }
-    const comment = buildSqlComment(this.#sqlCommenter.plugins, {
-      query: this.#sqlCommenter.queryInfo,
-      sql: query.sql
-    });
-    if (!comment) {
-      return query;
-    }
-    return {
-      ...query,
-      sql: appendSqlComment(query.sql, comment)
-    };
-  }
 };
 function isEmpty(value) {
   if (Array.isArray(value)) {
@@ -1867,7 +1811,7 @@ function evalFieldOperation(op, value, scope, generators) {
 }
 
 // src/raw-json-protocol.ts
-var import_client_runtime_utils4 = require("@prisma/client-runtime-utils");
+var import_decimal4 = __toESM(require("decimal.js"));
 function normalizeRawJsonProtocolResponse(response) {
   for (let i = 0; i < response.rows.length; i++) {
     const row = response.rows[i];
@@ -1885,7 +1829,7 @@ function normalizeValue(type, value) {
     case "bigint":
       return String(BigInt(value));
     case "decimal":
-      return String(new import_client_runtime_utils4.Decimal(value));
+      return String(new import_decimal4.default(value));
     case "bigint-array":
       return value.map((v) => normalizeValue("bigint", v));
     case "decimal-array":
@@ -1907,13 +1851,6 @@ async function randomUUID() {
   return crypto.randomUUID();
 }
 
-// src/web-platform.ts
-async function once(target, event) {
-  return new Promise((resolve) => {
-    target.addEventListener(event, resolve, { once: true });
-  });
-}
-
 // src/transaction-manager/transaction-manager-error.ts
 var TransactionManagerError = class extends UserFacingError {
   name = "TransactionManagerError";
@@ -2029,19 +1966,15 @@ var TransactionManager = class {
       startedAt: Date.now(),
       transaction: void 0
     };
-    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([
-      startTransactionPromise.finally(() => clearTimeout(startTimer)),
-      once(abortController.signal, "abort").then(() => void 0)
-    ]);
     this.transactions.set(transaction.id, transaction);
+    let hasTimedOut = false;
+    const startTimer = createTimeoutIfDefined(() => hasTimedOut = true, options.maxWait);
+    startTimer?.unref?.();
+    transaction.transaction = await this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
+    clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
-        if (abortController.signal.aborted) {
-          void startTransactionPromise.then((tx) => tx.rollback()).catch((e) => debug("error in discarded transaction:", e));
+        if (hasTimedOut) {
           await this.#closeTransaction(transaction, "timed_out");
           throw new TransactionStartTimeoutError();
         }
@@ -2137,13 +2070,8 @@ var TransactionManager = class {
             await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
           } else {
             const query = COMMIT_QUERY();
-            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query)).then(
-              () => tx.transaction.commit(),
-              (err) => {
-                const fail = () => Promise.reject(err);
-                return tx.transaction.rollback().then(fail, fail);
-              }
-            );
+            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+            await tx.transaction.commit();
           }
         } else if (tx.transaction) {
           if (tx.transaction.options.usePhantomQuery) {
@@ -2154,11 +2082,8 @@ var TransactionManager = class {
             );
           } else {
             const query = ROLLBACK_QUERY();
-            try {
-              await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-            } finally {
-              await tx.transaction.rollback();
-            }
+            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+            await tx.transaction.rollback();
           }
         }
       } finally {
@@ -2213,7 +2138,6 @@ function createTimeoutIfDefined(cb, ms) {
   TransactionManager,
   TransactionManagerError,
   UserFacingError,
-  applySqlCommenters,
   convertCompactedRows,
   deserializeJsonResponse,
   doKeysMatch,

package/dist/index.mjs

@@ -1,8 +1,8 @@
 // src/json-protocol.ts
-import { Decimal as Decimal2 } from "@prisma/client-runtime-utils";
+import { Decimal as Decimal2 } from "decimal.js";
 
 // src/utils.ts
-import { Decimal } from "@prisma/client-runtime-utils";
+import Decimal from "decimal.js";
 function assertNever(_, message) {
   throw new Error(message);
 }
@@ -249,8 +249,6 @@ function getErrorCode(err) {
       return "P2002";
     case "ForeignKeyConstraintViolation":
       return "P2003";
-    case "InvalidInputValue":
-      return "P2007";
     case "UnsupportedNativeDataType":
       return "P2010";
     case "NullConstraintViolation":
@@ -347,8 +345,6 @@ function renderErrorMessage(err) {
       return `Error in external connector (id ${err.cause.id})`;
     case "TooManyConnections":
       return `Too many database connections opened: ${err.cause.cause}`;
-    case "InvalidInputValue":
-      return `Invalid input value: ${err.cause.message}`;
     case "sqlite":
     case "postgres":
     case "mysql":
@@ -397,12 +393,9 @@ function convertCompactedRows(rows, compiledBatch) {
 }
 
 // src/interpreter/data-mapper.ts
-import { Decimal as Decimal3 } from "@prisma/client-runtime-utils";
-var DataMapperError = class extends UserFacingError {
+import Decimal3 from "decimal.js";
+var DataMapperError = class extends Error {
   name = "DataMapperError";
-  constructor(message, options) {
-    super(message, "P2023", options);
-  }
 };
 function applyDataMap(data, structure, enums) {
   switch (structure.type) {
@@ -553,7 +546,7 @@ function mapValue(value, columnName, scalarType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
-      if (Array.isArray(value) || value instanceof Uint8Array) {
+      if (Array.isArray(value)) {
         for (const byte of value) {
           if (byte !== 0) return true;
         }
@@ -648,43 +641,6 @@ function normalizeDateTime(dt) {
   return dtWithTz;
 }
 
-// src/sql-commenter.ts
-function formatSqlComment(tags) {
-  const entries = Object.entries(tags);
-  if (entries.length === 0) {
-    return "";
-  }
-  entries.sort(([a], [b]) => a.localeCompare(b));
-  const parts = entries.map(([key, value]) => {
-    const encodedKey = encodeURIComponent(key);
-    const encodedValue = encodeURIComponent(value).replace(/'/g, "\\'");
-    return `${encodedKey}='${encodedValue}'`;
-  });
-  return `/*${parts.join(",")}*/`;
-}
-function applySqlCommenters(plugins, context) {
-  const merged = {};
-  for (const plugin of plugins) {
-    const tags = plugin(context);
-    for (const [key, value] of Object.entries(tags)) {
-      if (value !== void 0) {
-        merged[key] = value;
-      }
-    }
-  }
-  return merged;
-}
-function buildSqlComment(plugins, context) {
-  const tags = applySqlCommenters(plugins, context);
-  return formatSqlComment(tags);
-}
-function appendSqlComment(sql, comment) {
-  if (!comment) {
-    return sql;
-  }
-  return `${sql} ${comment}`;
-}
-
 // src/tracing.ts
 import { SpanKind } from "@opentelemetry/api";
 var noopTracingHelper = {
@@ -1250,6 +1206,17 @@ function serializeRawValue(value, type) {
         throw new Error(`Cannot serialize value of type ${typeof value} as JsonArray`);
       }
       return value.map((v) => serializeRawValue(v, ColumnTypeEnum.Json));
+    case ColumnTypeEnum.Bytes:
+      if (Array.isArray(value)) {
+        return new Uint8Array(value);
+      } else {
+        throw new Error(`Cannot serialize value of type ${typeof value} as Bytes`);
+      }
+    case ColumnTypeEnum.BytesArray:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as BytesArray`);
+      }
+      return value.map((v) => serializeRawValue(v, ColumnTypeEnum.Bytes));
     case ColumnTypeEnum.Boolean:
       switch (typeof value) {
         case "boolean":
@@ -1424,8 +1391,7 @@ var QueryInterpreter = class _QueryInterpreter {
   #serializer;
   #rawSerializer;
   #provider;
-  #connectionInfo;
-  #sqlCommenter;
+  #connectioInfo;
   constructor({
     transactionManager,
     placeholderValues,
@@ -1434,8 +1400,7 @@ var QueryInterpreter = class _QueryInterpreter {
     serializer,
     rawSerializer,
     provider,
-    connectionInfo,
-    sqlCommenter
+    connectionInfo
   }) {
     this.#transactionManager = transactionManager;
     this.#placeholderValues = placeholderValues;
@@ -1444,8 +1409,7 @@ var QueryInterpreter = class _QueryInterpreter {
     this.#serializer = serializer;
     this.#rawSerializer = rawSerializer ?? serializer;
     this.#provider = provider;
-    this.#connectionInfo = connectionInfo;
-    this.#sqlCommenter = sqlCommenter;
+    this.#connectioInfo = connectionInfo;
   }
   static forSql(options) {
     return new _QueryInterpreter({
@@ -1456,8 +1420,7 @@ var QueryInterpreter = class _QueryInterpreter {
       serializer: serializeSql,
       rawSerializer: serializeRawSql,
       provider: options.provider,
-      connectionInfo: options.connectionInfo,
-      sqlCommenter: options.sqlCommenter
+      connectionInfo: options.connectionInfo
     });
   }
   async run(queryPlan, queryable) {
@@ -1521,11 +1484,10 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let sum = 0;
         for (const query of queries) {
-          const commentedQuery = this.#applyComments(query);
           sum += await this.#withQuerySpanAndEvent(
-            commentedQuery,
+            query,
             queryable,
-            () => queryable.executeRaw(commentedQuery).catch(
+            () => queryable.executeRaw(query).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1536,11 +1498,10 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let results;
         for (const query of queries) {
-          const commentedQuery = this.#applyComments(query);
           const result = await this.#withQuerySpanAndEvent(
-            commentedQuery,
+            query,
             queryable,
-            () => queryable.queryRaw(commentedQuery).catch(
+            () => queryable.queryRaw(query).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1662,8 +1623,8 @@ var QueryInterpreter = class _QueryInterpreter {
     }
   }
   #maxChunkSize() {
-    if (this.#connectionInfo?.maxBindValues !== void 0) {
-      return this.#connectionInfo.maxBindValues;
+    if (this.#connectioInfo?.maxBindValues !== void 0) {
+      return this.#connectioInfo.maxBindValues;
     }
     return this.#providerMaxChunkSize();
   }
@@ -1698,22 +1659,6 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: this.#onQuery
     });
   }
-  #applyComments(query) {
-    if (!this.#sqlCommenter || this.#sqlCommenter.plugins.length === 0) {
-      return query;
-    }
-    const comment = buildSqlComment(this.#sqlCommenter.plugins, {
-      query: this.#sqlCommenter.queryInfo,
-      sql: query.sql
-    });
-    if (!comment) {
-      return query;
-    }
-    return {
-      ...query,
-      sql: appendSqlComment(query.sql, comment)
-    };
-  }
 };
 function isEmpty(value) {
   if (Array.isArray(value)) {
@@ -1816,7 +1761,7 @@ function evalFieldOperation(op, value, scope, generators) {
 }
 
 // src/raw-json-protocol.ts
-import { Decimal as Decimal4 } from "@prisma/client-runtime-utils";
+import Decimal4 from "decimal.js";
 function normalizeRawJsonProtocolResponse(response) {
   for (let i = 0; i < response.rows.length; i++) {
     const row = response.rows[i];
@@ -1856,13 +1801,6 @@ async function randomUUID() {
   return crypto.randomUUID();
 }
 
-// src/web-platform.ts
-async function once(target, event) {
-  return new Promise((resolve) => {
-    target.addEventListener(event, resolve, { once: true });
-  });
-}
-
 // src/transaction-manager/transaction-manager-error.ts
 var TransactionManagerError = class extends UserFacingError {
   name = "TransactionManagerError";
@@ -1978,19 +1916,15 @@ var TransactionManager = class {
       startedAt: Date.now(),
       transaction: void 0
     };
-    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([
-      startTransactionPromise.finally(() => clearTimeout(startTimer)),
-      once(abortController.signal, "abort").then(() => void 0)
-    ]);
     this.transactions.set(transaction.id, transaction);
+    let hasTimedOut = false;
+    const startTimer = createTimeoutIfDefined(() => hasTimedOut = true, options.maxWait);
+    startTimer?.unref?.();
+    transaction.transaction = await this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
+    clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
-        if (abortController.signal.aborted) {
-          void startTransactionPromise.then((tx) => tx.rollback()).catch((e) => debug("error in discarded transaction:", e));
+        if (hasTimedOut) {
           await this.#closeTransaction(transaction, "timed_out");
           throw new TransactionStartTimeoutError();
         }
@@ -2086,13 +2020,8 @@ var TransactionManager = class {
             await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
           } else {
             const query = COMMIT_QUERY();
-            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query)).then(
-              () => tx.transaction.commit(),
-              (err) => {
-                const fail = () => Promise.reject(err);
-                return tx.transaction.rollback().then(fail, fail);
-              }
-            );
+            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+            await tx.transaction.commit();
           }
         } else if (tx.transaction) {
           if (tx.transaction.options.usePhantomQuery) {
@@ -2103,11 +2032,8 @@ var TransactionManager = class {
             );
           } else {
             const query = ROLLBACK_QUERY();
-            try {
-              await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-            } finally {
-              await tx.transaction.rollback();
-            }
+            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+            await tx.transaction.rollback();
           }
         }
       } finally {
@@ -2161,7 +2087,6 @@ export {
   TransactionManager,
   TransactionManagerError,
   UserFacingError,
-  applySqlCommenters,
   convertCompactedRows,
   deserializeJsonResponse,
   doKeysMatch,

package/dist/interpreter/data-mapper.d.ts

@@ -1,10 +1,6 @@
 import { ResultNode } from '../query-plan';
-import { UserFacingError } from '../user-facing-error';
 import { Value } from './scope';
-export declare class DataMapperError extends UserFacingError {
+export declare class DataMapperError extends Error {
     name: string;
-    constructor(message: string, options?: {
-        cause?: unknown;
-    });
 }
 export declare function applyDataMap(data: Value, structure: ResultNode, enums: Record<string, Record<string, string>>): Value;

package/dist/interpreter/query-interpreter.d.ts

@@ -1,5 +1,4 @@
 import { ConnectionInfo, SqlQueryable, SqlResultSet } from '@prisma/driver-adapter-utils';
-import type { SqlCommenterPlugin, SqlCommenterQueryInfo } from '@prisma/sqlcommenter';
 import { QueryEvent } from '../events';
 import { QueryPlanNode } from '../query-plan';
 import { type SchemaProvider } from '../schema';
@@ -21,15 +20,10 @@ export type QueryInterpreterOptions = {
     rawSerializer?: (results: SqlResultSet) => Value;
     provider?: SchemaProvider;
     connectionInfo?: ConnectionInfo;
-    sqlCommenter?: QueryInterpreterSqlCommenter;
-};
-export type QueryInterpreterSqlCommenter = {
-    plugins: SqlCommenterPlugin[];
-    queryInfo: SqlCommenterQueryInfo;
 };
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, sqlCommenter, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
@@ -37,7 +31,6 @@ export declare class QueryInterpreter {
         tracingHelper: TracingHelper;
         provider?: SchemaProvider;
         connectionInfo?: ConnectionInfo;
-        sqlCommenter?: QueryInterpreterSqlCommenter;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;

package/dist/json-protocol.d.ts

@@ -1,4 +1,4 @@
-import { Decimal } from '@prisma/client-runtime-utils';
+import { Decimal } from 'decimal.js';
 export type DateTaggedValue = {
     $type: 'DateTime';
     value: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "7.2.0",
+  "version": "7.3.0-integration-fix-6-19-0-cloudflare-accelerate-engine.1",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -27,17 +27,16 @@
     "@bugsnag/cuid": "3.2.1",
     "@opentelemetry/api": "1.9.0",
     "@paralleldrive/cuid2": "2.2.2",
+    "decimal.js": "10.5.0",
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/client-runtime-utils": "7.2.0",
-    "@prisma/debug": "7.2.0",
-    "@prisma/driver-adapter-utils": "7.2.0",
-    "@prisma/sqlcommenter": "7.2.0"
+    "@prisma/driver-adapter-utils": "7.3.0-integration-fix-6-19-0-cloudflare-accelerate-engine.1",
+    "@prisma/debug": "7.3.0-integration-fix-6-19-0-cloudflare-accelerate-engine.1"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",
-    "@types/node": "~20.19.24",
+    "@types/node": "18.19.76",
     "jest": "29.7.0",
     "jest-junit": "16.0.0"
   },

package/dist/sql-commenter.d.ts

@@ -1,28 +0,0 @@
-import type { SqlCommenterContext, SqlCommenterPlugin } from '@prisma/sqlcommenter';
-/**
- * Formats key-value pairs into a sqlcommenter-compatible comment string.
- *
- * Algorithm per https://google.github.io/sqlcommenter/spec/:
- * 1. If the map is empty, return empty string
- * 2. Sort keys lexicographically
- * 3. URL-encode keys
- * 4. URL-encode values
- * 5. Replace ' with \' in values (after URL encoding)
- * 6. Wrap values in single quotes
- * 7. Join key='value' pairs with commas
- * 8. Wrap in /* *\/
- */
-export declare function formatSqlComment(tags: Record<string, string>): string;
-/**
- * Applies SQL commenter plugins and returns the merged key-value pairs.
- * Keys with undefined values are filtered out.
- */
-export declare function applySqlCommenters(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): Record<string, string>;
-/**
- * Applies SQL commenter plugins and returns the formatted comment.
- */
-export declare function buildSqlComment(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): string;
-/**
- * Appends a sqlcommenter comment to a SQL query.
- */
-export declare function appendSqlComment(sql: string, comment: string): string;

package/dist/sql-commenter.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/web-platform.d.ts

@@ -1,9 +0,0 @@
-/**
- * Equivalent to `once` from `node:events` for DOM {@link EventTarget}.
- *
- * It is useful, e.g., to wait for an `abort` event on {@link AbortSignal}.
- * While in Node.js `AbortSignal` does implement `EventEmitter` interface
- * and is compatible with the `once` utility in `node:events`, it is not
- * necessarily the case in other JS runtimes.
- */
-export declare function once(target: EventTarget, event: string): Promise<Event>;