@prisma/client-engine-runtime 6.12.0-dev.2 → 6.12.0-dev.4

package/dist/index.d.mts

@@ -7,6 +7,8 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+declare type ConnectorType = 'mysql' | 'mongodb' | 'sqlite' | 'postgresql' | 'postgres' | 'prisma+postgres' | 'sqlserver' | 'cockroachdb';
+
 export declare class DataMapperError extends Error {
     name: string;
 }
@@ -175,12 +177,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 +196,7 @@ export declare type QueryInterpreterOptions = {
     tracingHelper: TracingHelper;
     serializer: (results: SqlResultSet) => Value;
     rawSerializer?: (results: SqlResultSet) => Value;
+    provider?: SchemaProvider;
 };
 
 export declare type QueryInterpreterTransactionManager = {
@@ -349,6 +353,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 = ConnectorType;
+
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 
 export declare interface TracingHelper {
@@ -366,11 +375,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,8 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+declare type ConnectorType = 'mysql' | 'mongodb' | 'sqlite' | 'postgresql' | 'postgres' | 'prisma+postgres' | 'sqlserver' | 'cockroachdb';
+
 export declare class DataMapperError extends Error {
     name: string;
 }
@@ -175,12 +177,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 +196,7 @@ export declare type QueryInterpreterOptions = {
     tracingHelper: TracingHelper;
     serializer: (results: SqlResultSet) => Value;
     rawSerializer?: (results: SqlResultSet) => Value;
+    provider?: SchemaProvider;
 };
 
 export declare type QueryInterpreterTransactionManager = {
@@ -349,6 +353,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 = ConnectorType;
+
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 
 export declare interface TracingHelper {
@@ -366,11 +375,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

@@ -314,22 +314,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 +342,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 +980,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 +996,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 +1005,8 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: options.onQuery,
       tracingHelper: options.tracingHelper,
       serializer: serializeSql,
-      rawSerializer: serializeRawSql
+      rawSerializer: serializeRawSql,
+      provider: options.provider
     });
   }
   async run(queryPlan, queryable) {
@@ -1214,8 +1221,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
     });
@@ -1418,16 +1425,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 +1580,8 @@ var TransactionManager = class {
   #withQuerySpanAndEvent(query, queryable, execute) {
     return withQuerySpanAndEvent({
       query,
-      queryable,
       execute,
+      provider: this.#provider ?? queryable.provider,
       tracingHelper: this.tracingHelper,
       onQuery: this.#onQuery
     });

package/dist/index.mjs

@@ -266,22 +266,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 +294,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 +932,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 +948,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 +957,8 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: options.onQuery,
       tracingHelper: options.tracingHelper,
       serializer: serializeSql,
-      rawSerializer: serializeRawSql
+      rawSerializer: serializeRawSql,
+      provider: options.provider
     });
   }
   async run(queryPlan, queryable) {
@@ -1166,8 +1173,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
     });
@@ -1370,16 +1377,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 +1532,8 @@ var TransactionManager = class {
   #withQuerySpanAndEvent(query, queryable, execute) {
     return withQuerySpanAndEvent({
       query,
-      queryable,
       execute,
+      provider: this.#provider ?? queryable.provider,
       tracingHelper: this.tracingHelper,
       onQuery: this.#onQuery
     });

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/schema.d.ts

@@ -0,0 +1,5 @@
+import type { ConnectorType } from '@prisma/generator';
+/**
+ * `provider` property as defined in Prisma Schema (may differ from {@link @prisma/driver-adapter-utils#Provider}).
+ */
+export type SchemaProvider = ConnectorType;

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.2",
+  "version": "6.12.0-dev.4",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,14 +31,15 @@
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/driver-adapter-utils": "6.12.0-dev.2",
-    "@prisma/debug": "6.12.0-dev.2"
+    "@prisma/driver-adapter-utils": "6.12.0-dev.4",
+    "@prisma/debug": "6.12.0-dev.4"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",
     "@types/node": "18.19.76",
     "jest": "29.7.0",
-    "jest-junit": "16.0.0"
+    "jest-junit": "16.0.0",
+    "@prisma/generator": "6.12.0-dev.4"
   },
   "files": [
     "dist"