@prisma/adapter-mariadb 7.6.0-dev.14 → 7.6.0-dev.15

package/dist/index.d.mts

@@ -19,10 +19,15 @@ declare type Capabilities = {
 };
 
 declare class MariaDbQueryable<Connection extends mariadb.Pool | mariadb.Connection> implements SqlQueryable {
-    protected client: Connection;
+    protected readonly client: Connection;
+    protected readonly mariadbOptions?: {
+        useTextProtocol?: boolean | undefined;
+    } | undefined;
     readonly provider = "mysql";
     readonly adapterName: string;
-    constructor(client: Connection);
+    constructor(client: Connection, mariadbOptions?: {
+        useTextProtocol?: boolean | undefined;
+    } | undefined);
     queryRaw(query: SqlQuery): Promise<SqlResultSet>;
     executeRaw(query: SqlQuery): Promise<number>;
     protected performIO(query: SqlQuery): Promise<ArrayModeResult>;
@@ -39,8 +44,8 @@ export declare class PrismaMariaDb implements SqlDriverAdapterFactory {
 
 declare class PrismaMariaDbAdapter extends MariaDbQueryable<mariadb.Pool> implements SqlDriverAdapter {
     private readonly capabilities;
-    private readonly options?;
-    constructor(client: mariadb.Pool, capabilities: Capabilities, options?: PrismaMariadbOptions | undefined);
+    protected readonly mariadbOptions?: PrismaMariadbOptions | undefined;
+    constructor(client: mariadb.Pool, capabilities: Capabilities, mariadbOptions?: PrismaMariadbOptions | undefined);
     executeScript(_script: string): Promise<void>;
     getConnectionInfo(): ConnectionInfo;
     startTransaction(isolationLevel?: IsolationLevel): Promise<Transaction>;
@@ -49,7 +54,11 @@ declare class PrismaMariaDbAdapter extends MariaDbQueryable<mariadb.Pool> implem
 }
 
 declare type PrismaMariadbOptions = {
+    /** The name of the database to use in generated queries */
     database?: string;
+    /** Use the driver's text protocol (`query`) instead of the binary protocol (`execute`). */
+    useTextProtocol?: boolean;
+    /** Callback attached to transaction connection `error` events. */
     onConnectionError?: (err: mariadb.SqlError) => void;
 };
 

package/dist/index.d.ts

@@ -19,10 +19,15 @@ declare type Capabilities = {
 };
 
 declare class MariaDbQueryable<Connection extends mariadb.Pool | mariadb.Connection> implements SqlQueryable {
-    protected client: Connection;
+    protected readonly client: Connection;
+    protected readonly mariadbOptions?: {
+        useTextProtocol?: boolean | undefined;
+    } | undefined;
     readonly provider = "mysql";
     readonly adapterName: string;
-    constructor(client: Connection);
+    constructor(client: Connection, mariadbOptions?: {
+        useTextProtocol?: boolean | undefined;
+    } | undefined);
     queryRaw(query: SqlQuery): Promise<SqlResultSet>;
     executeRaw(query: SqlQuery): Promise<number>;
     protected performIO(query: SqlQuery): Promise<ArrayModeResult>;
@@ -39,8 +44,8 @@ export declare class PrismaMariaDb implements SqlDriverAdapterFactory {
 
 declare class PrismaMariaDbAdapter extends MariaDbQueryable<mariadb.Pool> implements SqlDriverAdapter {
     private readonly capabilities;
-    private readonly options?;
-    constructor(client: mariadb.Pool, capabilities: Capabilities, options?: PrismaMariadbOptions | undefined);
+    protected readonly mariadbOptions?: PrismaMariadbOptions | undefined;
+    constructor(client: mariadb.Pool, capabilities: Capabilities, mariadbOptions?: PrismaMariadbOptions | undefined);
     executeScript(_script: string): Promise<void>;
     getConnectionInfo(): ConnectionInfo;
     startTransaction(isolationLevel?: IsolationLevel): Promise<Transaction>;
@@ -49,7 +54,11 @@ declare class PrismaMariaDbAdapter extends MariaDbQueryable<mariadb.Pool> implem
 }
 
 declare type PrismaMariadbOptions = {
+    /** The name of the database to use in generated queries */
     database?: string;
+    /** Use the driver's text protocol (`query`) instead of the binary protocol (`execute`). */
+    useTextProtocol?: boolean;
+    /** Callback attached to transaction connection `error` events. */
     onConnectionError?: (err: mariadb.SqlError) => void;
 };
 

package/dist/index.js

@@ -304,8 +304,9 @@ function isDriverError(error) {
 // src/mariadb.ts
 var debug = (0, import_driver_adapter_utils2.Debug)("prisma:driver-adapter:mariadb");
 var MariaDbQueryable = class {
-  constructor(client) {
+  constructor(client, mariadbOptions) {
     this.client = client;
+    this.mariadbOptions = mariadbOptions;
   }
   provider = "mysql";
   adapterName = name;
@@ -343,7 +344,8 @@ var MariaDbQueryable = class {
         typeCast
       };
       const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
-      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 (e) {
       const error = e;
       this.onError(error);
@@ -355,8 +357,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;
@@ -394,17 +396,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
     };
   }
@@ -417,14 +419,14 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
     const conn = await this.client.getConnection().catch((error) => this.onError(error));
     const onError = (err) => {
       debug(`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}`,
@@ -454,7 +456,24 @@ var PrismaMariaDbAdapterFactory = class {
   #config;
   #options;
   constructor(config, options) {
-    this.#config = rewriteConnectionString(config);
+    if (typeof config === "string") {
+      try {
+        const url = new URL(config);
+        if (!url.searchParams.has("prepareCacheLength")) {
+          url.searchParams.set("prepareCacheLength", "0");
+        }
+        this.#config = rewriteConnectionString(url).toString();
+      } catch (error) {
+        debug("Error parsing connection string: %O", error);
+        this.#config = config;
+      }
+    } else {
+      if (config.prepareCacheLength === void 0) {
+        this.#config = { ...config, prepareCacheLength: 0 };
+      } else {
+        this.#config = config;
+      }
+    }
     this.#options = options;
   }
   async connect() {
@@ -502,14 +521,11 @@ function inferCapabilities(version) {
   const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && (minor > 0 || minor === 0 && patch >= 13));
   return { supportsRelationJoins };
 }
-function rewriteConnectionString(config) {
-  if (typeof config !== "string") {
-    return config;
-  }
-  if (!config.startsWith("mysql://")) {
-    return config;
+function rewriteConnectionString(url) {
+  if (url.protocol === "mysql:") {
+    url.protocol = "mariadb:";
   }
-  return config.replace(/^mysql:\/\//, "mariadb://");
+  return url;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -268,8 +268,9 @@ function isDriverError(error) {
 // src/mariadb.ts
 var debug = Debug("prisma:driver-adapter:mariadb");
 var MariaDbQueryable = class {
-  constructor(client) {
+  constructor(client, mariadbOptions) {
     this.client = client;
+    this.mariadbOptions = mariadbOptions;
   }
   provider = "mysql";
   adapterName = name;
@@ -307,7 +308,8 @@ var MariaDbQueryable = class {
         typeCast
       };
       const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
-      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 (e) {
       const error = e;
       this.onError(error);
@@ -319,8 +321,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;
@@ -358,17 +360,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
     };
   }
@@ -381,14 +383,14 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
     const conn = await this.client.getConnection().catch((error) => this.onError(error));
     const onError = (err) => {
       debug(`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}`,
@@ -418,7 +420,24 @@ var PrismaMariaDbAdapterFactory = class {
   #config;
   #options;
   constructor(config, options) {
-    this.#config = rewriteConnectionString(config);
+    if (typeof config === "string") {
+      try {
+        const url = new URL(config);
+        if (!url.searchParams.has("prepareCacheLength")) {
+          url.searchParams.set("prepareCacheLength", "0");
+        }
+        this.#config = rewriteConnectionString(url).toString();
+      } catch (error) {
+        debug("Error parsing connection string: %O", error);
+        this.#config = config;
+      }
+    } else {
+      if (config.prepareCacheLength === void 0) {
+        this.#config = { ...config, prepareCacheLength: 0 };
+      } else {
+        this.#config = config;
+      }
+    }
     this.#options = options;
   }
   async connect() {
@@ -466,14 +485,11 @@ function inferCapabilities(version) {
   const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && (minor > 0 || minor === 0 && patch >= 13));
   return { supportsRelationJoins };
 }
-function rewriteConnectionString(config) {
-  if (typeof config !== "string") {
-    return config;
-  }
-  if (!config.startsWith("mysql://")) {
-    return config;
+function rewriteConnectionString(url) {
+  if (url.protocol === "mysql:") {
+    url.protocol = "mariadb:";
   }
-  return config.replace(/^mysql:\/\//, "mariadb://");
+  return url;
 }
 export {
   PrismaMariaDbAdapterFactory as PrismaMariaDb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-mariadb",
-  "version": "7.6.0-dev.14",
+  "version": "7.6.0-dev.15",
   "description": "Prisma's driver adapter for \"mariadb\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -32,7 +32,7 @@
   "sideEffects": false,
   "dependencies": {
     "mariadb": "3.4.5",
-    "@prisma/driver-adapter-utils": "7.6.0-dev.14"
+    "@prisma/driver-adapter-utils": "7.6.0-dev.15"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",