@prisma/client-engine-runtime 6.11.0-dev.8 → 6.11.0-integration-fix-generator-ts-pre-preview.1

package/dist/index.js

@@ -230,6 +230,12 @@ function mapValue(value, columnName, resultType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
+      if (value instanceof Uint8Array) {
+        for (const byte of value) {
+          if (byte !== 0) return true;
+        }
+        return false;
+      }
       throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Decimal":
@@ -267,6 +273,9 @@ function mapValue(value, columnName, resultType, enums) {
       if (Array.isArray(value)) {
         return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
       }
+      if (value instanceof Uint8Array) {
+        return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
+      }
       throw new DataMapperError(`Expected a byte array in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Enum": {
@@ -764,8 +773,16 @@ function doesRequireEvaluation(param) {
 // src/interpreter/serializeSql.ts
 var import_driver_adapter_utils2 = require("@prisma/driver-adapter-utils");
 function serializeSql(resultSet) {
+  const mappers = resultSet.columnTypes.map((type) => {
+    switch (type) {
+      case import_driver_adapter_utils2.ColumnTypeEnum.Bytes:
+        return (value) => Array.isArray(value) ? new Uint8Array(value) : value;
+      default:
+        return (value) => value;
+    }
+  });
   return resultSet.rows.map(
-    (row) => row.reduce((acc, value, index) => {
+    (row) => row.map((value, index) => mappers[index](value)).reduce((acc, value, index) => {
       const splitByDot = resultSet.columnNames[index].split(".");
       let nested = acc;
       for (let i = 0; i < splitByDot.length; i++) {
@@ -1424,17 +1441,16 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
+    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction;
-        clearTimeout(transaction.timer);
-        transaction.timer = void 0;
         transaction.status = "running";
         transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.timeout);
         return { id: transaction.id };
       case "timed_out":
+        await this.closeTransaction(transaction, "timed_out");
         throw new TransactionStartTimeoutError();
       case "running":
       case "committed":

package/dist/index.mjs

@@ -182,6 +182,12 @@ function mapValue(value, columnName, resultType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
+      if (value instanceof Uint8Array) {
+        for (const byte of value) {
+          if (byte !== 0) return true;
+        }
+        return false;
+      }
       throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Decimal":
@@ -219,6 +225,9 @@ function mapValue(value, columnName, resultType, enums) {
       if (Array.isArray(value)) {
         return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
       }
+      if (value instanceof Uint8Array) {
+        return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
+      }
       throw new DataMapperError(`Expected a byte array in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Enum": {
@@ -716,8 +725,16 @@ function doesRequireEvaluation(param) {
 // src/interpreter/serializeSql.ts
 import { ColumnTypeEnum } from "@prisma/driver-adapter-utils";
 function serializeSql(resultSet) {
+  const mappers = resultSet.columnTypes.map((type) => {
+    switch (type) {
+      case ColumnTypeEnum.Bytes:
+        return (value) => Array.isArray(value) ? new Uint8Array(value) : value;
+      default:
+        return (value) => value;
+    }
+  });
   return resultSet.rows.map(
-    (row) => row.reduce((acc, value, index) => {
+    (row) => row.map((value, index) => mappers[index](value)).reduce((acc, value, index) => {
       const splitByDot = resultSet.columnNames[index].split(".");
       let nested = acc;
       for (let i = 0; i < splitByDot.length; i++) {
@@ -1376,17 +1393,16 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
+    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction;
-        clearTimeout(transaction.timer);
-        transaction.timer = void 0;
         transaction.status = "running";
         transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.timeout);
         return { id: transaction.id };
       case "timed_out":
+        await this.closeTransaction(transaction, "timed_out");
         throw new TransactionStartTimeoutError();
       case "running":
       case "committed":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.11.0-dev.8",
+  "version": "6.11.0-integration-fix-generator-ts-pre-preview.1",
   "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.11.0-dev.8",
-    "@prisma/driver-adapter-utils": "6.11.0-dev.8"
+    "@prisma/debug": "6.11.0-integration-fix-generator-ts-pre-preview.1",
+    "@prisma/driver-adapter-utils": "6.11.0-integration-fix-generator-ts-pre-preview.1"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",