@prisma/query-plan-executor 6.18.0-dev.2 → 6.18.0-dev.21

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { Temporal } from 'temporal-spec';
+import { version } from '../package.json';
 
 /**
  * An interface that exposes some basic information about the
@@ -255,6 +256,11 @@ declare type ConnectionInfo = {
     supportsRelationJoins: boolean;
 };
 
+/**
+ * Log level options accepted by the console logger.
+ */
+export declare type ConsoleLogLevel = LogLevel | 'off';
+
 declare type ContentfulStatusCode = Exclude<StatusCode, ContentlessStatusCode>;
 
 declare type ContentlessStatusCode = 101 | 204 | 205 | 304;
@@ -587,8 +593,9 @@ declare interface ContextVariableMap {
 /**
  * Creates a logger that keeps log events with a level greater than or equal
  * to {@link logLevel} and outputs them to console using format {@link logFormat}.
+ * When `logLevel` is `'off'`, all log events are dropped.
  */
-export declare function createConsoleLogger(logFormat: LogFormat, logLevel: LogLevel): Logger;
+export declare function createConsoleLogger(logFormat: LogFormat, logLevel: LogLevel | 'off'): Logger;
 
 declare function createHonoServer(app: App, options: Options): Hono<    {
 Variables: {
@@ -2455,7 +2462,7 @@ export declare type LogLevel = (typeof validLogLevels)[number];
  */
 export declare interface LogOptions {
     /** Minimum log level to output */
-    logLevel: LogLevel;
+    logLevel: ConsoleLogLevel;
     /** Format of log output */
     logFormat: LogFormat;
 }
@@ -5135,6 +5142,12 @@ export declare class TransactionManager {
         onQuery?: (event: QueryEvent) => void;
         provider?: SchemaProvider;
     });
+    /**
+     * Starts an internal transaction. The difference to `startTransaction` is that it does not
+     * use the default transaction options from the `TransactionManager`, which in practice means
+     * that it does not apply the default timeouts.
+     */
+    startInternalTransaction(options?: TransactionOptions_2): Promise<TransactionInfo>;
     startTransaction(options?: TransactionOptions_2): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;
     rollbackTransaction(transactionId: string): Promise<void>;
@@ -5230,6 +5243,8 @@ declare const validLogLevels: readonly ["debug", "query", "info", "warn", "error
 
 declare type Variables = object;
 
+export { version }
+
 /**
  * Logs a warning message using the active logger.
  *

package/dist/index.js

@@ -97606,10 +97606,14 @@ __export(index_exports, {
   parseLogFormat: () => parseLogFormat,
   parseLogLevel: () => parseLogLevel,
   parseSize: () => parseSize,
+  version: () => version,
   withActiveLogger: () => withActiveLogger
 });
 module.exports = __toCommonJS(index_exports);
 
+// package.json
+var version = "6.18.0-dev.21";
+
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
   return clampEntity(n2, ((e3, n3) => {
@@ -102437,6 +102441,10 @@ var CapturingSink = class {
     return this.events.map((event) => event.export());
   }
 };
+var DroppingSink = class {
+  write(_3) {
+  }
+};
 var CompositeSink = class {
   #downstream;
   constructor(...sinks) {
@@ -102464,7 +102472,8 @@ var FilteringSink = class {
 
 // src/log/factory.ts
 function createConsoleLogger(logFormat, logLevel) {
-  return new Logger(new FilteringSink(new ConsoleSink(createLogFormatter(logFormat)), thresholdLogFilter(logLevel)));
+  const sink = logLevel === "off" ? new DroppingSink() : new FilteringSink(new ConsoleSink(createLogFormatter(logFormat)), thresholdLogFilter(logLevel));
+  return new Logger(sink);
 }
 
 // ../../node_modules/.pnpm/hono@4.9.4/node_modules/hono/dist/utils/url.js
@@ -106146,12 +106155,12 @@ function mapValue(value, columnName, scalarType, enums) {
 }
 var TIME_TZ_PATTERN = /\d{2}:\d{2}:\d{2}(?:\.\d+)?(Z|[+-]\d{2}(:?\d{2})?)?$/;
 function normalizeDateTime(dt2) {
-  const matches = TIME_TZ_PATTERN.exec(dt2);
-  if (matches === null) {
-    return `${dt2}Z`;
+  const timeTzMatches = TIME_TZ_PATTERN.exec(dt2);
+  if (timeTzMatches === null) {
+    return `${dt2}T00:00:00Z`;
   }
   let dtWithTz = dt2;
-  const [timeTz, tz, tzMinuteOffset] = matches;
+  const [timeTz, tz, tzMinuteOffset] = timeTzMatches;
   if (tz !== void 0 && tz !== "Z" && tzMinuteOffset === void 0) {
     dtWithTz = `${dt2}:00`;
   } else if (tz === void 0) {
@@ -106160,6 +106169,10 @@ function normalizeDateTime(dt2) {
   if (timeTz.length === dt2.length) {
     return `1970-01-01T${dtWithTz}`;
   }
+  const timeSeparatorIndex = timeTzMatches.index - 1;
+  if (dtWithTz[timeSeparatorIndex] === " ") {
+    dtWithTz = `${dtWithTz.slice(0, timeSeparatorIndex)}T${dtWithTz.slice(timeSeparatorIndex + 1)}`;
+  }
   return dtWithTz;
 }
 function providerToOtelSystem(provider) {
@@ -107054,7 +107067,7 @@ var QueryInterpreter = class _QueryInterpreter {
           return this.interpretNode(node.args, queryable, scope, generators);
         }
         const transactionManager = this.#transactionManager.manager;
-        const transactionInfo = await transactionManager.startTransaction();
+        const transactionInfo = await transactionManager.startInternalTransaction();
         const transaction = await transactionManager.getTransaction(transactionInfo, "query");
         try {
           const value = await this.interpretNode(node.args, transaction, scope, generators);
@@ -107344,24 +107357,39 @@ var TransactionManager = class {
     this.#onQuery = onQuery;
     this.#provider = provider;
   }
+  /**
+   * Starts an internal transaction. The difference to `startTransaction` is that it does not
+   * use the default transaction options from the `TransactionManager`, which in practice means
+   * that it does not apply the default timeouts.
+   */
+  async startInternalTransaction(options) {
+    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : {};
+    return await this.tracingHelper.runInChildSpan(
+      "start_transaction",
+      () => this.#startTransactionImpl(validatedOptions)
+    );
+  }
   async startTransaction(options) {
-    return await this.tracingHelper.runInChildSpan("start_transaction", () => this.#startTransactionImpl(options));
+    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : this.transactionOptions;
+    return await this.tracingHelper.runInChildSpan(
+      "start_transaction",
+      () => this.#startTransactionImpl(validatedOptions)
+    );
   }
   async #startTransactionImpl(options) {
-    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : this.transactionOptions;
     const transaction = {
       id: await randomUUID2(),
       status: "waiting",
       timer: void 0,
-      timeout: validatedOptions.timeout,
+      timeout: options.timeout,
       startedAt: Date.now(),
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
     let hasTimedOut = false;
-    const startTimer = setTimeout(() => hasTimedOut = true, validatedOptions.maxWait);
-    startTimer.unref?.();
-    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel).catch(rethrowAsUserFacing);
+    const startTimer = createTimeoutIfDefined(() => hasTimedOut = true, options.maxWait);
+    startTimer?.unref?.();
+    transaction.transaction = await this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
     clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
@@ -107370,7 +107398,7 @@ var TransactionManager = class {
           throw new TransactionStartTimeoutError();
         }
         transaction.status = "running";
-        transaction.timer = this.#startTransactionTimeout(transaction.id, validatedOptions.timeout);
+        transaction.timer = this.#startTransactionTimeout(transaction.id, options.timeout);
         return { id: transaction.id };
       case "timed_out":
       case "running":
@@ -107440,7 +107468,7 @@ var TransactionManager = class {
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
-    const timer = setTimeout(async () => {
+    const timer = createTimeoutIfDefined(async () => {
       debug3("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
       const tx = this.transactions.get(transactionId);
       if (tx && ["running", "waiting"].includes(tx.status)) {
@@ -107449,7 +107477,7 @@ var TransactionManager = class {
         debug3("Transaction already committed or rolled back when timeout happened.", transactionId);
       }
     }, timeout);
-    timer.unref?.();
+    timer?.unref?.();
     return timer;
   }
   async #closeTransaction(tx, status) {
@@ -107519,6 +107547,9 @@ var TransactionManager = class {
     });
   }
 };
+function createTimeoutIfDefined(cb, ms) {
+  return ms !== void 0 ? setTimeout(cb, ms) : void 0;
+}
 
 // ../../node_modules/.pnpm/hono@4.9.4/node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
@@ -109091,9 +109122,6 @@ function isPromiseLike(value) {
   return value != null && typeof value["then"] === "function";
 }
 
-// package.json
-var version = "6.18.0-dev.2";
-
 // src/utils/error.ts
 function extractErrorFromUnknown(value) {
   if (value instanceof Error) {
@@ -109247,11 +109275,11 @@ var typeCast = (field, next) => {
 function formatDateTime(date5) {
   const pad2 = (n2, z2 = 2) => String(n2).padStart(z2, "0");
   const ms = date5.getUTCMilliseconds();
-  return date5.getUTCFullYear() + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate()) + " " + pad2(date5.getUTCHours()) + ":" + pad2(date5.getUTCMinutes()) + ":" + pad2(date5.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+  return pad2(date5.getUTCFullYear(), 4) + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate()) + " " + pad2(date5.getUTCHours()) + ":" + pad2(date5.getUTCMinutes()) + ":" + pad2(date5.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
 }
 function formatDate(date5) {
   const pad2 = (n2, z2 = 2) => String(n2).padStart(z2, "0");
-  return date5.getUTCFullYear() + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate());
+  return pad2(date5.getUTCFullYear(), 4) + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate());
 }
 function formatTime(date5) {
   const pad2 = (n2, z2 = 2) => String(n2).padStart(z2, "0");
@@ -109850,6 +109878,11 @@ function parseConnectionString(connectionString) {
     config3.options = config3.options || {};
     config3.options.trustServerCertificate = trustServerCertificate.toLowerCase() === "true";
   }
+  const multiSubnetFailover = firstKey(parameters, "multiSubnetFailover");
+  if (multiSubnetFailover !== null) {
+    config3.options = config3.options || {};
+    config3.options.multiSubnetFailover = multiSubnetFailover.toLowerCase() === "true";
+  }
   const connectionLimit = firstKey(parameters, "connectionLimit");
   if (connectionLimit !== null) {
     config3.pool = config3.pool || {};
@@ -109999,6 +110032,7 @@ var handledParameters = [
   "initial catalog",
   "isolationLevel",
   "loginTimeout",
+  "multiSubnetFailover",
   "password",
   "poolTimeout",
   "pwd",
@@ -110147,11 +110181,11 @@ function mapRow2(row, columns) {
 function formatDateTime2(date5) {
   const pad2 = (n2, z2 = 2) => String(n2).padStart(z2, "0");
   const ms = date5.getUTCMilliseconds();
-  return date5.getUTCFullYear() + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate()) + " " + pad2(date5.getUTCHours()) + ":" + pad2(date5.getUTCMinutes()) + ":" + pad2(date5.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+  return pad2(date5.getUTCFullYear(), 4) + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate()) + " " + pad2(date5.getUTCHours()) + ":" + pad2(date5.getUTCMinutes()) + ":" + pad2(date5.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
 }
 function formatDate2(date5) {
   const pad2 = (n2, z2 = 2) => String(n2).padStart(z2, "0");
-  return date5.getUTCFullYear() + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate());
+  return pad2(date5.getUTCFullYear(), 4) + "-" + pad2(date5.getUTCMonth() + 1) + "-" + pad2(date5.getUTCDate());
 }
 function formatTime2(date5) {
   const pad2 = (n2, z2 = 2) => String(n2).padStart(z2, "0");
@@ -110742,10 +110776,10 @@ function normalize_date(date5) {
   return date5;
 }
 function normalize_timestamp(time3) {
-  return (/* @__PURE__ */ new Date(`${time3}Z`)).toISOString().replace(/(\.000)?Z$/, "+00:00");
+  return `${time3.replace(" ", "T")}+00:00`;
 }
-function normalize_timestampz(time3) {
-  return new Date(time3.replace(/[+-]\d{2}(:\d{2})?$/, "Z")).toISOString().replace(/(\.000)?Z$/, "+00:00");
+function normalize_timestamptz(time3) {
+  return time3.replace(" ", "T").replace(/[+-]\d{2}(:\d{2})?$/, "+00:00");
 }
 function normalize_time(time3) {
   return time3;
@@ -110788,8 +110822,8 @@ var customParsers = {
   [ArrayColumnType.DATE_ARRAY]: normalize_array(normalize_date),
   [ScalarColumnType.TIMESTAMP]: normalize_timestamp,
   [ArrayColumnType.TIMESTAMP_ARRAY]: normalize_array(normalize_timestamp),
-  [ScalarColumnType.TIMESTAMPTZ]: normalize_timestampz,
-  [ArrayColumnType.TIMESTAMPTZ_ARRAY]: normalize_array(normalize_timestampz),
+  [ScalarColumnType.TIMESTAMPTZ]: normalize_timestamptz,
+  [ArrayColumnType.TIMESTAMPTZ_ARRAY]: normalize_array(normalize_timestamptz),
   [ScalarColumnType.MONEY]: normalize_money,
   [ArrayColumnType.MONEY_ARRAY]: normalize_array(normalize_money),
   [ScalarColumnType.JSON]: toJson,
@@ -123691,6 +123725,7 @@ function getErrorResponse(error44, ctx) {
   parseLogFormat,
   parseLogLevel,
   parseSize,
+  version,
   withActiveLogger
 });
 /*! Bundled license information:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "6.18.0-dev.2",
+  "version": "6.18.0-dev.21",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,17 +14,17 @@
     "@hono/node-server": "1.19.0",
     "@hono/zod-validator": "0.7.2",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/context-async-hooks": "2.0.1",
-    "@opentelemetry/sdk-trace-base": "2.0.1",
+    "@opentelemetry/context-async-hooks": "2.1.0",
+    "@opentelemetry/sdk-trace-base": "2.1.0",
     "hono": "4.9.4",
     "temporal-polyfill": "0.3.0",
     "vitest": "3.2.4",
     "zod": "4.1.3",
-    "@prisma/adapter-pg": "6.18.0-dev.2",
-    "@prisma/adapter-mariadb": "6.18.0-dev.2",
-    "@prisma/adapter-mssql": "6.18.0-dev.2",
-    "@prisma/driver-adapter-utils": "6.18.0-dev.2",
-    "@prisma/client-engine-runtime": "6.18.0-dev.2"
+    "@prisma/adapter-pg": "6.18.0-dev.21",
+    "@prisma/client-engine-runtime": "6.18.0-dev.21",
+    "@prisma/adapter-mariadb": "6.18.0-dev.21",
+    "@prisma/adapter-mssql": "6.18.0-dev.21",
+    "@prisma/driver-adapter-utils": "6.18.0-dev.21"
   },
   "files": [
     "dist"