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

package/dist/index.d.mts

@@ -26,6 +26,7 @@ declare class MariaDbQueryable<Connection extends mariadb.Pool | mariadb.Connect
     queryRaw(query: SqlQuery): Promise<SqlResultSet>;
     executeRaw(query: SqlQuery): Promise<number>;
     protected performIO(query: SqlQuery): Promise<ArrayModeResult>;
+    protected onError(error: unknown): never;
 }
 
 export declare class PrismaMariaDb implements SqlDriverAdapterFactory {

package/dist/index.d.ts

@@ -26,6 +26,7 @@ declare class MariaDbQueryable<Connection extends mariadb.Pool | mariadb.Connect
     queryRaw(query: SqlQuery): Promise<SqlResultSet>;
     executeRaw(query: SqlQuery): Promise<number>;
     protected performIO(query: SqlQuery): Promise<ArrayModeResult>;
+    protected onError(error: unknown): never;
 }
 
 export declare class PrismaMariaDb implements SqlDriverAdapterFactory {

package/dist/index.js

@@ -84,7 +84,10 @@ function mapColumnType(field) {
     case "BLOB" /* BLOB */:
     case "TINY_BLOB" /* TINY_BLOB */:
     case "MEDIUM_BLOB" /* MEDIUM_BLOB */:
-      if (field.flags.valueOf() & BINARY_FLAG) {
+    case "LONG_BLOB" /* LONG_BLOB */:
+      if (field["dataTypeFormat"] === "json") {
+        return import_driver_adapter_utils.ColumnTypeEnum.Json;
+      } else if (field.flags.valueOf() & BINARY_FLAG) {
         return import_driver_adapter_utils.ColumnTypeEnum.Bytes;
       } else {
         return import_driver_adapter_utils.ColumnTypeEnum.Text;
@@ -333,6 +336,8 @@ var MariaDbQueryable = class {
         sql,
         rowsAsArray: true,
         dateStrings: true,
+        // Disable automatic conversion of JSON blobs to objects.
+        autoJsonMap: false,
         // Return JSON strings as strings, not objects.
         // Available in the driver, but not provided in the typings.
         jsonStrings: true,
@@ -345,25 +350,28 @@ var MariaDbQueryable = class {
       return await this.client.query(req, values);
     } catch (e) {
       const error = e;
-      onError(error);
+      this.onError(error);
     }
   }
+  onError(error) {
+    debug("Error in performIO: %O", error);
+    throw new import_driver_adapter_utils2.DriverAdapterError(convertDriverError(error));
+  }
 };
-function onError(error) {
-  debug("Error in performIO: %O", error);
-  throw new import_driver_adapter_utils2.DriverAdapterError(convertDriverError(error));
-}
 var MariaDbTransaction = class extends MariaDbQueryable {
-  constructor(conn, options) {
+  constructor(conn, options, cleanup) {
     super(conn);
     this.options = options;
+    this.cleanup = cleanup;
   }
   async commit() {
     debug(`[js::commit]`);
+    this.cleanup?.();
     await this.client.end();
   }
   async rollback() {
     debug(`[js::rollback]`);
+    this.cleanup?.();
     await this.client.end();
   }
 };
@@ -388,13 +396,17 @@ 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) => {
+    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);
-    });
+    };
+    conn.on("error", onError);
+    const cleanup = () => {
+      conn.removeListener("error", onError);
+    };
     try {
-      const tx = new MariaDbTransaction(conn, options);
+      const tx = new MariaDbTransaction(conn, options, cleanup);
       if (isolationLevel) {
         await tx.executeRaw({
           sql: `SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`,
@@ -406,7 +418,8 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
       return tx;
     } catch (error) {
       await conn.end();
-      onError(error);
+      cleanup();
+      this.onError(error);
     }
   }
   async dispose() {

package/dist/index.mjs

@@ -48,7 +48,10 @@ function mapColumnType(field) {
     case "BLOB" /* BLOB */:
     case "TINY_BLOB" /* TINY_BLOB */:
     case "MEDIUM_BLOB" /* MEDIUM_BLOB */:
-      if (field.flags.valueOf() & BINARY_FLAG) {
+    case "LONG_BLOB" /* LONG_BLOB */:
+      if (field["dataTypeFormat"] === "json") {
+        return ColumnTypeEnum.Json;
+      } else if (field.flags.valueOf() & BINARY_FLAG) {
         return ColumnTypeEnum.Bytes;
       } else {
         return ColumnTypeEnum.Text;
@@ -297,6 +300,8 @@ var MariaDbQueryable = class {
         sql,
         rowsAsArray: true,
         dateStrings: true,
+        // Disable automatic conversion of JSON blobs to objects.
+        autoJsonMap: false,
         // Return JSON strings as strings, not objects.
         // Available in the driver, but not provided in the typings.
         jsonStrings: true,
@@ -309,25 +314,28 @@ var MariaDbQueryable = class {
       return await this.client.query(req, values);
     } catch (e) {
       const error = e;
-      onError(error);
+      this.onError(error);
     }
   }
+  onError(error) {
+    debug("Error in performIO: %O", error);
+    throw new DriverAdapterError(convertDriverError(error));
+  }
 };
-function onError(error) {
-  debug("Error in performIO: %O", error);
-  throw new DriverAdapterError(convertDriverError(error));
-}
 var MariaDbTransaction = class extends MariaDbQueryable {
-  constructor(conn, options) {
+  constructor(conn, options, cleanup) {
     super(conn);
     this.options = options;
+    this.cleanup = cleanup;
   }
   async commit() {
     debug(`[js::commit]`);
+    this.cleanup?.();
     await this.client.end();
   }
   async rollback() {
     debug(`[js::rollback]`);
+    this.cleanup?.();
     await this.client.end();
   }
 };
@@ -352,13 +360,17 @@ 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) => {
+    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);
-    });
+    };
+    conn.on("error", onError);
+    const cleanup = () => {
+      conn.removeListener("error", onError);
+    };
     try {
-      const tx = new MariaDbTransaction(conn, options);
+      const tx = new MariaDbTransaction(conn, options, cleanup);
       if (isolationLevel) {
         await tx.executeRaw({
           sql: `SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`,
@@ -370,7 +382,8 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
       return tx;
     } catch (error) {
       await conn.end();
-      onError(error);
+      cleanup();
+      this.onError(error);
     }
   }
   async dispose() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-mariadb",
-  "version": "6.17.0-dev.3",
+  "version": "6.17.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.5",
-    "@prisma/driver-adapter-utils": "6.17.0-dev.3"
+    "@prisma/driver-adapter-utils": "6.17.0-dev.30"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",