@prisma/query-plan-executor 7.2.0-dev.2 → 7.2.0-dev.20

package/dist/index.js

@@ -52566,9 +52566,9 @@ var require_safe_buffer = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/data-stream.js
+// ../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/data-stream.js
 var require_data_stream = __commonJS({
-  "../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/data-stream.js"(exports2, module2) {
+  "../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/data-stream.js"(exports2, module2) {
     "use strict";
     var Buffer2 = require_safe_buffer().Buffer;
     var Stream = require("stream");
@@ -52615,40 +52615,6 @@ var require_data_stream = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/buffer-equal-constant-time@1.0.1/node_modules/buffer-equal-constant-time/index.js
-var require_buffer_equal_constant_time = __commonJS({
-  "../../node_modules/.pnpm/buffer-equal-constant-time@1.0.1/node_modules/buffer-equal-constant-time/index.js"(exports2, module2) {
-    "use strict";
-    var Buffer2 = require("buffer").Buffer;
-    var SlowBuffer = require("buffer").SlowBuffer;
-    module2.exports = bufferEq;
-    function bufferEq(a2, b2) {
-      if (!Buffer2.isBuffer(a2) || !Buffer2.isBuffer(b2)) {
-        return false;
-      }
-      if (a2.length !== b2.length) {
-        return false;
-      }
-      var c2 = 0;
-      for (var i2 = 0; i2 < a2.length; i2++) {
-        c2 |= a2[i2] ^ b2[i2];
-      }
-      return c2 === 0;
-    }
-    bufferEq.install = function() {
-      Buffer2.prototype.equal = SlowBuffer.prototype.equal = function equal(that) {
-        return bufferEq(this, that);
-      };
-    };
-    var origBufEqual = Buffer2.prototype.equal;
-    var origSlowBufEqual = SlowBuffer.prototype.equal;
-    bufferEq.restore = function() {
-      Buffer2.prototype.equal = origBufEqual;
-      SlowBuffer.prototype.equal = origSlowBufEqual;
-    };
-  }
-});
-
 // ../../node_modules/.pnpm/ecdsa-sig-formatter@1.0.11/node_modules/ecdsa-sig-formatter/src/param-bytes-for-alg.js
 var require_param_bytes_for_alg = __commonJS({
   "../../node_modules/.pnpm/ecdsa-sig-formatter@1.0.11/node_modules/ecdsa-sig-formatter/src/param-bytes-for-alg.js"(exports2, module2) {
@@ -52813,11 +52779,44 @@ var require_ecdsa_sig_formatter = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/jwa@1.4.1/node_modules/jwa/index.js
+// ../../node_modules/.pnpm/buffer-equal-constant-time@1.0.1/node_modules/buffer-equal-constant-time/index.js
+var require_buffer_equal_constant_time = __commonJS({
+  "../../node_modules/.pnpm/buffer-equal-constant-time@1.0.1/node_modules/buffer-equal-constant-time/index.js"(exports2, module2) {
+    "use strict";
+    var Buffer2 = require("buffer").Buffer;
+    var SlowBuffer = require("buffer").SlowBuffer;
+    module2.exports = bufferEq;
+    function bufferEq(a2, b2) {
+      if (!Buffer2.isBuffer(a2) || !Buffer2.isBuffer(b2)) {
+        return false;
+      }
+      if (a2.length !== b2.length) {
+        return false;
+      }
+      var c2 = 0;
+      for (var i2 = 0; i2 < a2.length; i2++) {
+        c2 |= a2[i2] ^ b2[i2];
+      }
+      return c2 === 0;
+    }
+    bufferEq.install = function() {
+      Buffer2.prototype.equal = SlowBuffer.prototype.equal = function equal(that) {
+        return bufferEq(this, that);
+      };
+    };
+    var origBufEqual = Buffer2.prototype.equal;
+    var origSlowBufEqual = SlowBuffer.prototype.equal;
+    bufferEq.restore = function() {
+      Buffer2.prototype.equal = origBufEqual;
+      SlowBuffer.prototype.equal = origSlowBufEqual;
+    };
+  }
+});
+
+// ../../node_modules/.pnpm/jwa@2.0.1/node_modules/jwa/index.js
 var require_jwa = __commonJS({
-  "../../node_modules/.pnpm/jwa@1.4.1/node_modules/jwa/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/jwa@2.0.1/node_modules/jwa/index.js"(exports2, module2) {
     "use strict";
-    var bufferEqual = require_buffer_equal_constant_time();
     var Buffer2 = require_safe_buffer().Buffer;
     var crypto7 = require("crypto");
     var formatEcdsa = require_ecdsa_sig_formatter();
@@ -52921,10 +52920,22 @@ var require_jwa = __commonJS({
         return fromBase64(sig);
       };
     }
+    var bufferEqual;
+    var timingSafeEqual = "timingSafeEqual" in crypto7 ? function timingSafeEqual2(a2, b2) {
+      if (a2.byteLength !== b2.byteLength) {
+        return false;
+      }
+      return crypto7.timingSafeEqual(a2, b2);
+    } : function timingSafeEqual2(a2, b2) {
+      if (!bufferEqual) {
+        bufferEqual = require_buffer_equal_constant_time();
+      }
+      return bufferEqual(a2, b2);
+    };
     function createHmacVerifier(bits) {
       return function verify(thing, signature, secret2) {
         var computedSig = createHmacSigner(bits)(thing, secret2);
-        return bufferEqual(Buffer2.from(signature), Buffer2.from(computedSig));
+        return timingSafeEqual(Buffer2.from(signature), Buffer2.from(computedSig));
       };
     }
     function createKeySigner(bits) {
@@ -53014,7 +53025,7 @@ var require_jwa = __commonJS({
         es: createECDSAVerifer,
         none: createNoneVerifier
       };
-      var match2 = algorithm.match(/^(RS|PS|ES|HS)(256|384|512)$|^(none)$/i);
+      var match2 = algorithm.match(/^(RS|PS|ES|HS)(256|384|512)$|^(none)$/);
       if (!match2)
         throw typeError(MSG_INVALID_ALGORITHM, algorithm);
       var algo = (match2[1] || match2[3]).toLowerCase();
@@ -53027,9 +53038,9 @@ var require_jwa = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/tostring.js
+// ../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/tostring.js
 var require_tostring = __commonJS({
-  "../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/tostring.js"(exports2, module2) {
+  "../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/tostring.js"(exports2, module2) {
     "use strict";
     var Buffer2 = require("buffer").Buffer;
     module2.exports = function toString2(obj) {
@@ -53042,9 +53053,9 @@ var require_tostring = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/sign-stream.js
+// ../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/sign-stream.js
 var require_sign_stream = __commonJS({
-  "../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/sign-stream.js"(exports2, module2) {
+  "../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/sign-stream.js"(exports2, module2) {
     "use strict";
     var Buffer2 = require_safe_buffer().Buffer;
     var DataStream = require_data_stream();
@@ -53072,7 +53083,12 @@ var require_sign_stream = __commonJS({
       return util2.format("%s.%s", securedInput, signature);
     }
     function SignStream(opts) {
-      var secret2 = opts.secret || opts.privateKey || opts.key;
+      var secret2 = opts.secret;
+      secret2 = secret2 == null ? opts.privateKey : secret2;
+      secret2 = secret2 == null ? opts.key : secret2;
+      if (/^hs/i.test(opts.header.alg) === true && secret2 == null) {
+        throw new TypeError("secret must be a string or buffer or a KeyObject");
+      }
       var secretStream = new DataStream(secret2);
       this.readable = true;
       this.header = opts.header;
@@ -53113,9 +53129,9 @@ var require_sign_stream = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/verify-stream.js
+// ../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/verify-stream.js
 var require_verify_stream = __commonJS({
-  "../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/lib/verify-stream.js"(exports2, module2) {
+  "../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/lib/verify-stream.js"(exports2, module2) {
     "use strict";
     var Buffer2 = require_safe_buffer().Buffer;
     var DataStream = require_data_stream();
@@ -53185,7 +53201,12 @@ var require_verify_stream = __commonJS({
     }
     function VerifyStream(opts) {
       opts = opts || {};
-      var secretOrKey = opts.secret || opts.publicKey || opts.key;
+      var secretOrKey = opts.secret;
+      secretOrKey = secretOrKey == null ? opts.publicKey : secretOrKey;
+      secretOrKey = secretOrKey == null ? opts.key : secretOrKey;
+      if (/^hs/i.test(opts.algorithm) === true && secretOrKey == null) {
+        throw new TypeError("secret must be a string or buffer or a KeyObject");
+      }
       var secretStream = new DataStream(secretOrKey);
       this.readable = true;
       this.algorithm = opts.algorithm;
@@ -53224,9 +53245,9 @@ var require_verify_stream = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/index.js
+// ../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/index.js
 var require_jws = __commonJS({
-  "../../node_modules/.pnpm/jws@3.2.2/node_modules/jws/index.js"(exports2) {
+  "../../node_modules/.pnpm/jws@4.0.1/node_modules/jws/index.js"(exports2) {
     "use strict";
     var SignStream = require_sign_stream();
     var VerifyStream = require_verify_stream();
@@ -97752,7 +97773,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.2.0-dev.2";
+var version = "7.2.0-dev.20";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -106195,6 +106216,8 @@ function getErrorCode(err) {
       return "P2002";
     case "ForeignKeyConstraintViolation":
       return "P2003";
+    case "InvalidInputValue":
+      return "P2007";
     case "UnsupportedNativeDataType":
       return "P2010";
     case "NullConstraintViolation":
@@ -106291,6 +106314,8 @@ function renderErrorMessage(err) {
       return `Error in external connector (id ${err.cause.id})`;
     case "TooManyConnections":
       return `Too many database connections opened: ${err.cause.cause}`;
+    case "InvalidInputValue":
+      return `Invalid input value: ${err.cause.message}`;
     case "sqlite":
     case "postgres":
     case "mysql":
@@ -106310,8 +106335,11 @@ function renderConstraint(constraint) {
   }
   return "(not available)";
 }
-var DataMapperError = class extends Error {
+var DataMapperError = class extends UserFacingError {
   name = "DataMapperError";
+  constructor(message, options) {
+    super(message, "P2023", options);
+  }
 };
 function applyDataMap(data, structure, enums) {
   switch (structure.type) {
@@ -106462,7 +106490,7 @@ function mapValue(value, columnName, scalarType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
-      if (Array.isArray(value)) {
+      if (Array.isArray(value) || value instanceof Uint8Array) {
         for (const byte of value) {
           if (byte !== 0) return true;
         }
@@ -107133,17 +107161,6 @@ function serializeRawValue(value, type2) {
         throw new Error(`Cannot serialize value of type ${typeof value} as JsonArray`);
       }
       return value.map((v2) => serializeRawValue(v2, ColumnTypeEnum.Json));
-    case ColumnTypeEnum.Bytes:
-      if (Array.isArray(value)) {
-        return new Uint8Array(value);
-      } else {
-        throw new Error(`Cannot serialize value of type ${typeof value} as Bytes`);
-      }
-    case ColumnTypeEnum.BytesArray:
-      if (!Array.isArray(value)) {
-        throw new Error(`Cannot serialize value of type ${typeof value} as BytesArray`);
-      }
-      return value.map((v2) => serializeRawValue(v2, ColumnTypeEnum.Bytes));
     case ColumnTypeEnum.Boolean:
       switch (typeof value) {
         case "boolean":
@@ -109444,7 +109461,7 @@ var SpanProxy = class {
       parentId,
       attributes,
       links,
-      name: `prisma:engine:${this.#name}`,
+      name: `prisma:accelerate:${this.#name}`,
       kind: serializeSpanKind(this.#kind),
       startTime: this.#startTime,
       endTime: instantToHrTime(endTime)
@@ -109695,9 +109712,6 @@ function mapArg(arg, argType) {
   if (typeof arg === "string" && argType.scalarType === "bytes") {
     return Buffer.from(arg, "base64");
   }
-  if (Array.isArray(arg) && argType.scalarType === "bytes") {
-    return Buffer.from(arg);
-  }
   if (ArrayBuffer.isView(arg)) {
     return Buffer.from(arg.buffer, arg.byteOffset, arg.byteLength);
   }
@@ -109716,9 +109730,6 @@ function mapRow(row, fields) {
       case "DATETIME2":
         return (/* @__PURE__ */ new Date(`${value}Z`)).toISOString().replace(/(\.000)?Z$/, "+00:00");
     }
-    if (Buffer.isBuffer(value)) {
-      return Array.from(value);
-    }
     if (typeof value === "bigint") {
       return value.toString();
     }
@@ -109860,7 +109871,8 @@ function mapDriverError(error44) {
         kind: "mysql",
         code: error44.errno,
         message: error44.sqlMessage ?? "N/A",
-        state: error44.sqlState ?? "N/A"
+        state: error44.sqlState ?? "N/A",
+        cause: error44.cause?.message ?? void 0
       };
   }
 }
@@ -110599,9 +110611,6 @@ function mapArg2(arg, argType) {
   if (typeof arg === "string" && argType.scalarType === "bytes") {
     return Buffer.from(arg, "base64");
   }
-  if (Array.isArray(arg) && argType.scalarType === "bytes") {
-    return Buffer.from(arg);
-  }
   if (ArrayBuffer.isView(arg)) {
     return Buffer.from(arg.buffer, arg.byteOffset, arg.byteLength);
   }
@@ -110625,9 +110634,6 @@ function mapRow2(row, columns) {
       }
       return value;
     }
-    if (Buffer.isBuffer(value)) {
-      return Array.from(value);
-    }
     if (typeof value === "string" && type2 === import_mssql3.default.UniqueIdentifier) {
       return value.toLowerCase();
     }
@@ -111272,18 +111278,10 @@ function normalize_xml(xml) {
 function toJson(json2) {
   return json2;
 }
-function encodeBuffer(buffer) {
-  return Array.from(new Uint8Array(buffer));
-}
 var parsePgBytes = getTypeParser(ScalarColumnType.BYTEA);
-var parseBytesArray = getTypeParser(ArrayColumnType.BYTEA_ARRAY);
-function normalizeByteaArray(serializedBytesArray) {
-  const buffers = parseBytesArray(serializedBytesArray);
-  return buffers.map((buf) => buf ? encodeBuffer(buf) : null);
-}
+var normalizeByteaArray = getTypeParser(ArrayColumnType.BYTEA_ARRAY);
 function convertBytes(serializedBytes) {
-  const buffer = parsePgBytes(serializedBytes);
-  return encodeBuffer(buffer);
+  return parsePgBytes(serializedBytes);
 }
 function normalizeBit(bit) {
   return bit;
@@ -111336,11 +111334,8 @@ function mapArg3(arg, argType) {
   if (typeof arg === "string" && argType.scalarType === "bytes") {
     return Buffer.from(arg, "base64");
   }
-  if (Array.isArray(arg) && argType.scalarType === "bytes") {
-    return Buffer.from(arg);
-  }
   if (ArrayBuffer.isView(arg)) {
-    return Buffer.from(arg.buffer, arg.byteOffset, arg.byteLength);
+    return new Uint8Array(arg.buffer, arg.byteOffset, arg.byteLength);
   }
   return arg;
 }
@@ -111420,6 +111415,11 @@ function mapDriverError3(error44) {
         kind: "ValueOutOfRange",
         cause: error44.message
       };
+    case "22P02":
+      return {
+        kind: "InvalidInputValue",
+        message: error44.message
+      };
     case "23505": {
       const fields = error44.detail?.match(/Key \(([^)]+)\)/)?.at(1)?.split(", ");
       return {
@@ -111864,59 +111864,49 @@ var App = class _App {
    * @param transactionId - Transaction ID if running within a transaction
    */
   async query(queryPlan, placeholderValues, comments, resourceLimits, transactionId) {
-    return await this.#tracingHandler.runInChildSpan("query", async () => {
-      const queryable = transactionId !== null ? await this.#transactionManager.getTransaction({ id: transactionId }, "query") : this.#db;
-      const sqlCommenter = comments && Object.keys(comments).length > 0 ? {
-        plugins: [() => comments],
-        // For pre-computed comments, we use a placeholder queryInfo since the actual
-        // query info was already used on the client side to compute the comments
-        queryInfo: { type: "single", action: "queryRaw", query: {} }
-      } : void 0;
-      const queryInterpreter = QueryInterpreter.forSql({
-        placeholderValues,
-        tracingHelper: this.#tracingHandler,
-        transactionManager: transactionId === null ? { enabled: true, manager: this.#transactionManager } : { enabled: false },
-        onQuery: logQuery,
-        sqlCommenter
-      });
-      const result = await Promise.race([
-        queryInterpreter.run(queryPlan, queryable),
-        import_promises3.default.setTimeout(resourceLimits.queryTimeout.total("milliseconds"), void 0, { ref: false }).then(() => {
-          throw new ResourceLimitError("Query timeout exceeded");
-        })
-      ]);
-      return normalizeJsonProtocolValues(result);
+    const queryable = transactionId !== null ? await this.#transactionManager.getTransaction({ id: transactionId }, "query") : this.#db;
+    const sqlCommenter = comments && Object.keys(comments).length > 0 ? {
+      plugins: [() => comments],
+      // For pre-computed comments, we use a placeholder queryInfo since the actual
+      // query info was already used on the client side to compute the comments
+      queryInfo: { type: "single", action: "queryRaw", query: {} }
+    } : void 0;
+    const queryInterpreter = QueryInterpreter.forSql({
+      placeholderValues,
+      tracingHelper: this.#tracingHandler,
+      transactionManager: transactionId === null ? { enabled: true, manager: this.#transactionManager } : { enabled: false },
+      onQuery: logQuery,
+      sqlCommenter
     });
+    const result = await Promise.race([
+      queryInterpreter.run(queryPlan, queryable),
+      import_promises3.default.setTimeout(resourceLimits.queryTimeout.total("milliseconds"), void 0, { ref: false }).then(() => {
+        throw new ResourceLimitError("Query timeout exceeded");
+      })
+    ]);
+    return normalizeJsonProtocolValues(result);
   }
   /**
    * Starts a new transaction.
    */
   async startTransaction(options, resourceLimits) {
-    return await this.#tracingHandler.runInChildSpan("start_transaction", () => {
-      const timeout = Math.min(options.timeout ?? Infinity, resourceLimits.maxTransactionTimeout.total("milliseconds"));
-      return this.#transactionManager.startTransaction({
-        ...options,
-        timeout
-      });
+    const timeout = Math.min(options.timeout ?? Infinity, resourceLimits.maxTransactionTimeout.total("milliseconds"));
+    return this.#transactionManager.startTransaction({
+      ...options,
+      timeout
     });
   }
   /**
    * Commits a transaction.
    */
-  async commitTransaction(transactionId) {
-    return await this.#tracingHandler.runInChildSpan(
-      "commit_transaction",
-      () => this.#transactionManager.commitTransaction(transactionId)
-    );
+  commitTransaction(transactionId) {
+    return this.#transactionManager.commitTransaction(transactionId);
   }
   /**
    * Rolls back a transaction.
    */
-  async rollbackTransaction(transactionId) {
-    return await this.#tracingHandler.runInChildSpan(
-      "rollback_transaction",
-      () => this.#transactionManager.rollbackTransaction(transactionId)
-    );
+  rollbackTransaction(transactionId) {
+    return this.#transactionManager.rollbackTransaction(transactionId);
   }
   /**
    * Retrieves connection information necessary for building the queries.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "7.2.0-dev.2",
+  "version": "7.2.0-dev.20",
   "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.2.0-dev.2",
-    "@prisma/adapter-pg": "7.2.0-dev.2",
-    "@prisma/adapter-mssql": "7.2.0-dev.2",
-    "@prisma/client-engine-runtime": "7.2.0-dev.2",
-    "@prisma/driver-adapter-utils": "7.2.0-dev.2"
+    "@prisma/adapter-pg": "7.2.0-dev.20",
+    "@prisma/adapter-mariadb": "7.2.0-dev.20",
+    "@prisma/adapter-mssql": "7.2.0-dev.20",
+    "@prisma/client-engine-runtime": "7.2.0-dev.20",
+    "@prisma/driver-adapter-utils": "7.2.0-dev.20"
   },
   "files": [
     "dist"