@prisma/adapter-mariadb 6.11.0-dev.23 → 6.11.0-dev.24

package/dist/index.js

@@ -81,6 +81,9 @@ function mapColumnType(field) {
     case "VARCHAR" /* VARCHAR */:
     case "VAR_STRING" /* VAR_STRING */:
     case "STRING" /* STRING */:
+    case "BLOB" /* BLOB */:
+    case "TINY_BLOB" /* TINY_BLOB */:
+    case "MEDIUM_BLOB" /* MEDIUM_BLOB */:
       if (field.flags.valueOf() & BINARY_FLAG) {
         return import_driver_adapter_utils.ColumnTypeEnum.Bytes;
       } else {
@@ -90,9 +93,6 @@ function mapColumnType(field) {
       return import_driver_adapter_utils.ColumnTypeEnum.Enum;
     case "JSON" /* JSON */:
       return import_driver_adapter_utils.ColumnTypeEnum.Json;
-    case "BLOB" /* BLOB */:
-    case "TINY_BLOB" /* TINY_BLOB */:
-    case "MEDIUM_BLOB" /* MEDIUM_BLOB */:
     case "BIT" /* BIT */:
     case "GEOMETRY" /* GEOMETRY */:
       return import_driver_adapter_utils.ColumnTypeEnum.Bytes;
@@ -111,20 +111,15 @@ function mapArg(arg) {
 function mapRow(row, fields) {
   return row.map((value, i) => {
     const type = fields?.[i].type;
-    if (value === null && type !== "JSON" /* JSON */) {
+    if (value === null) {
       return null;
     }
-    if (typeof value === "boolean" && type === "BIT" /* BIT */) {
-      return value ? [1] : [0];
-    }
     switch (type) {
       case "TIMESTAMP" /* TIMESTAMP */:
       case "TIMESTAMP2" /* TIMESTAMP2 */:
       case "DATETIME" /* DATETIME */:
       case "DATETIME2" /* DATETIME2 */:
         return (/* @__PURE__ */ new Date(`${value}Z`)).toISOString();
-      case "JSON" /* JSON */:
-        return JSON.stringify(value);
     }
     if (Buffer.isBuffer(value)) {
       return Array.from(value);
@@ -135,6 +130,12 @@ function mapRow(row, fields) {
     return value;
   });
 }
+var typeCast = (field, next) => {
+  if (field.type === "GEOMETRY" /* GEOMETRY */) {
+    return field.buffer();
+  }
+  return next();
+};
 
 // src/errors.ts
 function convertDriverError(error) {
@@ -280,14 +281,19 @@ var MariaDbQueryable = class {
   async performIO(query) {
     const { sql, args: values } = query;
     try {
-      return await this.client.query(
-        {
-          sql,
-          dateStrings: true,
-          rowsAsArray: true
-        },
-        values.map(mapArg)
-      );
+      const query2 = {
+        sql,
+        rowsAsArray: true,
+        dateStrings: true,
+        // Return JSON strings as strings, not objects.
+        // Available in the driver, but not provided in the typings.
+        jsonStrings: true,
+        // Disable automatic conversion of BIT(1) to boolean.
+        // Available in the driver, but not provided in the typings.
+        bitOneIsBoolean: false,
+        typeCast
+      };
+      return await this.client.query(query2, values.map(mapArg));
     } catch (e) {
       const error = e;
       onError(error);
@@ -373,7 +379,7 @@ var PrismaMariaDbAdapterFactory = class {
 async function getCapabilities(pool) {
   const tag = "[js::getCapabilities]";
   try {
-    const [rows] = await pool.query({
+    const rows = await pool.query({
       sql: `SELECT VERSION()`,
       rowsAsArray: true
     });

package/dist/index.mjs

@@ -45,6 +45,9 @@ function mapColumnType(field) {
     case "VARCHAR" /* VARCHAR */:
     case "VAR_STRING" /* VAR_STRING */:
     case "STRING" /* STRING */:
+    case "BLOB" /* BLOB */:
+    case "TINY_BLOB" /* TINY_BLOB */:
+    case "MEDIUM_BLOB" /* MEDIUM_BLOB */:
       if (field.flags.valueOf() & BINARY_FLAG) {
         return ColumnTypeEnum.Bytes;
       } else {
@@ -54,9 +57,6 @@ function mapColumnType(field) {
       return ColumnTypeEnum.Enum;
     case "JSON" /* JSON */:
       return ColumnTypeEnum.Json;
-    case "BLOB" /* BLOB */:
-    case "TINY_BLOB" /* TINY_BLOB */:
-    case "MEDIUM_BLOB" /* MEDIUM_BLOB */:
     case "BIT" /* BIT */:
     case "GEOMETRY" /* GEOMETRY */:
       return ColumnTypeEnum.Bytes;
@@ -75,20 +75,15 @@ function mapArg(arg) {
 function mapRow(row, fields) {
   return row.map((value, i) => {
     const type = fields?.[i].type;
-    if (value === null && type !== "JSON" /* JSON */) {
+    if (value === null) {
       return null;
     }
-    if (typeof value === "boolean" && type === "BIT" /* BIT */) {
-      return value ? [1] : [0];
-    }
     switch (type) {
       case "TIMESTAMP" /* TIMESTAMP */:
       case "TIMESTAMP2" /* TIMESTAMP2 */:
       case "DATETIME" /* DATETIME */:
       case "DATETIME2" /* DATETIME2 */:
         return (/* @__PURE__ */ new Date(`${value}Z`)).toISOString();
-      case "JSON" /* JSON */:
-        return JSON.stringify(value);
     }
     if (Buffer.isBuffer(value)) {
       return Array.from(value);
@@ -99,6 +94,12 @@ function mapRow(row, fields) {
     return value;
   });
 }
+var typeCast = (field, next) => {
+  if (field.type === "GEOMETRY" /* GEOMETRY */) {
+    return field.buffer();
+  }
+  return next();
+};
 
 // src/errors.ts
 function convertDriverError(error) {
@@ -244,14 +245,19 @@ var MariaDbQueryable = class {
   async performIO(query) {
     const { sql, args: values } = query;
     try {
-      return await this.client.query(
-        {
-          sql,
-          dateStrings: true,
-          rowsAsArray: true
-        },
-        values.map(mapArg)
-      );
+      const query2 = {
+        sql,
+        rowsAsArray: true,
+        dateStrings: true,
+        // Return JSON strings as strings, not objects.
+        // Available in the driver, but not provided in the typings.
+        jsonStrings: true,
+        // Disable automatic conversion of BIT(1) to boolean.
+        // Available in the driver, but not provided in the typings.
+        bitOneIsBoolean: false,
+        typeCast
+      };
+      return await this.client.query(query2, values.map(mapArg));
     } catch (e) {
       const error = e;
       onError(error);
@@ -337,7 +343,7 @@ var PrismaMariaDbAdapterFactory = class {
 async function getCapabilities(pool) {
   const tag = "[js::getCapabilities]";
   try {
-    const [rows] = await pool.query({
+    const rows = await pool.query({
       sql: `SELECT VERSION()`,
       rowsAsArray: true
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-mariadb",
-  "version": "6.11.0-dev.23",
+  "version": "6.11.0-dev.24",
   "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.11.0-dev.23"
+    "@prisma/driver-adapter-utils": "6.11.0-dev.24"
   },
   "devDependencies": {
     "vitest": "3.0.9"