@prisma/adapter-mariadb 7.5.0-dev.9 → 7.6.0-dev.1

package/dist/index.js

@@ -44,7 +44,7 @@ var name = "@prisma/adapter-mariadb";
 // src/conversion.ts
 var import_driver_adapter_utils = require("@prisma/driver-adapter-utils");
 var UNSIGNED_FLAG = 1 << 5;
-var BINARY_FLAG = 1 << 7;
+var BINARY_COLLATION_INDEX = 63;
 function mapColumnType(field) {
   switch (field.type) {
     case "TINY" /* TINY */:
@@ -87,7 +87,7 @@ function mapColumnType(field) {
     case "LONG_BLOB" /* LONG_BLOB */:
       if (field["dataTypeFormat"] === "json") {
         return import_driver_adapter_utils.ColumnTypeEnum.Json;
-      } else if (field.flags.valueOf() & BINARY_FLAG) {
+      } else if (field.collation.index === BINARY_COLLATION_INDEX) {
         return import_driver_adapter_utils.ColumnTypeEnum.Bytes;
       } else {
         return import_driver_adapter_utils.ColumnTypeEnum.Text;
@@ -343,7 +343,7 @@ var MariaDbQueryable = class {
         typeCast
       };
       const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
-      return await this.client.query(req, values);
+      return await this.client.execute(req, values);
     } catch (e) {
       const error = e;
       this.onError(error);
@@ -357,18 +357,40 @@ var MariaDbQueryable = class {
 var MariaDbTransaction = class extends MariaDbQueryable {
   constructor(conn, options, cleanup) {
     super(conn);
+    this.conn = conn;
     this.options = options;
     this.cleanup = cleanup;
   }
   async commit() {
     debug(`[js::commit]`);
-    this.cleanup?.();
-    await this.client.end();
+    try {
+      await this.client.query({ sql: "COMMIT" });
+    } catch (err) {
+      this.onError(err);
+    } finally {
+      this.cleanup?.();
+      await this.client.end();
+    }
   }
   async rollback() {
     debug(`[js::rollback]`);
-    this.cleanup?.();
-    await this.client.end();
+    try {
+      await this.client.query({ sql: "ROLLBACK" });
+    } catch (err) {
+      this.onError(err);
+    } finally {
+      this.cleanup?.();
+      await this.client.end();
+    }
+  }
+  async createSavepoint(name2) {
+    await this.client.query({ sql: `SAVEPOINT ${name2}` }).catch(this.onError.bind(this));
+  }
+  async rollbackToSavepoint(name2) {
+    await this.client.query({ sql: `ROLLBACK TO ${name2}` }).catch(this.onError.bind(this));
+  }
+  async releaseSavepoint(name2) {
+    await this.client.query({ sql: `RELEASE SAVEPOINT ${name2}` }).catch(this.onError.bind(this));
   }
 };
 var PrismaMariaDbAdapter = class extends MariaDbQueryable {
@@ -388,7 +410,7 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
   }
   async startTransaction(isolationLevel) {
     const options = {
-      usePhantomQuery: false
+      usePhantomQuery: true
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
@@ -410,7 +432,7 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
           argTypes: []
         });
       }
-      await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
+      await tx.conn.query({ sql: "BEGIN" }).catch(this.onError.bind(this));
       return tx;
     } catch (error) {
       await conn.end();
@@ -477,7 +499,7 @@ function inferCapabilities(version) {
   const [versionStr, suffix] = version.split("-");
   const [major, minor, patch] = versionStr.split(".").map((n) => parseInt(n, 10));
   const isMariaDB = suffix?.toLowerCase()?.includes("mariadb") ?? false;
-  const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && minor >= 0 && patch >= 13);
+  const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && (minor > 0 || minor === 0 && patch >= 13));
   return { supportsRelationJoins };
 }
 function rewriteConnectionString(config) {

package/dist/index.mjs

@@ -8,7 +8,7 @@ var name = "@prisma/adapter-mariadb";
 // src/conversion.ts
 import { ColumnTypeEnum } from "@prisma/driver-adapter-utils";
 var UNSIGNED_FLAG = 1 << 5;
-var BINARY_FLAG = 1 << 7;
+var BINARY_COLLATION_INDEX = 63;
 function mapColumnType(field) {
   switch (field.type) {
     case "TINY" /* TINY */:
@@ -51,7 +51,7 @@ function mapColumnType(field) {
     case "LONG_BLOB" /* LONG_BLOB */:
       if (field["dataTypeFormat"] === "json") {
         return ColumnTypeEnum.Json;
-      } else if (field.flags.valueOf() & BINARY_FLAG) {
+      } else if (field.collation.index === BINARY_COLLATION_INDEX) {
         return ColumnTypeEnum.Bytes;
       } else {
         return ColumnTypeEnum.Text;
@@ -307,7 +307,7 @@ var MariaDbQueryable = class {
         typeCast
       };
       const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
-      return await this.client.query(req, values);
+      return await this.client.execute(req, values);
     } catch (e) {
       const error = e;
       this.onError(error);
@@ -321,18 +321,40 @@ var MariaDbQueryable = class {
 var MariaDbTransaction = class extends MariaDbQueryable {
   constructor(conn, options, cleanup) {
     super(conn);
+    this.conn = conn;
     this.options = options;
     this.cleanup = cleanup;
   }
   async commit() {
     debug(`[js::commit]`);
-    this.cleanup?.();
-    await this.client.end();
+    try {
+      await this.client.query({ sql: "COMMIT" });
+    } catch (err) {
+      this.onError(err);
+    } finally {
+      this.cleanup?.();
+      await this.client.end();
+    }
   }
   async rollback() {
     debug(`[js::rollback]`);
-    this.cleanup?.();
-    await this.client.end();
+    try {
+      await this.client.query({ sql: "ROLLBACK" });
+    } catch (err) {
+      this.onError(err);
+    } finally {
+      this.cleanup?.();
+      await this.client.end();
+    }
+  }
+  async createSavepoint(name2) {
+    await this.client.query({ sql: `SAVEPOINT ${name2}` }).catch(this.onError.bind(this));
+  }
+  async rollbackToSavepoint(name2) {
+    await this.client.query({ sql: `ROLLBACK TO ${name2}` }).catch(this.onError.bind(this));
+  }
+  async releaseSavepoint(name2) {
+    await this.client.query({ sql: `RELEASE SAVEPOINT ${name2}` }).catch(this.onError.bind(this));
   }
 };
 var PrismaMariaDbAdapter = class extends MariaDbQueryable {
@@ -352,7 +374,7 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
   }
   async startTransaction(isolationLevel) {
     const options = {
-      usePhantomQuery: false
+      usePhantomQuery: true
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
@@ -374,7 +396,7 @@ var PrismaMariaDbAdapter = class extends MariaDbQueryable {
           argTypes: []
         });
       }
-      await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
+      await tx.conn.query({ sql: "BEGIN" }).catch(this.onError.bind(this));
       return tx;
     } catch (error) {
       await conn.end();
@@ -441,7 +463,7 @@ function inferCapabilities(version) {
   const [versionStr, suffix] = version.split("-");
   const [major, minor, patch] = versionStr.split(".").map((n) => parseInt(n, 10));
   const isMariaDB = suffix?.toLowerCase()?.includes("mariadb") ?? false;
-  const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && minor >= 0 && patch >= 13);
+  const supportsRelationJoins = !isMariaDB && (major > 8 || major === 8 && (minor > 0 || minor === 0 && patch >= 13));
   return { supportsRelationJoins };
 }
 function rewriteConnectionString(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-mariadb",
-  "version": "7.5.0-dev.9",
+  "version": "7.6.0-dev.1",
   "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.5.0-dev.9"
+    "@prisma/driver-adapter-utils": "7.6.0-dev.1"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",