@prisma/client-engine-runtime 6.12.0-dev.3 → 6.12.0-dev.30

package/dist/index.d.mts

@@ -7,6 +7,16 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+export declare type BigIntTaggedValue = {
+    $type: 'BigInt';
+    value: string;
+};
+
+export declare type BytesTaggedValue = {
+    $type: 'Bytes';
+    value: string;
+};
+
 export declare class DataMapperError extends Error {
     name: string;
 }
@@ -24,6 +34,16 @@ export declare type DataRule = {
     type: 'never';
 };
 
+export declare type DateTaggedValue = {
+    $type: 'DateTime';
+    value: string;
+};
+
+export declare type DecimalTaggedValue = {
+    $type: 'Decimal';
+    value: string;
+};
+
 /**
  * Checks if two objects representing the names and values of key columns match. A match is
  * defined by one of the sets of keys being a subset of the other. This function also
@@ -31,6 +51,11 @@ export declare type DataRule = {
  */
 export declare function doKeysMatch(lhs: {}, rhs: {}): boolean;
 
+export declare type EnumTaggedValue = {
+    $type: 'Enum';
+    value: string;
+};
+
 declare type ExtendedSpanOptions = SpanOptions & {
     name: string;
 };
@@ -59,6 +84,13 @@ export declare type FieldOperation = {
     value: PrismaValue;
 };
 
+export declare type FieldRefTaggedValue = {
+    $type: 'FieldRef';
+    value: {
+        _ref: string;
+    };
+};
+
 export declare type Fragment = {
     type: 'stringChunk';
     chunk: string;
@@ -94,8 +126,19 @@ export declare type JoinExpression = {
     isRelationUnique: boolean;
 };
 
+export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+
+export declare type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
+
+export declare type JsonTaggedValue = {
+    $type: 'Json';
+    value: string;
+};
+
 export declare const noopTracingHelper: TracingHelper;
 
+export declare function normalizeJsonProtocolValues(result: unknown): unknown;
+
 export declare type Pagination = {
     cursor: Record<string, PrismaValue> | null;
     take: number | null;
@@ -175,12 +218,13 @@ export declare type QueryEvent = {
 
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
         onQuery?: (event: QueryEvent) => void;
         tracingHelper: TracingHelper;
+        provider?: SchemaProvider;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;
@@ -193,6 +237,7 @@ export declare type QueryInterpreterOptions = {
     tracingHelper: TracingHelper;
     serializer: (results: SqlResultSet) => Value;
     rawSerializer?: (results: SqlResultSet) => Value;
+    provider?: SchemaProvider;
 };
 
 export declare type QueryInterpreterTransactionManager = {
@@ -349,6 +394,11 @@ export declare type ResultNode = {
  */
 export declare function safeJsonStringify(obj: unknown): string;
 
+/**
+ * `provider` property as defined in Prisma Schema (may differ from {@link @prisma/driver-adapter-utils#Provider}).
+ */
+export declare type SchemaProvider = 'cockroachdb' | 'mongodb' | 'mysql' | 'postgres' | 'postgresql' | 'prisma+postgres' | 'sqlite' | 'sqlserver';
+
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 
 export declare interface TracingHelper {
@@ -366,11 +416,12 @@ export declare class TransactionManager {
     private readonly driverAdapter;
     private readonly transactionOptions;
     private readonly tracingHelper;
-    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, }: {
+    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, provider, }: {
         driverAdapter: SqlDriverAdapter;
         transactionOptions: TransactionOptions;
         tracingHelper: TracingHelper;
         onQuery?: (event: QueryEvent) => void;
+        provider?: SchemaProvider;
     });
     startTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;

package/dist/index.d.ts

@@ -7,6 +7,16 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+export declare type BigIntTaggedValue = {
+    $type: 'BigInt';
+    value: string;
+};
+
+export declare type BytesTaggedValue = {
+    $type: 'Bytes';
+    value: string;
+};
+
 export declare class DataMapperError extends Error {
     name: string;
 }
@@ -24,6 +34,16 @@ export declare type DataRule = {
     type: 'never';
 };
 
+export declare type DateTaggedValue = {
+    $type: 'DateTime';
+    value: string;
+};
+
+export declare type DecimalTaggedValue = {
+    $type: 'Decimal';
+    value: string;
+};
+
 /**
  * Checks if two objects representing the names and values of key columns match. A match is
  * defined by one of the sets of keys being a subset of the other. This function also
@@ -31,6 +51,11 @@ export declare type DataRule = {
  */
 export declare function doKeysMatch(lhs: {}, rhs: {}): boolean;
 
+export declare type EnumTaggedValue = {
+    $type: 'Enum';
+    value: string;
+};
+
 declare type ExtendedSpanOptions = SpanOptions & {
     name: string;
 };
@@ -59,6 +84,13 @@ export declare type FieldOperation = {
     value: PrismaValue;
 };
 
+export declare type FieldRefTaggedValue = {
+    $type: 'FieldRef';
+    value: {
+        _ref: string;
+    };
+};
+
 export declare type Fragment = {
     type: 'stringChunk';
     chunk: string;
@@ -94,8 +126,19 @@ export declare type JoinExpression = {
     isRelationUnique: boolean;
 };
 
+export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+
+export declare type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
+
+export declare type JsonTaggedValue = {
+    $type: 'Json';
+    value: string;
+};
+
 export declare const noopTracingHelper: TracingHelper;
 
+export declare function normalizeJsonProtocolValues(result: unknown): unknown;
+
 export declare type Pagination = {
     cursor: Record<string, PrismaValue> | null;
     take: number | null;
@@ -175,12 +218,13 @@ export declare type QueryEvent = {
 
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
         onQuery?: (event: QueryEvent) => void;
         tracingHelper: TracingHelper;
+        provider?: SchemaProvider;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;
@@ -193,6 +237,7 @@ export declare type QueryInterpreterOptions = {
     tracingHelper: TracingHelper;
     serializer: (results: SqlResultSet) => Value;
     rawSerializer?: (results: SqlResultSet) => Value;
+    provider?: SchemaProvider;
 };
 
 export declare type QueryInterpreterTransactionManager = {
@@ -349,6 +394,11 @@ export declare type ResultNode = {
  */
 export declare function safeJsonStringify(obj: unknown): string;
 
+/**
+ * `provider` property as defined in Prisma Schema (may differ from {@link @prisma/driver-adapter-utils#Provider}).
+ */
+export declare type SchemaProvider = 'cockroachdb' | 'mongodb' | 'mysql' | 'postgres' | 'postgresql' | 'prisma+postgres' | 'sqlite' | 'sqlserver';
+
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 
 export declare interface TracingHelper {
@@ -366,11 +416,12 @@ export declare class TransactionManager {
     private readonly driverAdapter;
     private readonly transactionOptions;
     private readonly tracingHelper;
-    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, }: {
+    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, provider, }: {
         driverAdapter: SqlDriverAdapter;
         transactionOptions: TransactionOptions;
         tracingHelper: TracingHelper;
         onQuery?: (event: QueryEvent) => void;
+        provider?: SchemaProvider;
     });
     startTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;

package/dist/index.js

@@ -42,6 +42,7 @@ __export(index_exports, {
   isPrismaValueGenerator: () => isPrismaValueGenerator,
   isPrismaValuePlaceholder: () => isPrismaValuePlaceholder,
   noopTracingHelper: () => noopTracingHelper,
+  normalizeJsonProtocolValues: () => normalizeJsonProtocolValues,
   safeJsonStringify: () => safeJsonStringify
 });
 module.exports = __toCommonJS(index_exports);
@@ -62,20 +63,74 @@ function doKeysMatch(lhs, rhs) {
   const rhsKeys = Object.keys(rhs);
   const smallerKeyList = lhsKeys.length < rhsKeys.length ? lhsKeys : rhsKeys;
   return smallerKeyList.every((key) => {
-    if (typeof lhs[key] !== typeof rhs[key]) {
-      if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
-        return `${lhs[key]}` === `${rhs[key]}`;
-      } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
-        return BigInt(`${lhs[key]}`.replace(/n$/, "")) === BigInt(`${rhs[key]}`.replace(/n$/, ""));
-      } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
-        return (/* @__PURE__ */ new Date(`${lhs[key]}`)).getTime() === (/* @__PURE__ */ new Date(`${rhs[key]}`)).getTime();
-      } else if (import_decimal.default.isDecimal(lhs[key]) || import_decimal.default.isDecimal(rhs[key])) {
-        return new import_decimal.default(`${lhs[key]}`).equals(new import_decimal.default(`${rhs[key]}`));
-      }
+    if (typeof lhs[key] === typeof rhs[key] && typeof lhs[key] !== "object") {
+      return lhs[key] === 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);
+    } else if (lhs[key] instanceof Uint8Array || rhs[key] instanceof Uint8Array) {
+      const lhsBuffer = asBuffer(lhs[key]);
+      const rhsBuffer = asBuffer(rhs[key]);
+      return lhsBuffer && rhsBuffer && lhsBuffer.equals(rhsBuffer);
+    } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
+      return asDate(lhs[key])?.getTime() === asDate(rhs[key])?.getTime();
+    } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
+      return asBigInt(lhs[key]) === asBigInt(rhs[key]);
+    } else if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
+      return asNumber(lhs[key]) === asNumber(rhs[key]);
     }
     return isDeepStrictEqual(lhs[key], rhs[key]);
   });
 }
+function asDecimal(value) {
+  if (import_decimal.default.isDecimal(value)) {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return new import_decimal.default(value);
+  } else {
+    return;
+  }
+}
+function asBuffer(value) {
+  if (Buffer.isBuffer(value)) {
+    return value;
+  } else if (value instanceof Uint8Array) {
+    return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
+  } else if (typeof value === "string") {
+    return Buffer.from(value, "base64");
+  } else {
+    return;
+  }
+}
+function asDate(value) {
+  if (value instanceof Date) {
+    return value;
+  } else if (typeof value === "string" || typeof value === "number") {
+    return new Date(value);
+  } else {
+    return;
+  }
+}
+function asBigInt(value) {
+  if (typeof value === "bigint") {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return BigInt(value);
+  } else {
+    return;
+  }
+}
+function asNumber(value) {
+  if (typeof value === "number") {
+    return value;
+  } else if (typeof value === "string") {
+    return Number(value);
+  } else {
+    return;
+  }
+}
 function safeJsonStringify(obj) {
   return JSON.stringify(obj, (_key, val) => {
     if (typeof val === "bigint") {
@@ -314,22 +369,25 @@ var noopTracingHelper = {
 };
 function providerToOtelSystem(provider) {
   switch (provider) {
+    case "postgresql":
     case "postgres":
+    case "prisma+postgres":
       return "postgresql";
-    case "mysql":
-      return "mysql";
-    case "sqlite":
-      return "sqlite";
     case "sqlserver":
       return "mssql";
+    case "mysql":
+    case "sqlite":
+    case "cockroachdb":
+    case "mongodb":
+      return provider;
     default:
       assertNever(provider, `Unknown provider: ${provider}`);
   }
 }
 async function withQuerySpanAndEvent({
   query,
-  queryable,
   tracingHelper,
+  provider,
   onQuery,
   execute
 }) {
@@ -339,7 +397,7 @@ async function withQuerySpanAndEvent({
       kind: import_api.SpanKind.CLIENT,
       attributes: {
         "db.query.text": query.sql,
-        "db.system.name": providerToOtelSystem(queryable.provider)
+        "db.system.name": providerToOtelSystem(provider)
       }
     },
     async () => {
@@ -977,13 +1035,15 @@ var QueryInterpreter = class _QueryInterpreter {
   #tracingHelper;
   #serializer;
   #rawSerializer;
+  #provider;
   constructor({
     transactionManager,
     placeholderValues,
     onQuery,
     tracingHelper,
     serializer,
-    rawSerializer
+    rawSerializer,
+    provider
   }) {
     this.#transactionManager = transactionManager;
     this.#placeholderValues = placeholderValues;
@@ -991,6 +1051,7 @@ var QueryInterpreter = class _QueryInterpreter {
     this.#tracingHelper = tracingHelper;
     this.#serializer = serializer;
     this.#rawSerializer = rawSerializer ?? serializer;
+    this.#provider = provider;
   }
   static forSql(options) {
     return new _QueryInterpreter({
@@ -999,7 +1060,8 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: options.onQuery,
       tracingHelper: options.tracingHelper,
       serializer: serializeSql,
-      rawSerializer: serializeRawSql
+      rawSerializer: serializeRawSql,
+      provider: options.provider
     });
   }
   async run(queryPlan, queryable) {
@@ -1056,7 +1118,7 @@ var QueryInterpreter = class _QueryInterpreter {
           node.args.map((arg) => this.interpretNode(arg, queryable, scope, generators).then((res) => res.value))
         );
         return {
-          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber(acc) + asNumber(part)) : 0
+          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber2(acc) + asNumber2(part)) : 0
         };
       }
       case "execute": {
@@ -1214,8 +1276,8 @@ var QueryInterpreter = class _QueryInterpreter {
   #withQuerySpanAndEvent(query, queryable, execute) {
     return withQuerySpanAndEvent({
       query,
-      queryable,
       execute,
+      provider: this.#provider ?? queryable.provider,
       tracingHelper: this.#tracingHelper,
       onQuery: this.#onQuery
     });
@@ -1230,7 +1292,7 @@ function isEmpty(value) {
 function asList(value) {
   return Array.isArray(value) ? value : [value];
 }
-function asNumber(value) {
+function asNumber2(value) {
   if (typeof value === "number") {
     return value;
   }
@@ -1315,14 +1377,14 @@ function evalFieldOperation(op, value, scope, generators) {
     case "set":
       return evaluateParam(op.value, scope, generators);
     case "add":
-      return asNumber(value) + asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) + asNumber2(evaluateParam(op.value, scope, generators));
     case "subtract":
-      return asNumber(value) - asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) - asNumber2(evaluateParam(op.value, scope, generators));
     case "multiply":
-      return asNumber(value) * asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) * asNumber2(evaluateParam(op.value, scope, generators));
     case "divide": {
-      const lhs = asNumber(value);
-      const rhs = asNumber(evaluateParam(op.value, scope, generators));
+      const lhs = asNumber2(value);
+      const rhs = asNumber2(evaluateParam(op.value, scope, generators));
       if (rhs === 0) {
         return null;
       }
@@ -1333,6 +1395,53 @@ function evalFieldOperation(op, value, scope, generators) {
   }
 }
 
+// src/json-protocol.ts
+var import_decimal3 = require("decimal.js");
+function normalizeJsonProtocolValues(result) {
+  if (result === null) {
+    return result;
+  }
+  if (Array.isArray(result)) {
+    return result.map(normalizeJsonProtocolValues);
+  }
+  if (typeof result === "object") {
+    if (isTaggedValue(result)) {
+      return normalizeTaggedValue(result);
+    }
+    if (result.constructor !== null && result.constructor.name !== "Object") {
+      return result;
+    }
+    return mapObjectValues(result, normalizeJsonProtocolValues);
+  }
+  return result;
+}
+function isTaggedValue(value) {
+  return value !== null && typeof value == "object" && typeof value["$type"] === "string";
+}
+function normalizeTaggedValue({ $type, value }) {
+  switch ($type) {
+    case "BigInt":
+      return { $type, value: String(value) };
+    case "Bytes":
+      return { $type, value };
+    case "DateTime":
+      return { $type, value: new Date(value).toISOString() };
+    case "Decimal":
+      return { $type, value: String(new import_decimal3.Decimal(value)) };
+    case "Json":
+      return { $type, value: JSON.stringify(JSON.parse(value)) };
+    default:
+      assertNever(value, "Unknown tagged value");
+  }
+}
+function mapObjectValues(object, mapper) {
+  const result = {};
+  for (const key of Object.keys(object)) {
+    result[key] = mapper(object[key], key);
+  }
+  return result;
+}
+
 // src/transactionManager/TransactionManager.ts
 var import_debug = require("@prisma/debug");
 
@@ -1418,16 +1527,19 @@ var TransactionManager = class {
   transactionOptions;
   tracingHelper;
   #onQuery;
+  #provider;
   constructor({
     driverAdapter,
     transactionOptions,
     tracingHelper,
-    onQuery
+    onQuery,
+    provider
   }) {
     this.driverAdapter = driverAdapter;
     this.transactionOptions = transactionOptions;
     this.tracingHelper = tracingHelper;
     this.#onQuery = onQuery;
+    this.#provider = provider;
   }
   async startTransaction(options) {
     return await this.tracingHelper.runInChildSpan("start_transaction", () => this.#startTransactionImpl(options));
@@ -1570,8 +1682,8 @@ var TransactionManager = class {
   #withQuerySpanAndEvent(query, queryable, execute) {
     return withQuerySpanAndEvent({
       query,
-      queryable,
       execute,
+      provider: this.#provider ?? queryable.provider,
       tracingHelper: this.tracingHelper,
       onQuery: this.#onQuery
     });
@@ -1591,5 +1703,6 @@ var TransactionManager = class {
   isPrismaValueGenerator,
   isPrismaValuePlaceholder,
   noopTracingHelper,
+  normalizeJsonProtocolValues,
   safeJsonStringify
 });

package/dist/index.mjs

@@ -14,20 +14,74 @@ function doKeysMatch(lhs, rhs) {
   const rhsKeys = Object.keys(rhs);
   const smallerKeyList = lhsKeys.length < rhsKeys.length ? lhsKeys : rhsKeys;
   return smallerKeyList.every((key) => {
-    if (typeof lhs[key] !== typeof rhs[key]) {
-      if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
-        return `${lhs[key]}` === `${rhs[key]}`;
-      } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
-        return BigInt(`${lhs[key]}`.replace(/n$/, "")) === BigInt(`${rhs[key]}`.replace(/n$/, ""));
-      } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
-        return (/* @__PURE__ */ new Date(`${lhs[key]}`)).getTime() === (/* @__PURE__ */ new Date(`${rhs[key]}`)).getTime();
-      } else if (Decimal.isDecimal(lhs[key]) || Decimal.isDecimal(rhs[key])) {
-        return new Decimal(`${lhs[key]}`).equals(new Decimal(`${rhs[key]}`));
-      }
+    if (typeof lhs[key] === typeof rhs[key] && typeof lhs[key] !== "object") {
+      return lhs[key] === rhs[key];
+    }
+    if (Decimal.isDecimal(lhs[key]) || Decimal.isDecimal(rhs[key])) {
+      const lhsDecimal = asDecimal(lhs[key]);
+      const rhsDecimal = asDecimal(rhs[key]);
+      return lhsDecimal && rhsDecimal && lhsDecimal.equals(rhsDecimal);
+    } else if (lhs[key] instanceof Uint8Array || rhs[key] instanceof Uint8Array) {
+      const lhsBuffer = asBuffer(lhs[key]);
+      const rhsBuffer = asBuffer(rhs[key]);
+      return lhsBuffer && rhsBuffer && lhsBuffer.equals(rhsBuffer);
+    } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
+      return asDate(lhs[key])?.getTime() === asDate(rhs[key])?.getTime();
+    } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
+      return asBigInt(lhs[key]) === asBigInt(rhs[key]);
+    } else if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
+      return asNumber(lhs[key]) === asNumber(rhs[key]);
     }
     return isDeepStrictEqual(lhs[key], rhs[key]);
   });
 }
+function asDecimal(value) {
+  if (Decimal.isDecimal(value)) {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return new Decimal(value);
+  } else {
+    return;
+  }
+}
+function asBuffer(value) {
+  if (Buffer.isBuffer(value)) {
+    return value;
+  } else if (value instanceof Uint8Array) {
+    return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
+  } else if (typeof value === "string") {
+    return Buffer.from(value, "base64");
+  } else {
+    return;
+  }
+}
+function asDate(value) {
+  if (value instanceof Date) {
+    return value;
+  } else if (typeof value === "string" || typeof value === "number") {
+    return new Date(value);
+  } else {
+    return;
+  }
+}
+function asBigInt(value) {
+  if (typeof value === "bigint") {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return BigInt(value);
+  } else {
+    return;
+  }
+}
+function asNumber(value) {
+  if (typeof value === "number") {
+    return value;
+  } else if (typeof value === "string") {
+    return Number(value);
+  } else {
+    return;
+  }
+}
 function safeJsonStringify(obj) {
   return JSON.stringify(obj, (_key, val) => {
     if (typeof val === "bigint") {
@@ -266,22 +320,25 @@ var noopTracingHelper = {
 };
 function providerToOtelSystem(provider) {
   switch (provider) {
+    case "postgresql":
     case "postgres":
+    case "prisma+postgres":
       return "postgresql";
-    case "mysql":
-      return "mysql";
-    case "sqlite":
-      return "sqlite";
     case "sqlserver":
       return "mssql";
+    case "mysql":
+    case "sqlite":
+    case "cockroachdb":
+    case "mongodb":
+      return provider;
     default:
       assertNever(provider, `Unknown provider: ${provider}`);
   }
 }
 async function withQuerySpanAndEvent({
   query,
-  queryable,
   tracingHelper,
+  provider,
   onQuery,
   execute
 }) {
@@ -291,7 +348,7 @@ async function withQuerySpanAndEvent({
       kind: SpanKind.CLIENT,
       attributes: {
         "db.query.text": query.sql,
-        "db.system.name": providerToOtelSystem(queryable.provider)
+        "db.system.name": providerToOtelSystem(provider)
       }
     },
     async () => {
@@ -929,13 +986,15 @@ var QueryInterpreter = class _QueryInterpreter {
   #tracingHelper;
   #serializer;
   #rawSerializer;
+  #provider;
   constructor({
     transactionManager,
     placeholderValues,
     onQuery,
     tracingHelper,
     serializer,
-    rawSerializer
+    rawSerializer,
+    provider
   }) {
     this.#transactionManager = transactionManager;
     this.#placeholderValues = placeholderValues;
@@ -943,6 +1002,7 @@ var QueryInterpreter = class _QueryInterpreter {
     this.#tracingHelper = tracingHelper;
     this.#serializer = serializer;
     this.#rawSerializer = rawSerializer ?? serializer;
+    this.#provider = provider;
   }
   static forSql(options) {
     return new _QueryInterpreter({
@@ -951,7 +1011,8 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: options.onQuery,
       tracingHelper: options.tracingHelper,
       serializer: serializeSql,
-      rawSerializer: serializeRawSql
+      rawSerializer: serializeRawSql,
+      provider: options.provider
     });
   }
   async run(queryPlan, queryable) {
@@ -1008,7 +1069,7 @@ var QueryInterpreter = class _QueryInterpreter {
           node.args.map((arg) => this.interpretNode(arg, queryable, scope, generators).then((res) => res.value))
         );
         return {
-          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber(acc) + asNumber(part)) : 0
+          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber2(acc) + asNumber2(part)) : 0
         };
       }
       case "execute": {
@@ -1166,8 +1227,8 @@ var QueryInterpreter = class _QueryInterpreter {
   #withQuerySpanAndEvent(query, queryable, execute) {
     return withQuerySpanAndEvent({
       query,
-      queryable,
       execute,
+      provider: this.#provider ?? queryable.provider,
       tracingHelper: this.#tracingHelper,
       onQuery: this.#onQuery
     });
@@ -1182,7 +1243,7 @@ function isEmpty(value) {
 function asList(value) {
   return Array.isArray(value) ? value : [value];
 }
-function asNumber(value) {
+function asNumber2(value) {
   if (typeof value === "number") {
     return value;
   }
@@ -1267,14 +1328,14 @@ function evalFieldOperation(op, value, scope, generators) {
     case "set":
       return evaluateParam(op.value, scope, generators);
     case "add":
-      return asNumber(value) + asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) + asNumber2(evaluateParam(op.value, scope, generators));
     case "subtract":
-      return asNumber(value) - asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) - asNumber2(evaluateParam(op.value, scope, generators));
     case "multiply":
-      return asNumber(value) * asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) * asNumber2(evaluateParam(op.value, scope, generators));
     case "divide": {
-      const lhs = asNumber(value);
-      const rhs = asNumber(evaluateParam(op.value, scope, generators));
+      const lhs = asNumber2(value);
+      const rhs = asNumber2(evaluateParam(op.value, scope, generators));
       if (rhs === 0) {
         return null;
       }
@@ -1285,6 +1346,53 @@ function evalFieldOperation(op, value, scope, generators) {
   }
 }
 
+// src/json-protocol.ts
+import { Decimal as Decimal3 } from "decimal.js";
+function normalizeJsonProtocolValues(result) {
+  if (result === null) {
+    return result;
+  }
+  if (Array.isArray(result)) {
+    return result.map(normalizeJsonProtocolValues);
+  }
+  if (typeof result === "object") {
+    if (isTaggedValue(result)) {
+      return normalizeTaggedValue(result);
+    }
+    if (result.constructor !== null && result.constructor.name !== "Object") {
+      return result;
+    }
+    return mapObjectValues(result, normalizeJsonProtocolValues);
+  }
+  return result;
+}
+function isTaggedValue(value) {
+  return value !== null && typeof value == "object" && typeof value["$type"] === "string";
+}
+function normalizeTaggedValue({ $type, value }) {
+  switch ($type) {
+    case "BigInt":
+      return { $type, value: String(value) };
+    case "Bytes":
+      return { $type, value };
+    case "DateTime":
+      return { $type, value: new Date(value).toISOString() };
+    case "Decimal":
+      return { $type, value: String(new Decimal3(value)) };
+    case "Json":
+      return { $type, value: JSON.stringify(JSON.parse(value)) };
+    default:
+      assertNever(value, "Unknown tagged value");
+  }
+}
+function mapObjectValues(object, mapper) {
+  const result = {};
+  for (const key of Object.keys(object)) {
+    result[key] = mapper(object[key], key);
+  }
+  return result;
+}
+
 // src/transactionManager/TransactionManager.ts
 import { Debug } from "@prisma/debug";
 
@@ -1370,16 +1478,19 @@ var TransactionManager = class {
   transactionOptions;
   tracingHelper;
   #onQuery;
+  #provider;
   constructor({
     driverAdapter,
     transactionOptions,
     tracingHelper,
-    onQuery
+    onQuery,
+    provider
   }) {
     this.driverAdapter = driverAdapter;
     this.transactionOptions = transactionOptions;
     this.tracingHelper = tracingHelper;
     this.#onQuery = onQuery;
+    this.#provider = provider;
   }
   async startTransaction(options) {
     return await this.tracingHelper.runInChildSpan("start_transaction", () => this.#startTransactionImpl(options));
@@ -1522,8 +1633,8 @@ var TransactionManager = class {
   #withQuerySpanAndEvent(query, queryable, execute) {
     return withQuerySpanAndEvent({
       query,
-      queryable,
       execute,
+      provider: this.#provider ?? queryable.provider,
       tracingHelper: this.tracingHelper,
       onQuery: this.#onQuery
     });
@@ -1542,5 +1653,6 @@ export {
   isPrismaValueGenerator,
   isPrismaValuePlaceholder,
   noopTracingHelper,
+  normalizeJsonProtocolValues,
   safeJsonStringify
 };

package/dist/interpreter/QueryInterpreter.d.ts

@@ -1,6 +1,7 @@
 import { SqlQueryable, SqlResultSet } from '@prisma/driver-adapter-utils';
 import { QueryEvent } from '../events';
 import { QueryPlanNode } from '../QueryPlan';
+import { type SchemaProvider } from '../schema';
 import { type TracingHelper } from '../tracing';
 import { type TransactionManager } from '../transactionManager/TransactionManager';
 import { Value } from './scope';
@@ -17,15 +18,17 @@ export type QueryInterpreterOptions = {
     tracingHelper: TracingHelper;
     serializer: (results: SqlResultSet) => Value;
     rawSerializer?: (results: SqlResultSet) => Value;
+    provider?: SchemaProvider;
 };
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
         onQuery?: (event: QueryEvent) => void;
         tracingHelper: TracingHelper;
+        provider?: SchemaProvider;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;

package/dist/json-protocol.d.ts

@@ -0,0 +1,33 @@
+export type DateTaggedValue = {
+    $type: 'DateTime';
+    value: string;
+};
+export type DecimalTaggedValue = {
+    $type: 'Decimal';
+    value: string;
+};
+export type BytesTaggedValue = {
+    $type: 'Bytes';
+    value: string;
+};
+export type BigIntTaggedValue = {
+    $type: 'BigInt';
+    value: string;
+};
+export type FieldRefTaggedValue = {
+    $type: 'FieldRef';
+    value: {
+        _ref: string;
+    };
+};
+export type EnumTaggedValue = {
+    $type: 'Enum';
+    value: string;
+};
+export type JsonTaggedValue = {
+    $type: 'Json';
+    value: string;
+};
+export type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+export type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
+export declare function normalizeJsonProtocolValues(result: unknown): unknown;

package/dist/schema.d.ts

@@ -0,0 +1,4 @@
+/**
+ * `provider` property as defined in Prisma Schema (may differ from {@link @prisma/driver-adapter-utils#Provider}).
+ */
+export type SchemaProvider = 'cockroachdb' | 'mongodb' | 'mysql' | 'postgres' | 'postgresql' | 'prisma+postgres' | 'sqlite' | 'sqlserver';

package/dist/tracing.d.ts

@@ -1,6 +1,7 @@
 import { type Context, type Span, type SpanOptions } from '@opentelemetry/api';
-import type { Provider, SqlQuery, SqlQueryable } from '@prisma/driver-adapter-utils';
+import type { SqlQuery } from '@prisma/driver-adapter-utils';
 import { QueryEvent } from './events';
+import type { SchemaProvider } from './schema';
 export type SpanCallback<R> = (span?: Span, context?: Context) => R;
 export type ExtendedSpanOptions = SpanOptions & {
     name: string;
@@ -9,11 +10,11 @@ export interface TracingHelper {
     runInChildSpan<R>(nameOrOptions: string | ExtendedSpanOptions, callback: SpanCallback<R>): R;
 }
 export declare const noopTracingHelper: TracingHelper;
-export declare function providerToOtelSystem(provider: Provider): string;
-export declare function withQuerySpanAndEvent<T>({ query, queryable, tracingHelper, onQuery, execute, }: {
+export declare function providerToOtelSystem(provider: SchemaProvider): string;
+export declare function withQuerySpanAndEvent<T>({ query, tracingHelper, provider, onQuery, execute, }: {
     query: SqlQuery;
-    queryable: SqlQueryable;
     tracingHelper: TracingHelper;
+    provider: SchemaProvider;
     onQuery?: (event: QueryEvent) => void;
     execute: () => Promise<T>;
 }): Promise<T>;

package/dist/transactionManager/TransactionManager.d.ts

@@ -1,5 +1,6 @@
 import { SqlDriverAdapter, Transaction } from '@prisma/driver-adapter-utils';
 import { QueryEvent } from '../events';
+import type { SchemaProvider } from '../schema';
 import { TracingHelper } from '../tracing';
 import { Options, TransactionInfo } from './Transaction';
 export declare class TransactionManager {
@@ -9,11 +10,12 @@ export declare class TransactionManager {
     private readonly driverAdapter;
     private readonly transactionOptions;
     private readonly tracingHelper;
-    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, }: {
+    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, provider, }: {
         driverAdapter: SqlDriverAdapter;
         transactionOptions: Options;
         tracingHelper: TracingHelper;
         onQuery?: (event: QueryEvent) => void;
+        provider?: SchemaProvider;
     });
     startTransaction(options?: Options): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.12.0-dev.3",
+  "version": "6.12.0-dev.30",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,8 +31,8 @@
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/debug": "6.12.0-dev.3",
-    "@prisma/driver-adapter-utils": "6.12.0-dev.3"
+    "@prisma/debug": "6.12.0-dev.30",
+    "@prisma/driver-adapter-utils": "6.12.0-dev.30"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",