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

package/dist/index.js

@@ -1093,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) {
@@ -1235,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;

package/dist/index.mjs

@@ -1045,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) {
@@ -1187,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;

package/package.json

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