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

package/dist/index.d.mts

@@ -51,6 +51,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

@@ -51,6 +51,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;
@@ -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) {

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;
@@ -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) {

package/package.json

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