@prisma/query-plan-executor 7.6.0-integration-feat-prisma-bootstrap.1 → 7.6.0-integration-feat-prisma-bootstrap.2

package/dist/index.js

@@ -22514,14 +22514,14 @@ var require_node = __commonJS({
   "../../node_modules/.pnpm/debug@4.4.1/node_modules/debug/src/node.js"(exports2, module2) {
     "use strict";
     var tty2 = require("tty");
-    var util2 = require("util");
+    var util3 = require("util");
     exports2.init = init3;
     exports2.log = log4;
     exports2.formatArgs = formatArgs;
     exports2.save = save;
     exports2.load = load;
     exports2.useColors = useColors;
-    exports2.destroy = util2.deprecate(
+    exports2.destroy = util3.deprecate(
       () => {
       },
       "Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`."
@@ -22652,7 +22652,7 @@ var require_node = __commonJS({
       return (/* @__PURE__ */ new Date()).toISOString() + " ";
     }
     function log4(...args) {
-      return process.stderr.write(util2.formatWithOptions(exports2.inspectOpts, ...args) + "\n");
+      return process.stderr.write(util3.formatWithOptions(exports2.inspectOpts, ...args) + "\n");
     }
     function save(namespaces) {
       if (namespaces) {
@@ -22675,11 +22675,11 @@ var require_node = __commonJS({
     var { formatters } = module2.exports;
     formatters.o = function(v2) {
       this.inspectOpts.colors = this.useColors;
-      return util2.inspect(v2, this.inspectOpts).split("\n").map((str) => str.trim()).join(" ");
+      return util3.inspect(v2, this.inspectOpts).split("\n").map((str) => str.trim()).join(" ");
     };
     formatters.O = function(v2) {
       this.inspectOpts.colors = this.useColors;
-      return util2.inspect(v2, this.inspectOpts);
+      return util3.inspect(v2, this.inspectOpts);
     };
   }
 });
@@ -29060,7 +29060,7 @@ var require_delayed_stream = __commonJS({
   "../../node_modules/.pnpm/delayed-stream@1.0.0/node_modules/delayed-stream/lib/delayed_stream.js"(exports2, module2) {
     "use strict";
     var Stream = require("stream").Stream;
-    var util2 = require("util");
+    var util3 = require("util");
     module2.exports = DelayedStream;
     function DelayedStream() {
       this.source = null;
@@ -29071,7 +29071,7 @@ var require_delayed_stream = __commonJS({
       this._released = false;
       this._bufferedEvents = [];
     }
-    util2.inherits(DelayedStream, Stream);
+    util3.inherits(DelayedStream, Stream);
     DelayedStream.create = function(source, options) {
       var delayedStream = new this();
       options = options || {};
@@ -29151,7 +29151,7 @@ var require_delayed_stream = __commonJS({
 var require_combined_stream = __commonJS({
   "../../node_modules/.pnpm/combined-stream@1.0.8/node_modules/combined-stream/lib/combined_stream.js"(exports2, module2) {
     "use strict";
-    var util2 = require("util");
+    var util3 = require("util");
     var Stream = require("stream").Stream;
     var DelayedStream = require_delayed_stream();
     module2.exports = CombinedStream;
@@ -29167,7 +29167,7 @@ var require_combined_stream = __commonJS({
       this._insideLoop = false;
       this._pendingNext = false;
     }
-    util2.inherits(CombinedStream, Stream);
+    util3.inherits(CombinedStream, Stream);
     CombinedStream.create = function(options) {
       var combinedStream = new this();
       options = options || {};
@@ -39023,7 +39023,7 @@ var require_form_data = __commonJS({
   "../../node_modules/.pnpm/form-data@4.0.5/node_modules/form-data/lib/form_data.js"(exports2, module2) {
     "use strict";
     var CombinedStream = require_combined_stream();
-    var util2 = require("util");
+    var util3 = require("util");
     var path3 = require("path");
     var http4 = require("http");
     var https4 = require("https");
@@ -39049,7 +39049,7 @@ var require_form_data = __commonJS({
         this[option] = options[option];
       }
     }
-    util2.inherits(FormData2, CombinedStream);
+    util3.inherits(FormData2, CombinedStream);
     FormData2.LINE_BREAK = "\r\n";
     FormData2.DEFAULT_CONTENT_TYPE = "application/octet-stream";
     FormData2.prototype.append = function(field, value, options) {
@@ -51872,7 +51872,7 @@ var require_data_stream = __commonJS({
     "use strict";
     var Buffer2 = require_safe_buffer().Buffer;
     var Stream = require("stream");
-    var util2 = require("util");
+    var util3 = require("util");
     function DataStream(data) {
       this.buffer = null;
       this.writable = true;
@@ -51898,7 +51898,7 @@ var require_data_stream = __commonJS({
       }
       throw new TypeError("Unexpected data type (" + typeof data + ")");
     }
-    util2.inherits(DataStream, Stream);
+    util3.inherits(DataStream, Stream);
     DataStream.prototype.write = function write(data) {
       this.buffer = Buffer2.concat([this.buffer, Buffer2.from(data)]);
       this.emit("data", data);
@@ -52120,7 +52120,7 @@ var require_jwa = __commonJS({
     var Buffer2 = require_safe_buffer().Buffer;
     var crypto7 = require("crypto");
     var formatEcdsa = require_ecdsa_sig_formatter();
-    var util2 = require("util");
+    var util3 = require("util");
     var MSG_INVALID_ALGORITHM = '"%s" is not a valid algorithm.\n  Supported algorithms are:\n  "HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "PS256", "PS384", "PS512", "ES256", "ES384", "ES512" and "none".';
     var MSG_INVALID_SECRET = "secret must be a string or buffer";
     var MSG_INVALID_VERIFIER_KEY = "key must be a string or a buffer";
@@ -52200,7 +52200,7 @@ var require_jwa = __commonJS({
     }
     function typeError(template) {
       var args = [].slice.call(arguments, 1);
-      var errMsg = util2.format.bind(util2, template).apply(null, args);
+      var errMsg = util3.format.bind(util3, template).apply(null, args);
       return new TypeError(errMsg);
     }
     function bufferOrString(obj) {
@@ -52362,7 +52362,7 @@ var require_sign_stream = __commonJS({
     var jwa = require_jwa();
     var Stream = require("stream");
     var toString2 = require_tostring();
-    var util2 = require("util");
+    var util3 = require("util");
     function base64url3(string4, encoding) {
       return Buffer2.from(string4, encoding).toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
     }
@@ -52370,7 +52370,7 @@ var require_sign_stream = __commonJS({
       encoding = encoding || "utf8";
       var encodedHeader = base64url3(toString2(header), "binary");
       var encodedPayload = base64url3(toString2(payload), encoding);
-      return util2.format("%s.%s", encodedHeader, encodedPayload);
+      return util3.format("%s.%s", encodedHeader, encodedPayload);
     }
     function jwsSign(opts) {
       var header = opts.header;
@@ -52380,7 +52380,7 @@ var require_sign_stream = __commonJS({
       var algo = jwa(header.alg);
       var securedInput = jwsSecuredInput(header, payload, encoding);
       var signature = algo.sign(securedInput, secretOrKey);
-      return util2.format("%s.%s", securedInput, signature);
+      return util3.format("%s.%s", securedInput, signature);
     }
     function SignStream(opts) {
       var secret2 = opts.secret;
@@ -52404,7 +52404,7 @@ var require_sign_stream = __commonJS({
           this.sign();
       }.bind(this));
     }
-    util2.inherits(SignStream, Stream);
+    util3.inherits(SignStream, Stream);
     SignStream.prototype.sign = function sign2() {
       try {
         var signature = jwsSign({
@@ -52438,7 +52438,7 @@ var require_verify_stream = __commonJS({
     var jwa = require_jwa();
     var Stream = require("stream");
     var toString2 = require_tostring();
-    var util2 = require("util");
+    var util3 = require("util");
     var JWS_REGEX = /^[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?$/;
     function isObject3(thing) {
       return Object.prototype.toString.call(thing) === "[object Object]";
@@ -52522,7 +52522,7 @@ var require_verify_stream = __commonJS({
           this.verify();
       }.bind(this));
     }
-    util2.inherits(VerifyStream, Stream);
+    util3.inherits(VerifyStream, Stream);
     VerifyStream.prototype.verify = function verify() {
       try {
         var valid = jwsVerify(this.signature.buffer, this.algorithm, this.key.buffer);
@@ -62208,7 +62208,7 @@ var require_debug2 = __commonJS({
     });
     exports2.default = void 0;
     var _events = require("events");
-    var util2 = _interopRequireWildcard(require("util"));
+    var util3 = _interopRequireWildcard(require("util"));
     function _interopRequireWildcard(e2, t2) {
       if ("function" == typeof WeakMap) var r2 = /* @__PURE__ */ new WeakMap(), n2 = /* @__PURE__ */ new WeakMap();
       return (_interopRequireWildcard = function(e3, t3) {
@@ -62263,7 +62263,7 @@ var require_debug2 = __commonJS({
       }
       token(token) {
         if (this.haveListeners() && this.options.token) {
-          this.log(util2.inspect(token, {
+          this.log(util3.inspect(token, {
             showHidden: false,
             depth: 5,
             colors: true
@@ -70586,13 +70586,13 @@ var require_inherits = __commonJS({
   "../../node_modules/.pnpm/inherits@2.0.4/node_modules/inherits/inherits.js"(exports2, module2) {
     "use strict";
     try {
-      util2 = require("util");
-      if (typeof util2.inherits !== "function") throw "";
-      module2.exports = util2.inherits;
+      util3 = require("util");
+      if (typeof util3.inherits !== "function") throw "";
+      module2.exports = util3.inherits;
     } catch (e2) {
       module2.exports = require_inherits_browser();
     }
-    var util2;
+    var util3;
   }
 });
 
@@ -97297,8 +97297,8 @@ var require_utils6 = __commonJS({
   "../../node_modules/.pnpm/pg@8.16.3/node_modules/pg/lib/utils.js"(exports2, module2) {
     "use strict";
     var defaults2 = require_defaults();
-    var util2 = require("util");
-    var { isDate } = util2.types || util2;
+    var util3 = require("util");
+    var { isDate } = util3.types || util3;
     function escapeElement(elementRepresentation) {
       const escaped = elementRepresentation.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
       return '"' + escaped + '"';
@@ -99671,7 +99671,7 @@ var require_helper = __commonJS({
     var path3 = require("path");
     var Stream = require("stream").Stream;
     var split = require_split2();
-    var util2 = require("util");
+    var util3 = require("util");
     var defaultPort = 5432;
     var isWin = process.platform === "win32";
     var warnStream = process.stderr;
@@ -99689,7 +99689,7 @@ var require_helper = __commonJS({
       var isWritable = warnStream instanceof Stream && true === warnStream.writable;
       if (isWritable) {
         var args = Array.prototype.slice.call(arguments).concat("\n");
-        warnStream.write(util2.format.apply(util2, args));
+        warnStream.write(util3.format.apply(util3, args));
       }
     }
     Object.defineProperty(module2.exports, "isWin", {
@@ -100779,7 +100779,7 @@ var require_query3 = __commonJS({
   "../../node_modules/.pnpm/pg@8.16.3/node_modules/pg/lib/native/query.js"(exports2, module2) {
     "use strict";
     var EventEmitter = require("events").EventEmitter;
-    var util2 = require("util");
+    var util3 = require("util");
     var utils = require_utils6();
     var NativeQuery = module2.exports = function(config3, values, callback) {
       EventEmitter.call(this);
@@ -100799,7 +100799,7 @@ var require_query3 = __commonJS({
         }.bind(this)
       );
     };
-    util2.inherits(NativeQuery, EventEmitter);
+    util3.inherits(NativeQuery, EventEmitter);
     var errorFieldMap = {
       sqlState: "code",
       statementPosition: "position",
@@ -100927,7 +100927,7 @@ var require_client2 = __commonJS({
     }
     var TypeOverrides2 = require_type_overrides();
     var EventEmitter = require("events").EventEmitter;
-    var util2 = require("util");
+    var util3 = require("util");
     var ConnectionParameters = require_connection_parameters();
     var NativeQuery = require_query3();
     var Client2 = module2.exports = function(config3) {
@@ -100958,7 +100958,7 @@ var require_client2 = __commonJS({
       this.namedQueries = {};
     };
     Client2.Query = NativeQuery;
-    util2.inherits(Client2, EventEmitter);
+    util3.inherits(Client2, EventEmitter);
     Client2.prototype._errorAllQueries = function(err) {
       const enqueueError = (query2) => {
         process.nextTick(() => {
@@ -101337,7 +101337,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.6.0-integration-feat-prisma-bootstrap.1";
+var version = "7.6.0-integration-feat-prisma-bootstrap.2";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -106201,6 +106201,9 @@ function createConsoleLogger(logFormat, logLevel) {
   return new Logger(sink);
 }
 
+// src/server/server.ts
+var import_node_util = __toESM(require("node:util"));
+
 // ../../node_modules/.pnpm/hono@4.12.7/node_modules/hono/dist/utils/url.js
 var splitPath = (path3) => {
   const paths = path3.split("/");
@@ -114293,8 +114296,9 @@ function isDriverError(error44) {
 }
 var debug4 = Debug("prisma:driver-adapter:mariadb");
 var MariaDbQueryable = class {
-  constructor(client) {
+  constructor(client, mariadbOptions) {
     this.client = client;
+    this.mariadbOptions = mariadbOptions;
   }
   provider = "mysql";
   adapterName = name;
@@ -114332,7 +114336,8 @@ var MariaDbQueryable = class {
         typeCast
       };
       const values = args.map((arg, i2) => mapArg(arg, query2.argTypes[i2]));
-      return await this.client.execute(req, values);
+      const execute = this.mariadbOptions?.useTextProtocol ? this.client.query.bind(this.client) : this.client.execute.bind(this.client);
+      return await execute(req, values);
     } catch (e2) {
       const error44 = e2;
       this.onError(error44);
@@ -114344,8 +114349,8 @@ var MariaDbQueryable = class {
   }
 };
 var MariaDbTransaction = class extends MariaDbQueryable {
-  constructor(conn, options, cleanup) {
-    super(conn);
+  constructor(conn, mariadbOptions, options, cleanup) {
+    super(conn, mariadbOptions);
     this.conn = conn;
     this.options = options;
     this.cleanup = cleanup;
@@ -114383,17 +114388,17 @@ var MariaDbTransaction = class extends MariaDbQueryable {
   }
 };
 var PrismaMariaDbAdapter = class extends MariaDbQueryable {
-  constructor(client, capabilities, options) {
-    super(client);
+  constructor(client, capabilities, mariadbOptions) {
+    super(client, mariadbOptions);
     this.capabilities = capabilities;
-    this.options = options;
+    this.mariadbOptions = mariadbOptions;
   }
   executeScript(_script) {
     throw new Error("Not implemented yet");
   }
   getConnectionInfo() {
     return {
-      schemaName: this.options?.database,
+      schemaName: this.mariadbOptions?.database,
       supportsRelationJoins: this.capabilities.supportsRelationJoins
     };
   }
@@ -114406,14 +114411,14 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
     const conn = await this.client.getConnection().catch((error44) => this.onError(error44));
     const onError = (err) => {
       debug4(`Error from connection: ${err.message} %O`, err);
-      this.options?.onConnectionError?.(err);
+      this.mariadbOptions?.onConnectionError?.(err);
     };
     conn.on("error", onError);
     const cleanup = () => {
       conn.removeListener("error", onError);
     };
     try {
-      const tx = new MariaDbTransaction(conn, options, cleanup);
+      const tx = new MariaDbTransaction(conn, this.mariadbOptions, options, cleanup);
       if (isolationLevel) {
         await tx.executeRaw({
           sql: `SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`,
@@ -114443,7 +114448,24 @@ var PrismaMariaDbAdapterFactory = class {
   #config;
   #options;
   constructor(config3, options) {
-    this.#config = rewriteConnectionString(config3);
+    if (typeof config3 === "string") {
+      try {
+        const url2 = new URL(config3);
+        if (!url2.searchParams.has("prepareCacheLength")) {
+          url2.searchParams.set("prepareCacheLength", "0");
+        }
+        this.#config = rewriteConnectionString(url2).toString();
+      } catch (error44) {
+        debug4("Error parsing connection string: %O", error44);
+        this.#config = config3;
+      }
+    } else {
+      if (config3.prepareCacheLength === void 0) {
+        this.#config = { ...config3, prepareCacheLength: 0 };
+      } else {
+        this.#config = config3;
+      }
+    }
     this.#options = options;
   }
   async connect() {
@@ -114491,14 +114513,11 @@ function inferCapabilities(version5) {
   const supportsRelationJoins = !isMariaDB && (major2 > 8 || major2 === 8 && (minor > 0 || minor === 0 && patch >= 13));
   return { supportsRelationJoins };
 }
-function rewriteConnectionString(config3) {
-  if (typeof config3 !== "string") {
-    return config3;
-  }
-  if (!config3.startsWith("mysql://")) {
-    return config3;
+function rewriteConnectionString(url2) {
+  if (url2.protocol === "mysql:") {
+    url2.protocol = "mariadb:";
   }
-  return config3.replace(/^mysql:\/\//, "mariadb://");
+  return url2;
 }
 
 // ../../node_modules/.pnpm/async-mutex@0.5.0/node_modules/async-mutex/index.mjs
@@ -116106,22 +116125,11 @@ var PgQueryable = class {
     try {
       const result = await this.client.query(
         {
+          name: this.pgOptions?.statementNameGenerator?.(query2),
           text: sql4,
           values,
           rowMode: "array",
           types: {
-            // This is the error expected:
-            // No overload matches this call.
-            // The last overload gave the following error.
-            // Type '(oid: number, format?: any) => (json: string) => unknown' is not assignable to type '{ <T>(oid: number): TypeParser<string, string | T>; <T>(oid: number, format: "text"): TypeParser<string, string | T>; <T>(oid: number, format: "binary"): TypeParser<...>; }'.
-            //   Type '(json: string) => unknown' is not assignable to type 'TypeParser<Buffer, any>'.
-            //     Types of parameters 'json' and 'value' are incompatible.
-            //       Type 'Buffer' is not assignable to type 'string'.ts(2769)
-            //
-            // Because pg-types types expect us to handle both binary and text protocol versions,
-            // where as far we can see, pg will ever pass only text version.
-            //
-            // @ts-expect-error
             getTypeParser: (oid, format) => {
               if (format === "text" && customParsers[oid]) {
                 return customParsers[oid];
@@ -128728,7 +128736,7 @@ function createHonoServer(app, options) {
   const server = new Hono2();
   return server.onError((error44, c2) => {
     error("Error processing request", {
-      error: error44,
+      error: import_node_util.default.inspect(error44),
       method: c2.req.method,
       pathname: c2.req.path,
       requestId: c2.get("requestId")

package/package.json

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