@prisma/query-plan-executor 7.5.0-dev.30 → 7.5.0-dev.32

package/dist/index.d.ts

@@ -2414,7 +2414,7 @@ declare interface Queryable<Query, Result> extends AdapterInfo {
 declare type QueryEvent = {
     timestamp: Date;
     query: string;
-    params: unknown[];
+    params: readonly unknown[];
     duration: number;
 };
 
@@ -2485,6 +2485,7 @@ declare type QueryPlanNode = {
     args: {
         parent: QueryPlanNode;
         children: JoinExpression[];
+        canAssumeStrictEquality: boolean;
     };
 } | {
     type: 'mapField';

package/dist/index.js

@@ -101325,7 +101325,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.5.0-dev.30";
+var version = "7.5.0-dev.32";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -110498,8 +110498,11 @@ function paginateSingleList(list, { cursor, skip, take }) {
   const end = take !== null ? start + take : list.length;
   return list.slice(start, end);
 }
-function getRecordKey(record2, fields) {
-  return JSON.stringify(fields.map((field) => record2[field]));
+function getRecordKey(record2, fields, mappers) {
+  const array2 = fields.map(
+    (field, index) => mappers?.[index] ? record2[field] !== null ? mappers[index](record2[field]) : null : record2[field]
+  );
+  return JSON.stringify(array2);
 }
 function isPrismaValuePlaceholder(value) {
   return typeof value === "object" && value !== null && value["prisma__type"] === "param";
@@ -111080,7 +111083,7 @@ var QueryInterpreter = class _QueryInterpreter {
           sum2 += await this.#withQuerySpanAndEvent(
             commentedQuery,
             context2.queryable,
-            () => context2.queryable.executeRaw(commentedQuery).catch(
+            () => context2.queryable.executeRaw(cloneObject(commentedQuery)).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -111095,7 +111098,7 @@ var QueryInterpreter = class _QueryInterpreter {
           const result = await this.#withQuerySpanAndEvent(
             commentedQuery,
             context2.queryable,
-            () => context2.queryable.queryRaw(commentedQuery).catch(
+            () => context2.queryable.queryRaw(cloneObject(commentedQuery)).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -111147,7 +111150,7 @@ var QueryInterpreter = class _QueryInterpreter {
             childRecords: (await this.interpretNode(joinExpr.child, context2)).value
           }))
         );
-        return { value: attachChildrenToParents(parent, children), lastInsertId };
+        return { value: attachChildrenToParents(parent, children, node.args.canAssumeStrictEquality), lastInsertId };
       }
       case "transaction": {
         if (!context2.transactionManager.enabled) {
@@ -111194,8 +111197,9 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "process": {
         const { value, lastInsertId } = await this.interpretNode(node.args.expr, context2);
-        evaluateProcessingParameters(node.args.operations, context2.scope, context2.generators);
-        return { value: processRecords(value, node.args.operations), lastInsertId };
+        const ops = cloneObject(node.args.operations);
+        evaluateProcessingParameters(ops, context2.scope, context2.generators);
+        return { value: processRecords(value, ops), lastInsertId };
       }
       case "initializeRecord": {
         const { lastInsertId } = await this.interpretNode(node.args.expr, context2);
@@ -111288,12 +111292,13 @@ function mapField2(value, field) {
   }
   return value;
 }
-function attachChildrenToParents(parentRecords, children) {
+function attachChildrenToParents(parentRecords, children, canAssumeStrictEquality) {
   for (const { joinExpr, childRecords } of children) {
     const parentKeys = joinExpr.on.map(([k2]) => k2);
     const childKeys = joinExpr.on.map(([, k2]) => k2);
     const parentMap = {};
-    for (const parent of Array.isArray(parentRecords) ? parentRecords : [parentRecords]) {
+    const parentArray = Array.isArray(parentRecords) ? parentRecords : [parentRecords];
+    for (const parent of parentArray) {
       const parentRecord = asRecord(parent);
       const key = getRecordKey(parentRecord, parentKeys);
       if (!parentMap[key]) {
@@ -111306,11 +111311,12 @@ function attachChildrenToParents(parentRecords, children) {
         parentRecord[joinExpr.parentField] = [];
       }
     }
+    const mappers = canAssumeStrictEquality ? void 0 : inferKeyCasts(parentArray, parentKeys);
     for (const childRecord of Array.isArray(childRecords) ? childRecords : [childRecords]) {
       if (childRecord === null) {
         continue;
       }
-      const key = getRecordKey(asRecord(childRecord), childKeys);
+      const key = getRecordKey(asRecord(childRecord), childKeys, mappers);
       for (const parentRecord of parentMap[key] ?? []) {
         if (joinExpr.isRelationUnique) {
           parentRecord[joinExpr.parentField] = childRecord;
@@ -111322,6 +111328,40 @@ function attachChildrenToParents(parentRecords, children) {
   }
   return parentRecords;
 }
+function inferKeyCasts(rows, keys) {
+  function getKeyCast(type2) {
+    switch (type2) {
+      case "number":
+        return Number;
+      case "string":
+        return String;
+      case "boolean":
+        return Boolean;
+      case "bigint":
+        return BigInt;
+      default:
+        return;
+    }
+  }
+  const keyCasts = Array.from({ length: keys.length });
+  let keysFound = 0;
+  for (const parent of rows) {
+    const parentRecord = asRecord(parent);
+    for (const [i2, key] of keys.entries()) {
+      if (parentRecord[key] !== null && keyCasts[i2] === void 0) {
+        const keyCast = getKeyCast(typeof parentRecord[key]);
+        if (keyCast !== void 0) {
+          keyCasts[i2] = keyCast;
+        }
+        keysFound++;
+      }
+    }
+    if (keysFound === keys.length) {
+      break;
+    }
+  }
+  return keyCasts;
+}
 function evalFieldInitializer(initializer3, lastInsertId, scope, generators) {
   switch (initializer3.type) {
     case "value":
@@ -111381,6 +111421,9 @@ function evaluateProcessingParameters(ops, scope, generators) {
     evaluateProcessingParameters(nested, scope, generators);
   }
 }
+function cloneObject(value) {
+  return klona(value);
+}
 async function getCrypto() {
   return globalThis.crypto ?? await import("node:crypto");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "7.5.0-dev.30",
+  "version": "7.5.0-dev.32",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,11 +19,11 @@
     "hono": "4.11.7",
     "temporal-polyfill": "0.3.0",
     "zod": "4.1.3",
-    "@prisma/adapter-mariadb": "7.5.0-dev.30",
-    "@prisma/adapter-mssql": "7.5.0-dev.30",
-    "@prisma/driver-adapter-utils": "7.5.0-dev.30",
-    "@prisma/adapter-pg": "7.5.0-dev.30",
-    "@prisma/client-engine-runtime": "7.5.0-dev.30"
+    "@prisma/adapter-pg": "7.5.0-dev.32",
+    "@prisma/adapter-mariadb": "7.5.0-dev.32",
+    "@prisma/client-engine-runtime": "7.5.0-dev.32",
+    "@prisma/driver-adapter-utils": "7.5.0-dev.32",
+    "@prisma/adapter-mssql": "7.5.0-dev.32"
   },
   "files": [
     "dist"