@prisma/query-plan-executor 7.4.1-dev.1 → 7.4.2-dev.1

package/dist/index.d.ts

@@ -955,6 +955,9 @@ declare type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+    itemPrefix: string;
+    itemSeparator: string;
+    itemSuffix: string;
 } | {
     type: 'parameterTupleList';
     itemPrefix: string;
@@ -2406,7 +2409,7 @@ declare interface Queryable<Query, Result> extends AdapterInfo {
 declare type QueryEvent = {
     timestamp: Date;
     query: string;
-    params: unknown[];
+    params: readonly unknown[];
     duration: number;
 };
 
@@ -2477,6 +2480,7 @@ declare type QueryPlanNode = {
     args: {
         parent: QueryPlanNode;
         children: JoinExpression[];
+        canAssumeStrictEquality: boolean;
     };
 } | {
     type: 'mapField';
@@ -3312,14 +3316,14 @@ declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) e
 declare type UnofficialStatusCode = -1;
 
 declare type ValidationError = {
-    error_identifier: 'RELATION_VIOLATION';
+    errorIdentifier: 'RELATION_VIOLATION';
     context: {
         relation: string;
         modelA: string;
         modelB: string;
     };
 } | {
-    error_identifier: 'MISSING_RELATED_RECORD';
+    errorIdentifier: 'MISSING_RELATED_RECORD';
     context: {
         model: string;
         relation: string;
@@ -3328,24 +3332,24 @@ declare type ValidationError = {
         neededFor?: string;
     };
 } | {
-    error_identifier: 'MISSING_RECORD';
+    errorIdentifier: 'MISSING_RECORD';
     context: {
         operation: string;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_INPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_INPUT';
     context: {
         expectedRows: number;
     };
 } | {
-    error_identifier: 'INCOMPLETE_CONNECT_OUTPUT';
+    errorIdentifier: 'INCOMPLETE_CONNECT_OUTPUT';
     context: {
         expectedRows: number;
         relation: string;
         relationType: string;
     };
 } | {
-    error_identifier: 'RECORDS_NOT_CONNECTED';
+    errorIdentifier: 'RECORDS_NOT_CONNECTED';
     context: {
         relation: string;
         parent: string;

package/dist/index.js

@@ -101325,7 +101325,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.4.1-dev.1";
+var version = "7.4.2-dev.1";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -110496,8 +110496,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";
@@ -110588,7 +110591,10 @@ function renderFragment(fragment, placeholderFormat, ctx) {
     case "stringChunk":
       return fragment.chunk;
     case "parameterTuple": {
-      const placeholders = fragment.value.length == 0 ? "NULL" : fragment.value.map(() => formatPlaceholder(placeholderFormat, ctx.placeholderNumber++)).join(",");
+      const placeholders = fragment.value.length == 0 ? "NULL" : fragment.value.map(() => {
+        const item = formatPlaceholder(placeholderFormat, ctx.placeholderNumber++);
+        return `${fragment.itemPrefix}${item}${fragment.itemSuffix}`;
+      }).join(fragment.itemSeparator);
       return `(${placeholders})`;
     }
     case "parameterTupleList": {
@@ -110942,7 +110948,7 @@ function doesSatisfyRule(data, rule) {
   }
 }
 function renderMessage(data, error44) {
-  switch (error44.error_identifier) {
+  switch (error44.errorIdentifier) {
     case "RELATION_VIOLATION":
       return `The change you are trying to make would violate the required relation '${error44.context.relation}' between the \`${error44.context.modelA}\` and \`${error44.context.modelB}\` models.`;
     case "MISSING_RECORD":
@@ -110962,7 +110968,7 @@ function renderMessage(data, error44) {
   }
 }
 function getErrorCode2(error44) {
-  switch (error44.error_identifier) {
+  switch (error44.errorIdentifier) {
     case "RELATION_VIOLATION":
       return "P2014";
     case "RECORDS_NOT_CONNECTED":
@@ -111075,7 +111081,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)
             )
           );
@@ -111090,7 +111096,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)
             )
           );
@@ -111142,7 +111148,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) {
@@ -111189,8 +111195,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);
@@ -111283,12 +111290,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]) {
@@ -111301,11 +111309,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;
@@ -111317,6 +111326,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":
@@ -111376,6 +111419,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");
 }
@@ -113815,7 +113861,7 @@ function runInActiveSpan(nameOrOptions, fn2) {
 var mariadb = __toESM(require_promise(), 1);
 var name = "@prisma/adapter-mariadb";
 var UNSIGNED_FLAG = 1 << 5;
-var BINARY_FLAG = 1 << 7;
+var BINARY_COLLATION_INDEX = 63;
 function mapColumnType(field) {
   switch (field.type) {
     case "TINY":
@@ -113858,7 +113904,7 @@ function mapColumnType(field) {
     case "LONG_BLOB":
       if (field["dataTypeFormat"] === "json") {
         return ColumnTypeEnum.Json;
-      } else if (field.flags.valueOf() & BINARY_FLAG) {
+      } else if (field.collation.index === BINARY_COLLATION_INDEX) {
         return ColumnTypeEnum.Bytes;
       } else {
         return ColumnTypeEnum.Text;
@@ -114244,7 +114290,7 @@ function inferCapabilities(version5) {
   const [versionStr, suffix] = version5.split("-");
   const [major2, minor, patch] = versionStr.split(".").map((n2) => parseInt(n2, 10));
   const isMariaDB = suffix?.toLowerCase()?.includes("mariadb") ?? false;
-  const supportsRelationJoins = !isMariaDB && (major2 > 8 || major2 === 8 && minor >= 0 && patch >= 13);
+  const supportsRelationJoins = !isMariaDB && (major2 > 8 || major2 === 8 && (minor > 0 || minor === 0 && patch >= 13));
   return { supportsRelationJoins };
 }
 function rewriteConnectionString(config3) {

package/package.json

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