@prisma/adapter-mariadb 6.15.0-dev.3 → 6.15.0-dev.30

package/dist/index.d.mts

@@ -30,11 +30,9 @@ declare class MariaDbQueryable<Connection extends mariadb.Pool | mariadb.Connect
 
 export declare class PrismaMariaDb implements SqlDriverAdapterFactory {
     #private;
-    private readonly config;
-    private readonly options?;
     readonly provider = "mysql";
     readonly adapterName: string;
-    constructor(config: mariadb.PoolConfig | string, options?: PrismaMariadbOptions | undefined);
+    constructor(config: mariadb.PoolConfig | string, options?: PrismaMariadbOptions);
     connect(): Promise<PrismaMariaDbAdapter>;
 }
 
@@ -51,6 +49,7 @@ declare class PrismaMariaDbAdapter extends MariaDbQueryable<mariadb.Pool> implem
 
 declare type PrismaMariadbOptions = {
     database?: string;
+    onConnectionError?: (err: mariadb.SqlError) => void;
 };
 
 export { }

package/dist/index.d.ts

@@ -30,11 +30,9 @@ declare class MariaDbQueryable<Connection extends mariadb.Pool | mariadb.Connect
 
 export declare class PrismaMariaDb implements SqlDriverAdapterFactory {
     #private;
-    private readonly config;
-    private readonly options?;
     readonly provider = "mysql";
     readonly adapterName: string;
-    constructor(config: mariadb.PoolConfig | string, options?: PrismaMariadbOptions | undefined);
+    constructor(config: mariadb.PoolConfig | string, options?: PrismaMariadbOptions);
     connect(): Promise<PrismaMariaDbAdapter>;
 }
 
@@ -51,6 +49,7 @@ declare class PrismaMariaDbAdapter extends MariaDbQueryable<mariadb.Pool> implem
 
 declare type PrismaMariadbOptions = {
     database?: string;
+    onConnectionError?: (err: mariadb.SqlError) => void;
 };
 
 export { }

package/dist/index.js

@@ -102,8 +102,35 @@ function mapColumnType(field) {
       throw new Error(`Unsupported column type: ${field.type}`);
   }
 }
-function mapArg(arg) {
-  if (arg instanceof Uint8Array) {
+function mapArg(arg, argType) {
+  if (arg === null) {
+    return null;
+  }
+  if (typeof arg === "string" && argType.scalarType === "bigint") {
+    return BigInt(arg);
+  }
+  if (typeof arg === "string" && argType.scalarType === "datetime") {
+    arg = new Date(arg);
+  }
+  if (arg instanceof Date) {
+    switch (argType.dbType) {
+      case "TIME" /* TIME */:
+      case "TIME2" /* TIME2 */:
+        return formatTime(arg);
+      case "DATE" /* DATE */:
+      case "NEWDATE" /* NEWDATE */:
+        return formatDate(arg);
+      default:
+        return formatDateTime(arg);
+    }
+  }
+  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 arg;
@@ -119,7 +146,7 @@ function mapRow(row, fields) {
       case "TIMESTAMP2" /* TIMESTAMP2 */:
       case "DATETIME" /* DATETIME */:
       case "DATETIME2" /* DATETIME2 */:
-        return (/* @__PURE__ */ new Date(`${value}Z`)).toISOString();
+        return (/* @__PURE__ */ new Date(`${value}Z`)).toISOString().replace(/(\.000)?Z$/, "+00:00");
     }
     if (Buffer.isBuffer(value)) {
       return Array.from(value);
@@ -136,6 +163,20 @@ var typeCast = (field, next) => {
   }
   return next();
 };
+function formatDateTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate()) + " " + pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+}
+function formatDate(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate());
+}
+function formatTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+}
 
 // src/errors.ts
 function convertDriverError(error) {
@@ -286,9 +327,9 @@ var MariaDbQueryable = class {
     return (await this.performIO(query)).affectedRows ?? 0;
   }
   async performIO(query) {
-    const { sql, args: values } = query;
+    const { sql, args } = query;
     try {
-      const query2 = {
+      const req = {
         sql,
         rowsAsArray: true,
         dateStrings: true,
@@ -300,7 +341,8 @@ var MariaDbQueryable = class {
         bitOneIsBoolean: false,
         typeCast
       };
-      return await this.client.query(query2, values.map(mapArg));
+      const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
+      return await this.client.query(req, values);
     } catch (e) {
       const error = e;
       onError(error);
@@ -347,6 +389,10 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
     const conn = await this.client.getConnection().catch((error) => onError(error));
+    conn.on("error", (err) => {
+      debug(`Error from connection: ${err.message} %O`, err);
+      this.options?.onConnectionError?.(err);
+    });
     try {
       const tx = new MariaDbTransaction(conn, options);
       if (isolationLevel) {
@@ -371,19 +417,21 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
   }
 };
 var PrismaMariaDbAdapterFactory = class {
-  constructor(config, options) {
-    this.config = config;
-    this.options = options;
-  }
   provider = "mysql";
   adapterName = name;
   #capabilities;
+  #config;
+  #options;
+  constructor(config, options) {
+    this.#config = rewriteConnectionString(config);
+    this.#options = options;
+  }
   async connect() {
-    const pool = mariadb.createPool(this.config);
+    const pool = mariadb.createPool(this.#config);
     if (this.#capabilities === void 0) {
       this.#capabilities = await getCapabilities(pool);
     }
-    return new PrismaMariaDbAdapter(pool, this.#capabilities, this.options);
+    return new PrismaMariaDbAdapter(pool, this.#capabilities, this.#options);
   }
 };
 async function getCapabilities(pool) {
@@ -413,6 +461,15 @@ function inferCapabilities(version) {
   const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && minor >= 0 && patch >= 13);
   return { supportsRelationJoins };
 }
+function rewriteConnectionString(config) {
+  if (typeof config !== "string") {
+    return config;
+  }
+  if (!config.startsWith("mysql://")) {
+    return config;
+  }
+  return config.replace(/^mysql:\/\//, "mariadb://");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PrismaMariaDb

package/dist/index.mjs

@@ -66,8 +66,35 @@ function mapColumnType(field) {
       throw new Error(`Unsupported column type: ${field.type}`);
   }
 }
-function mapArg(arg) {
-  if (arg instanceof Uint8Array) {
+function mapArg(arg, argType) {
+  if (arg === null) {
+    return null;
+  }
+  if (typeof arg === "string" && argType.scalarType === "bigint") {
+    return BigInt(arg);
+  }
+  if (typeof arg === "string" && argType.scalarType === "datetime") {
+    arg = new Date(arg);
+  }
+  if (arg instanceof Date) {
+    switch (argType.dbType) {
+      case "TIME" /* TIME */:
+      case "TIME2" /* TIME2 */:
+        return formatTime(arg);
+      case "DATE" /* DATE */:
+      case "NEWDATE" /* NEWDATE */:
+        return formatDate(arg);
+      default:
+        return formatDateTime(arg);
+    }
+  }
+  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 arg;
@@ -83,7 +110,7 @@ function mapRow(row, fields) {
       case "TIMESTAMP2" /* TIMESTAMP2 */:
       case "DATETIME" /* DATETIME */:
       case "DATETIME2" /* DATETIME2 */:
-        return (/* @__PURE__ */ new Date(`${value}Z`)).toISOString();
+        return (/* @__PURE__ */ new Date(`${value}Z`)).toISOString().replace(/(\.000)?Z$/, "+00:00");
     }
     if (Buffer.isBuffer(value)) {
       return Array.from(value);
@@ -100,6 +127,20 @@ var typeCast = (field, next) => {
   }
   return next();
 };
+function formatDateTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate()) + " " + pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+}
+function formatDate(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate());
+}
+function formatTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+}
 
 // src/errors.ts
 function convertDriverError(error) {
@@ -250,9 +291,9 @@ var MariaDbQueryable = class {
     return (await this.performIO(query)).affectedRows ?? 0;
   }
   async performIO(query) {
-    const { sql, args: values } = query;
+    const { sql, args } = query;
     try {
-      const query2 = {
+      const req = {
         sql,
         rowsAsArray: true,
         dateStrings: true,
@@ -264,7 +305,8 @@ var MariaDbQueryable = class {
         bitOneIsBoolean: false,
         typeCast
       };
-      return await this.client.query(query2, values.map(mapArg));
+      const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
+      return await this.client.query(req, values);
     } catch (e) {
       const error = e;
       onError(error);
@@ -311,6 +353,10 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
     const conn = await this.client.getConnection().catch((error) => onError(error));
+    conn.on("error", (err) => {
+      debug(`Error from connection: ${err.message} %O`, err);
+      this.options?.onConnectionError?.(err);
+    });
     try {
       const tx = new MariaDbTransaction(conn, options);
       if (isolationLevel) {
@@ -335,19 +381,21 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
   }
 };
 var PrismaMariaDbAdapterFactory = class {
-  constructor(config, options) {
-    this.config = config;
-    this.options = options;
-  }
   provider = "mysql";
   adapterName = name;
   #capabilities;
+  #config;
+  #options;
+  constructor(config, options) {
+    this.#config = rewriteConnectionString(config);
+    this.#options = options;
+  }
   async connect() {
-    const pool = mariadb.createPool(this.config);
+    const pool = mariadb.createPool(this.#config);
     if (this.#capabilities === void 0) {
       this.#capabilities = await getCapabilities(pool);
     }
-    return new PrismaMariaDbAdapter(pool, this.#capabilities, this.options);
+    return new PrismaMariaDbAdapter(pool, this.#capabilities, this.#options);
   }
 };
 async function getCapabilities(pool) {
@@ -377,6 +425,15 @@ function inferCapabilities(version) {
   const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && minor >= 0 && patch >= 13);
   return { supportsRelationJoins };
 }
+function rewriteConnectionString(config) {
+  if (typeof config !== "string") {
+    return config;
+  }
+  if (!config.startsWith("mysql://")) {
+    return config;
+  }
+  return config.replace(/^mysql:\/\//, "mariadb://");
+}
 export {
   PrismaMariaDbAdapterFactory as PrismaMariaDb
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-mariadb",
-  "version": "6.15.0-dev.3",
+  "version": "6.15.0-dev.30",
   "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.2",
-    "@prisma/driver-adapter-utils": "6.15.0-dev.3"
+    "@prisma/driver-adapter-utils": "6.15.0-dev.30"
   },
   "devDependencies": {
     "vitest": "3.0.9"