@prisma/client-engine-runtime 6.6.0-dev.35 → 6.6.0-dev.37

package/dist/index.d.mts

@@ -1,7 +1,7 @@
-import { ErrorCapturingSqlDriverAdapter } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingSqlQueryable } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingTransaction } from '@prisma/driver-adapter-utils';
 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 function isPrismaValuePlaceholder(value: unknown): value is PrismaValuePlaceholder;
 
@@ -36,7 +36,7 @@ export declare class QueryInterpreter {
 }
 
 export declare type QueryInterpreterOptions = {
-    queryable: ErrorCapturingSqlQueryable;
+    queryable: SqlQueryable;
     placeholderValues: Record<string, unknown>;
     onQuery?: (event: QueryEvent) => void;
 };
@@ -114,12 +114,12 @@ export declare class TransactionManager {
     private closedTransactions;
     private readonly driverAdapter;
     constructor({ driverAdapter }: {
-        driverAdapter: ErrorCapturingSqlDriverAdapter;
+        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;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { ErrorCapturingSqlDriverAdapter } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingSqlQueryable } from '@prisma/driver-adapter-utils';
-import { ErrorCapturingTransaction } from '@prisma/driver-adapter-utils';
 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 function isPrismaValuePlaceholder(value: unknown): value is PrismaValuePlaceholder;
 
@@ -36,7 +36,7 @@ export declare class QueryInterpreter {
 }
 
 export declare type QueryInterpreterOptions = {
-    queryable: ErrorCapturingSqlQueryable;
+    queryable: SqlQueryable;
     placeholderValues: Record<string, unknown>;
     onQuery?: (event: QueryEvent) => void;
 };
@@ -114,12 +114,12 @@ export declare class TransactionManager {
     private closedTransactions;
     private readonly driverAdapter;
     constructor({ driverAdapter }: {
-        driverAdapter: ErrorCapturingSqlDriverAdapter;
+        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;

package/dist/index.js

@@ -275,23 +275,13 @@ var QueryInterpreter = class {
       case "execute": {
         const query = renderQuery(node.args, scope);
         return this.#withQueryEvent(query, async () => {
-          const result = await this.#queryable.executeRaw(query);
-          if (result.ok) {
-            return result.value;
-          } else {
-            throw result.error;
-          }
+          return await this.#queryable.executeRaw(query);
         });
       }
       case "query": {
         const query = renderQuery(node.args, scope);
         return this.#withQueryEvent(query, async () => {
-          const result = await this.#queryable.queryRaw(query);
-          if (result.ok) {
-            return serialize(result.value);
-          } else {
-            throw result.error;
-          }
+          return serialize(await this.#queryable.queryRaw(query));
         });
       }
       case "reverse": {
@@ -509,14 +499,17 @@ var TransactionManager = class {
     };
     this.transactions.set(transaction.id, transaction);
     transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
-    if (!startedTransaction.ok)
+    let startedTransaction;
+    try {
+      startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    } catch (error) {
       throw new TransactionDriverAdapterError("Failed to start transaction.", {
-        driverAdapterError: startedTransaction.error
+        driverAdapterError: error
       });
+    }
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction.value;
+        transaction.transaction = startedTransaction;
         clearTimeout(transaction.timer);
         transaction.timer = void 0;
         transaction.status = "running";
@@ -596,20 +589,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());
       }

package/dist/index.mjs

@@ -236,23 +236,13 @@ var QueryInterpreter = class {
       case "execute": {
         const query = renderQuery(node.args, scope);
         return this.#withQueryEvent(query, async () => {
-          const result = await this.#queryable.executeRaw(query);
-          if (result.ok) {
-            return result.value;
-          } else {
-            throw result.error;
-          }
+          return await this.#queryable.executeRaw(query);
         });
       }
       case "query": {
         const query = renderQuery(node.args, scope);
         return this.#withQueryEvent(query, async () => {
-          const result = await this.#queryable.queryRaw(query);
-          if (result.ok) {
-            return serialize(result.value);
-          } else {
-            throw result.error;
-          }
+          return serialize(await this.#queryable.queryRaw(query));
         });
       }
       case "reverse": {
@@ -470,14 +460,17 @@ var TransactionManager = class {
     };
     this.transactions.set(transaction.id, transaction);
     transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
-    if (!startedTransaction.ok)
+    let startedTransaction;
+    try {
+      startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    } catch (error) {
       throw new TransactionDriverAdapterError("Failed to start transaction.", {
-        driverAdapterError: startedTransaction.error
+        driverAdapterError: error
       });
+    }
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction.value;
+        transaction.transaction = startedTransaction;
         clearTimeout(transaction.timer);
         transaction.timer = void 0;
         transaction.status = "running";
@@ -557,20 +550,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());
       }

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

@@ -1,16 +1,16 @@
-import { ErrorCapturingSqlDriverAdapter, 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: ErrorCapturingSqlDriverAdapter;
+        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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.6.0-dev.35",
+  "version": "6.6.0-dev.37",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -24,8 +24,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@prisma/debug": "6.6.0-dev.35",
-    "@prisma/driver-adapter-utils": "6.6.0-dev.35"
+    "@prisma/driver-adapter-utils": "6.6.0-dev.37",
+    "@prisma/debug": "6.6.0-dev.37"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",