@prisma/client-engine-runtime 6.11.0-dev.18 → 6.11.0-dev.2

package/dist/index.js

@@ -230,12 +230,6 @@ 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":
@@ -273,9 +267,6 @@ 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": {
@@ -773,16 +764,8 @@ 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.map((value, index) => mappers[index](value)).reduce((acc, value, index) => {
+    (row) => row.reduce((acc, value, index) => {
       const splitByDot = resultSet.columnNames[index].split(".");
       let nested = acc;
       for (let i = 0; i < splitByDot.length; i++) {
@@ -1110,7 +1093,13 @@ var QueryInterpreter = class _QueryInterpreter {
             childRecords: (await this.interpretNode(joinExpr.child, queryable, scope, generators)).value
           }))
         );
-        return { value: attachChildrenToParents(parent, children), lastInsertId };
+        if (Array.isArray(parent)) {
+          for (const record of parent) {
+            attachChildrenToParent(asRecord(record), children);
+          }
+          return { value: parent, lastInsertId };
+        }
+        return { value: attachChildrenToParent(asRecord(parent), children), lastInsertId };
       }
       case "transaction": {
         if (!this.#transactionManager.enabled) {
@@ -1252,39 +1241,34 @@ function mapField(value, field) {
   }
   return value;
 }
-function attachChildrenToParents(parentRecords, children) {
+function attachChildrenToParent(parentRecord, children) {
   for (const { joinExpr, childRecords } of children) {
-    const parentKeys = joinExpr.on.map(([k]) => k);
-    const childKeys = joinExpr.on.map(([, k]) => k);
-    const parentMap = {};
-    for (const parent of Array.isArray(parentRecords) ? parentRecords : [parentRecords]) {
-      const parentRecord = asRecord(parent);
-      const key = getRecordKey(parentRecord, parentKeys);
-      if (!parentMap[key]) {
-        parentMap[key] = [];
-      }
-      parentMap[key].push(parentRecord);
-      if (joinExpr.isRelationUnique) {
-        parentRecord[joinExpr.parentField] = null;
-      } else {
-        parentRecord[joinExpr.parentField] = [];
-      }
+    parentRecord[joinExpr.parentField] = filterChildRecords(childRecords, parentRecord, joinExpr);
+  }
+  return parentRecord;
+}
+function filterChildRecords(records, parentRecord, joinExpr) {
+  if (Array.isArray(records)) {
+    const filtered = records.filter((record) => childRecordMatchesParent(asRecord(record), parentRecord, joinExpr));
+    if (joinExpr.isRelationUnique) {
+      return filtered.length > 0 ? filtered[0] : null;
+    } else {
+      return filtered;
     }
-    for (const childRecord of Array.isArray(childRecords) ? childRecords : [childRecords]) {
-      if (childRecord === null) {
-        continue;
-      }
-      const key = getRecordKey(asRecord(childRecord), childKeys);
-      for (const parentRecord of parentMap[key] ?? []) {
-        if (joinExpr.isRelationUnique) {
-          parentRecord[joinExpr.parentField] = childRecord;
-        } else {
-          parentRecord[joinExpr.parentField].push(childRecord);
-        }
-      }
+  } else if (records === null) {
+    return null;
+  } else {
+    const record = asRecord(records);
+    return childRecordMatchesParent(record, parentRecord, joinExpr) ? record : null;
+  }
+}
+function childRecordMatchesParent(childRecord, parentRecord, joinExpr) {
+  for (const [parentField, childField] of joinExpr.on) {
+    if (parentRecord[parentField] !== childRecord[childField]) {
+      return false;
     }
   }
-  return parentRecords;
+  return true;
 }
 function paginate(list, { cursor, skip, take }) {
   const cursorIndex = cursor !== null ? list.findIndex((item) => doKeysMatch(item, cursor)) : 0;
@@ -1441,16 +1425,17 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
-    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
-    clearTimeout(startTimer);
+    transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
+    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
     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":
@@ -1527,33 +1512,30 @@ var TransactionManager = class {
   async closeTransaction(tx, status) {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
-    try {
-      if (tx.transaction && status === "committed") {
-        if (tx.transaction.options.usePhantomQuery) {
-          await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
-        } else {
-          const query = COMMIT_QUERY();
-          await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-          await tx.transaction.commit();
-        }
-      } else if (tx.transaction) {
-        if (tx.transaction.options.usePhantomQuery) {
-          await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
-        } else {
-          const query = ROLLBACK_QUERY();
-          await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-          await tx.transaction.rollback();
-        }
+    if (tx.transaction && status === "committed") {
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
+      } else {
+        await tx.transaction.commit();
+        const query = COMMIT_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
-    } finally {
-      clearTimeout(tx.timer);
-      tx.timer = void 0;
-      this.transactions.delete(tx.id);
-      this.closedTransactions.push(tx);
-      if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
-        this.closedTransactions.shift();
+    } else if (tx.transaction) {
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
+      } else {
+        await tx.transaction.rollback();
+        const query = ROLLBACK_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
     }
+    clearTimeout(tx.timer);
+    tx.timer = void 0;
+    this.transactions.delete(tx.id);
+    this.closedTransactions.push(tx);
+    if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
+      this.closedTransactions.shift();
+    }
   }
   validateOptions(options) {
     if (!options.timeout) throw new TransactionManagerError("timeout is required");

package/dist/index.mjs

@@ -182,12 +182,6 @@ 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":
@@ -225,9 +219,6 @@ 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": {
@@ -725,16 +716,8 @@ 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.map((value, index) => mappers[index](value)).reduce((acc, value, index) => {
+    (row) => row.reduce((acc, value, index) => {
       const splitByDot = resultSet.columnNames[index].split(".");
       let nested = acc;
       for (let i = 0; i < splitByDot.length; i++) {
@@ -1062,7 +1045,13 @@ var QueryInterpreter = class _QueryInterpreter {
             childRecords: (await this.interpretNode(joinExpr.child, queryable, scope, generators)).value
           }))
         );
-        return { value: attachChildrenToParents(parent, children), lastInsertId };
+        if (Array.isArray(parent)) {
+          for (const record of parent) {
+            attachChildrenToParent(asRecord(record), children);
+          }
+          return { value: parent, lastInsertId };
+        }
+        return { value: attachChildrenToParent(asRecord(parent), children), lastInsertId };
       }
       case "transaction": {
         if (!this.#transactionManager.enabled) {
@@ -1204,39 +1193,34 @@ function mapField(value, field) {
   }
   return value;
 }
-function attachChildrenToParents(parentRecords, children) {
+function attachChildrenToParent(parentRecord, children) {
   for (const { joinExpr, childRecords } of children) {
-    const parentKeys = joinExpr.on.map(([k]) => k);
-    const childKeys = joinExpr.on.map(([, k]) => k);
-    const parentMap = {};
-    for (const parent of Array.isArray(parentRecords) ? parentRecords : [parentRecords]) {
-      const parentRecord = asRecord(parent);
-      const key = getRecordKey(parentRecord, parentKeys);
-      if (!parentMap[key]) {
-        parentMap[key] = [];
-      }
-      parentMap[key].push(parentRecord);
-      if (joinExpr.isRelationUnique) {
-        parentRecord[joinExpr.parentField] = null;
-      } else {
-        parentRecord[joinExpr.parentField] = [];
-      }
+    parentRecord[joinExpr.parentField] = filterChildRecords(childRecords, parentRecord, joinExpr);
+  }
+  return parentRecord;
+}
+function filterChildRecords(records, parentRecord, joinExpr) {
+  if (Array.isArray(records)) {
+    const filtered = records.filter((record) => childRecordMatchesParent(asRecord(record), parentRecord, joinExpr));
+    if (joinExpr.isRelationUnique) {
+      return filtered.length > 0 ? filtered[0] : null;
+    } else {
+      return filtered;
     }
-    for (const childRecord of Array.isArray(childRecords) ? childRecords : [childRecords]) {
-      if (childRecord === null) {
-        continue;
-      }
-      const key = getRecordKey(asRecord(childRecord), childKeys);
-      for (const parentRecord of parentMap[key] ?? []) {
-        if (joinExpr.isRelationUnique) {
-          parentRecord[joinExpr.parentField] = childRecord;
-        } else {
-          parentRecord[joinExpr.parentField].push(childRecord);
-        }
-      }
+  } else if (records === null) {
+    return null;
+  } else {
+    const record = asRecord(records);
+    return childRecordMatchesParent(record, parentRecord, joinExpr) ? record : null;
+  }
+}
+function childRecordMatchesParent(childRecord, parentRecord, joinExpr) {
+  for (const [parentField, childField] of joinExpr.on) {
+    if (parentRecord[parentField] !== childRecord[childField]) {
+      return false;
     }
   }
-  return parentRecords;
+  return true;
 }
 function paginate(list, { cursor, skip, take }) {
   const cursorIndex = cursor !== null ? list.findIndex((item) => doKeysMatch(item, cursor)) : 0;
@@ -1393,16 +1377,17 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
-    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
-    clearTimeout(startTimer);
+    transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
+    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
     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":
@@ -1479,33 +1464,30 @@ var TransactionManager = class {
   async closeTransaction(tx, status) {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
-    try {
-      if (tx.transaction && status === "committed") {
-        if (tx.transaction.options.usePhantomQuery) {
-          await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
-        } else {
-          const query = COMMIT_QUERY();
-          await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-          await tx.transaction.commit();
-        }
-      } else if (tx.transaction) {
-        if (tx.transaction.options.usePhantomQuery) {
-          await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
-        } else {
-          const query = ROLLBACK_QUERY();
-          await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-          await tx.transaction.rollback();
-        }
+    if (tx.transaction && status === "committed") {
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
+      } else {
+        await tx.transaction.commit();
+        const query = COMMIT_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
-    } finally {
-      clearTimeout(tx.timer);
-      tx.timer = void 0;
-      this.transactions.delete(tx.id);
-      this.closedTransactions.push(tx);
-      if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
-        this.closedTransactions.shift();
+    } else if (tx.transaction) {
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
+      } else {
+        await tx.transaction.rollback();
+        const query = ROLLBACK_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
     }
+    clearTimeout(tx.timer);
+    tx.timer = void 0;
+    this.transactions.delete(tx.id);
+    this.closedTransactions.push(tx);
+    if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
+      this.closedTransactions.shift();
+    }
   }
   validateOptions(options) {
     if (!options.timeout) throw new TransactionManagerError("timeout is required");

package/package.json

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