@prisma/client-engine-runtime 6.14.0-dev.32 → 6.14.0-dev.34

package/dist/QueryPlan.d.ts

@@ -62,6 +62,7 @@ export type ResultNode = {
     type: 'Object';
     fields: Record<string, ResultNode>;
     serializedName: string | null;
+    skipNulls: boolean;
 } | {
     type: 'Value';
     dbName: string;

package/dist/index.d.mts

@@ -397,6 +397,7 @@ export declare type ResultNode = {
     type: 'Object';
     fields: Record<string, ResultNode>;
     serializedName: string | null;
+    skipNulls: boolean;
 } | {
     type: 'Value';
     dbName: string;

package/dist/index.d.ts

@@ -397,6 +397,7 @@ export declare type ResultNode = {
     type: 'Object';
     fields: Record<string, ResultNode>;
     serializedName: string | null;
+    skipNulls: boolean;
 } | {
     type: 'Value';
     dbName: string;

package/dist/index.js

@@ -155,17 +155,20 @@ function applyDataMap(data, structure, enums) {
       }
       return { count: data };
     case "Object":
-      return mapArrayOrObject(data, structure.fields, enums);
+      return mapArrayOrObject(data, structure.fields, enums, structure.skipNulls);
     case "Value":
       return mapValue(data, "<result>", structure.resultType, enums);
     default:
       assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
   }
 }
-function mapArrayOrObject(data, fields, enums) {
+function mapArrayOrObject(data, fields, enums, skipNulls) {
   if (data === null) return null;
   if (Array.isArray(data)) {
-    const rows = data;
+    let rows = data;
+    if (skipNulls) {
+      rows = rows.filter((row) => row !== null);
+    }
     return rows.map((row) => mapObject(row, fields, enums));
   }
   if (typeof data === "object") {
@@ -181,7 +184,7 @@ function mapArrayOrObject(data, fields, enums) {
         cause: error
       });
     }
-    return mapArrayOrObject(decodedData, fields, enums);
+    return mapArrayOrObject(decodedData, fields, enums, skipNulls);
   }
   throw new DataMapperError(`Expected an array or an object, got: ${typeof data}`);
 }
@@ -202,7 +205,7 @@ function mapObject(data, fields, enums) {
           );
         }
         const target = node.serializedName !== null ? data[node.serializedName] : data;
-        result[name] = mapArrayOrObject(target, node.fields, enums);
+        result[name] = mapArrayOrObject(target, node.fields, enums, node.skipNulls);
         break;
       }
       case "Value":
@@ -458,7 +461,7 @@ function rethrowAsUserFacingRawError(error) {
     throw error;
   }
   throw new UserFacingError(
-    `Raw query failed. Code: ${error.cause.originalCode ?? "N/A"}. Message: ${error.cause.originalMessage ?? renderErrorMessage(error)}`,
+    `Raw query failed. Code: \`${error.cause.originalCode ?? "N/A"}\`. Message: \`${error.cause.originalMessage ?? renderErrorMessage(error)}\``,
     "P2010",
     { driverAdapterError: error }
   );
@@ -574,7 +577,7 @@ function renderErrorMessage(err) {
       return `The column \`${column}\` does not exist in the current database.`;
     }
     case "InvalidIsolationLevel":
-      return `Invalid isolation level \`${err.cause.level}\``;
+      return `Error in connector: Conversion error: ${err.cause.level}`;
     case "InconsistentColumnData":
       return `Inconsistent column data: ${err.cause.cause}`;
     case "MissingFullTextSearchIndex":
@@ -1826,7 +1829,7 @@ var TransactionStartTimeoutError = class extends TransactionManagerError {
 var TransactionExecutionTimeoutError = class extends TransactionManagerError {
   constructor(operation, { timeout, timeTaken }) {
     super(
-      `A ${operation} cannot be executed on an expired transaction. The timeout for this transaction was ${timeout} ms, however ${timeTaken} ms passed since the start of the transaction. Consider increasing the interactive transaction timeout or doing less work in the transaction`,
+      `A ${operation} cannot be executed on an expired transaction. The timeout for this transaction was ${timeout} ms, however ${timeTaken} ms passed since the start of the transaction. Consider increasing the interactive transaction timeout or doing less work in the transaction.`,
       { operation, timeout, timeTaken }
     );
   }
@@ -1897,7 +1900,7 @@ var TransactionManager = class {
     this.transactions.set(transaction.id, transaction);
     let hasTimedOut = false;
     const startTimer = setTimeout(() => hasTimedOut = true, validatedOptions.maxWait);
-    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel).catch(rethrowAsUserFacing);
     clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":

package/dist/index.mjs

@@ -105,17 +105,20 @@ function applyDataMap(data, structure, enums) {
       }
       return { count: data };
     case "Object":
-      return mapArrayOrObject(data, structure.fields, enums);
+      return mapArrayOrObject(data, structure.fields, enums, structure.skipNulls);
     case "Value":
       return mapValue(data, "<result>", structure.resultType, enums);
     default:
       assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
   }
 }
-function mapArrayOrObject(data, fields, enums) {
+function mapArrayOrObject(data, fields, enums, skipNulls) {
   if (data === null) return null;
   if (Array.isArray(data)) {
-    const rows = data;
+    let rows = data;
+    if (skipNulls) {
+      rows = rows.filter((row) => row !== null);
+    }
     return rows.map((row) => mapObject(row, fields, enums));
   }
   if (typeof data === "object") {
@@ -131,7 +134,7 @@ function mapArrayOrObject(data, fields, enums) {
         cause: error
       });
     }
-    return mapArrayOrObject(decodedData, fields, enums);
+    return mapArrayOrObject(decodedData, fields, enums, skipNulls);
   }
   throw new DataMapperError(`Expected an array or an object, got: ${typeof data}`);
 }
@@ -152,7 +155,7 @@ function mapObject(data, fields, enums) {
           );
         }
         const target = node.serializedName !== null ? data[node.serializedName] : data;
-        result[name] = mapArrayOrObject(target, node.fields, enums);
+        result[name] = mapArrayOrObject(target, node.fields, enums, node.skipNulls);
         break;
       }
       case "Value":
@@ -408,7 +411,7 @@ function rethrowAsUserFacingRawError(error) {
     throw error;
   }
   throw new UserFacingError(
-    `Raw query failed. Code: ${error.cause.originalCode ?? "N/A"}. Message: ${error.cause.originalMessage ?? renderErrorMessage(error)}`,
+    `Raw query failed. Code: \`${error.cause.originalCode ?? "N/A"}\`. Message: \`${error.cause.originalMessage ?? renderErrorMessage(error)}\``,
     "P2010",
     { driverAdapterError: error }
   );
@@ -524,7 +527,7 @@ function renderErrorMessage(err) {
       return `The column \`${column}\` does not exist in the current database.`;
     }
     case "InvalidIsolationLevel":
-      return `Invalid isolation level \`${err.cause.level}\``;
+      return `Error in connector: Conversion error: ${err.cause.level}`;
     case "InconsistentColumnData":
       return `Inconsistent column data: ${err.cause.cause}`;
     case "MissingFullTextSearchIndex":
@@ -1776,7 +1779,7 @@ var TransactionStartTimeoutError = class extends TransactionManagerError {
 var TransactionExecutionTimeoutError = class extends TransactionManagerError {
   constructor(operation, { timeout, timeTaken }) {
     super(
-      `A ${operation} cannot be executed on an expired transaction. The timeout for this transaction was ${timeout} ms, however ${timeTaken} ms passed since the start of the transaction. Consider increasing the interactive transaction timeout or doing less work in the transaction`,
+      `A ${operation} cannot be executed on an expired transaction. The timeout for this transaction was ${timeout} ms, however ${timeTaken} ms passed since the start of the transaction. Consider increasing the interactive transaction timeout or doing less work in the transaction.`,
       { operation, timeout, timeTaken }
     );
   }
@@ -1847,7 +1850,7 @@ var TransactionManager = class {
     this.transactions.set(transaction.id, transaction);
     let hasTimedOut = false;
     const startTimer = setTimeout(() => hasTimedOut = true, validatedOptions.maxWait);
-    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel).catch(rethrowAsUserFacing);
     clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.14.0-dev.32",
+  "version": "6.14.0-dev.34",
   "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.14.0-dev.32",
-    "@prisma/driver-adapter-utils": "6.14.0-dev.32"
+    "@prisma/debug": "6.14.0-dev.34",
+    "@prisma/driver-adapter-utils": "6.14.0-dev.34"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",