@platformatic/sql-mapper 3.66.0 → 3.68.0

package/index.js

@@ -192,7 +192,7 @@ export async function createConnectionPool ({
     sql = createConnectionPoolMysql.sql
     const version = (await db.query(sql`SELECT VERSION()`))[0]['VERSION()']
     db.version = version
-    db.isMariaDB = version.indexOf('maria') !== -1
+    db.isMariaDB = version.toLowerCase().indexOf('maria') !== -1
     if (!db.isMariaDB) {
       db.isMySql = true
     }
@@ -312,6 +312,26 @@ export async function connect ({
         wrap.constraints = await queries.listConstraints(db, sql, table, schema)
         wrap.columns = columns
 
+        // MariaDB reports JSON columns as `longtext`; recover the JSON-ness
+        // from the auto-generated json_valid(...) CHECK constraint.
+        // Fail open: information_schema.CHECK_CONSTRAINTS (and its TABLE_NAME
+        // extension) is only present on MariaDB >= 10.2.1. On older MariaDB,
+        // or if permissions are restricted, just skip JSON-column detection
+        // instead of breaking introspection entirely.
+        if (db.isMariaDB && queries.listJsonColumns) {
+          try {
+            const jsonColumns = await queries.listJsonColumns(db, sql, table, schema)
+            for (const jsonColumn of jsonColumns) {
+              const column = columns.find(c => c.column_name === jsonColumn.column_name)
+              if (column) {
+                column.isJson = true
+              }
+            }
+          } catch {
+            // information_schema.CHECK_CONSTRAINTS not available/queryable; ignore.
+          }
+        }
+
         // To get enum values in pg
         /* istanbul ignore next */
         if (db.isPg) {

package/lib/connection-info.js

@@ -34,6 +34,7 @@ export async function getConnectionInfo (db, connectionString) {
     user,
     isPg: !!db.isPg,
     isMySql: !!db.isMySql,
+    isMariaDB: !!db.isMariaDB,
     isSQLite: !!db.isSQLite,
     dbSystem
   }

package/lib/entity.js

@@ -66,7 +66,7 @@ function createMapper (
     return acc
   }, {})
 
-  const primaryKeysTypes = Array.from(primaryKeys).map(key => {
+  const primaryKeysTypes = Array.from(primaryKeys).map((key) => {
     return {
       key,
       sqlType: fields[key].sqlType
@@ -99,25 +99,50 @@ function createMapper (
     if (!output) {
       return output
     }
+
     const newOutput = {}
+
     for (const key of Object.keys(output)) {
       let value = output[key]
       const newKey = fieldMapToRetrieve[key]
-      // Do not convert Date objects: they are serialized according to the
-      // schema of the field, like other non-stringified columns
+
+      const isNativeJson =
+        fields[key]?.sqlType === 'json' || fields[key]?.sqlType === 'jsonb'
+
+      // MariaDB has no native JSON type: JSON columns are stored (and
+      // introspected) as `longtext`. We mark them at introspection time
+      // via the `isJson` flag (see index.js / lib/queries/mysql-shared.js).
+      const isJsonText = fields[key]?.isJson === true
+
+      if (isNativeJson || isJsonText) {
+        // The driver may already have deserialized the value (some MariaDB
+        // driver versions do this for longtext columns), or it may still be
+        // the raw JSON string - normalize to a parsed object either way.
+        if (typeof value === 'string') {
+          value = JSON.parse(value)
+        }
+
+        newOutput[newKey] = value
+        continue
+      }
+
       if (
         (primaryKeys.has(key) || fields[key]?.stringifyOutput) &&
         value !== null &&
         value !== undefined &&
-        !(value instanceof Date)
+        !(value instanceof Date) &&
+        typeof value !== 'object'
       ) {
         value = value.toString()
       }
+
       if (newKey && isVectorType(fields[key].sqlType)) {
         value = parseVector(value)
       }
+
       newOutput[newKey] = value
     }
+
     return newOutput
   }
 
@@ -522,7 +547,8 @@ export function buildEntity (
       sqlType: column.udt_name,
       isNullable: column.is_nullable === 'YES',
       isArray: column.isArray,
-      vectorDimensions: column.vectorDimensions
+      vectorDimensions: column.vectorDimensions,
+      isJson: column.isJson === true
     }
 
     // To get enum values in mysql and mariadb

package/lib/queries/mariadb.js

@@ -1,2 +1 @@
-export { listColumns, listConstraints, listTables, listViews, updateMany, updateOne } from './mysql-shared.js'
-export { deleteAll, insertMany, insertOne } from './shared.js'
+export * from './mysql.js'

package/lib/queries/mysql-shared.js

@@ -34,6 +34,20 @@ export async function listColumns (db, sql, table, schema) {
   return db.query(query)
 }
 
+// MariaDB has no native JSON type: a `JSON` column is really a LONGTEXT
+// column with an automatically-generated CHECK (json_valid(`col`)) constraint.
+// We use that constraint to recognize which longtext columns are actually JSON.
+export async function listJsonColumns (db, sql, table, schema) {
+  const query = sql`
+    SELECT CONSTRAINT_NAME as column_name
+    FROM information_schema.CHECK_CONSTRAINTS
+    WHERE TABLE_NAME = ${table}
+    AND CONSTRAINT_SCHEMA = ${schema}
+    AND CHECK_CLAUSE LIKE 'json_valid(%'
+  `
+  return db.query(query)
+}
+
 export async function listConstraints (db, sql, table, schema) {
   const query = sql`
     SELECT TABLE_NAME as table_name, TABLE_SCHEMA as table_schema, COLUMN_NAME as column_name, CONSTRAINT_TYPE as constraint_type, referenced_table_name AS foreign_table_name, referenced_table_schema AS foreign_table_schema, referenced_column_name AS foreign_column_name

package/lib/queries/mysql.js

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto'
 import { MissingValueForPrimaryKeyError } from '../errors.js'
 import { tableName } from '../utils.js'
 import { insertPrep } from './shared.js'
@@ -5,6 +6,15 @@ import { insertPrep } from './shared.js'
 export * from './mysql-shared.js'
 
 export function insertOne (db, sql, table, schema, input, primaryKeys, fieldsToRetrieve) {
+  // last_insert_id() only reflects AUTO_INCREMENT columns. A single uuid
+  // primary key relying on a server-side DEFAULT (e.g. `DEFAULT UUID()` on
+  // MariaDB) can't be recovered that way, so generate it here instead and
+  // insert it explicitly - this also lets us fetch the row back by its
+  // known id, same as the "primary key provided" path below.
+  if (primaryKeys.length === 1 && primaryKeys[0].sqlType === 'uuid' && input[primaryKeys[0].key] === undefined) {
+    input = { ...input, [primaryKeys[0].key]: randomUUID() }
+  }
+
   const keysToSql = Object.keys(input).map(key => sql.ident(key))
   const keys = sql.join(keysToSql, sql`, `)
 

package/lib/telemetry.js

@@ -9,7 +9,7 @@ export function wrapQuery (app, db, request) {
     let namePrefix
     if (connectionInfo.isPg) {
       namePrefix = 'pg.query:'
-    } else if (connectionInfo.isMySql) {
+    } else if (connectionInfo.isMySql || connectionInfo.isMariaDB) {
       namePrefix = 'mysql.query:'
     } else if (connectionInfo.isSQLite) {
       namePrefix = 'sqlite.query:'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "3.66.0",
+  "version": "3.68.0",
   "description": "A data mapper utility for SQL databases",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "fastify": "^5.0.0",
     "neostandard": "^0.12.0",
     "tstyche": "^6.2.0",
-    "typescript": "^5.9.3"
+    "typescript": "~6.0.3"
   },
   "dependencies": {
     "@databases/mysql": "^7.0.0",
@@ -35,8 +35,8 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^6.0.0",
     "inflected": "^2.1.0",
-    "@platformatic/foundation": "3.66.0",
-    "@platformatic/telemetry": "3.66.0"
+    "@platformatic/foundation": "3.68.0",
+    "@platformatic/telemetry": "3.68.0"
   },
   "engines": {
     "node": ">=22.19.0"