@mikro-orm/mariadb 7.1.0-dev.4 → 7.1.0-dev.41

package/MariaDbMikroORM.d.ts

@@ -1,5 +1,5 @@
-import { type AnyEntity, type EntityClass, type EntitySchema, MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
-import type { SqlEntityManager } from '@mikro-orm/mysql';
+import { type AnyEntity, type EntityClass, type EntitySchema, type MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import { SqlMikroORM, type SqlEntityManager } from '@mikro-orm/mysql';
 import { MariaDbDriver } from './MariaDbDriver.js';
 /** Configuration options for the MariaDB driver. */
 export type MariaDbOptions<EM extends SqlEntityManager<MariaDbDriver> = SqlEntityManager<MariaDbDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> = Partial<Options<MariaDbDriver, EM, Entities>>;
@@ -8,7 +8,7 @@ export declare function defineMariaDbConfig<EM extends SqlEntityManager<MariaDbD
 /**
  * @inheritDoc
  */
-export declare class MariaDbMikroORM<EM extends SqlEntityManager<MariaDbDriver> = SqlEntityManager<MariaDbDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends MikroORM<MariaDbDriver, EM, Entities> {
+export declare class MariaDbMikroORM<EM extends SqlEntityManager<MariaDbDriver> = SqlEntityManager<MariaDbDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends SqlMikroORM<MariaDbDriver, EM, Entities> {
     /**
      * @inheritDoc
      */

package/MariaDbMikroORM.js

@@ -1,4 +1,5 @@
-import { defineConfig, MikroORM, } from '@mikro-orm/core';
+import { defineConfig, } from '@mikro-orm/core';
+import { SqlMikroORM } from '@mikro-orm/mysql';
 import { MariaDbDriver } from './MariaDbDriver.js';
 /** Creates a type-safe configuration object for the MariaDB driver. */
 export function defineMariaDbConfig(options) {
@@ -7,7 +8,7 @@ export function defineMariaDbConfig(options) {
 /**
  * @inheritDoc
  */
-export class MariaDbMikroORM extends MikroORM {
+export class MariaDbMikroORM extends SqlMikroORM {
     /**
      * @inheritDoc
      */

package/MariaDbSchemaHelper.d.ts

@@ -2,6 +2,12 @@ import { type AbstractSqlConnection, type CheckDef, type Column, type IndexDef,
 import { type Dictionary, type Transaction, type Type } from '@mikro-orm/core';
 /** Schema introspection helper for MariaDB. */
 export declare class MariaDbSchemaHelper extends MySqlSchemaHelper {
+    /**
+     * MariaDB does not support inline expression indexes the way MySQL 8.0+ does, so the
+     * `(CASE WHEN <pred> THEN <col> END)` emulation MikroORM uses on MySQL would error out.
+     * For partial indexes on MariaDB, define a virtual generated column and index that instead.
+     */
+    protected getIndexColumns(index: IndexDef): string;
     protected appendMySqlIndexSuffix(sql: string, index: IndexDef): string;
     loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[], schemas?: string[], ctx?: Transaction): Promise<void>;
     getAllIndexes(connection: AbstractSqlConnection, tables: Table[], ctx?: Transaction): Promise<Dictionary<IndexDef[]>>;

package/MariaDbSchemaHelper.js

@@ -1,6 +1,18 @@
 import { MySqlSchemaHelper, } from '@mikro-orm/mysql';
 /** Schema introspection helper for MariaDB. */
 export class MariaDbSchemaHelper extends MySqlSchemaHelper {
+    /**
+     * MariaDB does not support inline expression indexes the way MySQL 8.0+ does, so the
+     * `(CASE WHEN <pred> THEN <col> END)` emulation MikroORM uses on MySQL would error out.
+     * For partial indexes on MariaDB, define a virtual generated column and index that instead.
+     */
+    getIndexColumns(index) {
+        if (index.where) {
+            throw new Error(`Index '${index.keyName}': partial indexes (\`where\`) are not supported on MariaDB. ` +
+                `MariaDB does not support inline expression indexes; define a virtual generated column with the predicate and index that column instead.`);
+        }
+        return super.getIndexColumns(index);
+    }
     appendMySqlIndexSuffix(sql, index) {
         // MariaDB uses IGNORED instead of MySQL's INVISIBLE keyword
         if (index.invisible) {
@@ -24,11 +36,16 @@ export class MariaDbSchemaHelper extends MySqlSchemaHelper {
         const checks = await this.getAllChecks(connection, tables, ctx, columns);
         const fks = await this.getAllForeignKeys(connection, tables, ctx);
         const enums = await this.getAllEnumDefinitions(connection, tables, ctx);
+        const triggers = await this.getAllTriggers(connection, tables);
         for (const t of tables) {
             const key = this.getTableKey(t);
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);
+            table.collation = t.table_collation ?? undefined;
             const pks = await this.getPrimaryKeys(connection, indexes[key], table.name, table.schema);
             table.init(columns[key], indexes[key], checks[key], pks, fks[key], enums[key]);
+            if (triggers[key]) {
+                table.setTriggers(triggers[key]);
+            }
         }
     }
     async getAllIndexes(connection, tables, ctx) {
@@ -79,22 +96,25 @@ export class MariaDbSchemaHelper extends MySqlSchemaHelper {
         return ret;
     }
     async getAllColumns(connection, tables, ctx) {
-        const sql = `select table_name as table_name,
-      nullif(table_schema, schema()) as schema_name,
-      column_name as column_name,
-      column_default as column_default,
-      nullif(column_comment, '') as column_comment,
-      is_nullable as is_nullable,
-      data_type as data_type,
-      column_type as column_type,
-      column_key as column_key,
-      extra as extra,
-      generation_expression as generation_expression,
-      numeric_precision as numeric_precision,
-      numeric_scale as numeric_scale,
-      ifnull(datetime_precision, character_maximum_length) length
-      from information_schema.columns where table_schema = database() and table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(', ')})
-      order by ordinal_position`;
+        const sql = `select c.table_name as table_name,
+      nullif(c.table_schema, schema()) as schema_name,
+      c.column_name as column_name,
+      c.column_default as column_default,
+      nullif(c.column_comment, '') as column_comment,
+      c.is_nullable as is_nullable,
+      c.data_type as data_type,
+      c.column_type as column_type,
+      c.column_key as column_key,
+      c.extra as extra,
+      c.generation_expression as generation_expression,
+      c.numeric_precision as numeric_precision,
+      c.numeric_scale as numeric_scale,
+      ifnull(c.datetime_precision, c.character_maximum_length) length,
+      nullif(c.collation_name, t.table_collation) as collation_name
+      from information_schema.columns c
+      join information_schema.tables t on t.table_schema = c.table_schema and t.table_name = c.table_name
+      where c.table_schema = database() and c.table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(', ')})
+      order by c.ordinal_position`;
         const allColumns = await connection.execute(sql, [], 'all', ctx);
         const str = (val) => (val != null ? '' + val : val);
         const extra = (val) => val.replace(/auto_increment|default_generated|(stored|virtual) generated/i, '').trim() || undefined;
@@ -126,6 +146,7 @@ export class MariaDbSchemaHelper extends MySqlSchemaHelper {
                 precision: col.numeric_precision,
                 scale: col.numeric_scale,
                 comment: col.column_comment,
+                collation: col.collation_name ?? undefined,
                 extra: extra(col.extra),
                 generated,
             });
@@ -144,6 +165,11 @@ export class MariaDbSchemaHelper extends MySqlSchemaHelper {
                 col.type = 'json';
                 col.mappedType = this.platform.getMappedType('json');
                 delete col.length;
+                // MariaDB JSON columns are stored as LONGTEXT with `utf8mb4_bin` regardless of the
+                // table default, so introspection picks up a non-default `collation_name`. After the
+                // rewrite to `type = 'json'`, the column has no user-facing collation — drop the
+                // introspected value so the comparator doesn't emit a phantom MODIFY on every diff.
+                col.collation = undefined;
                 continue;
             }
             ret[key] ??= [];

package/README.md

@@ -2,7 +2,7 @@
   <a href="https://mikro-orm.io"><img src="https://raw.githubusercontent.com/mikro-orm/mikro-orm/master/docs/static/img/logo-readme.svg?sanitize=true" alt="MikroORM" /></a>
 </h1>
 
-TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite (including libSQL), MSSQL and Oracle databases.
+TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL (including CockroachDB and PGlite), SQLite (including libSQL), MSSQL and Oracle databases.
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Hibernate](https://hibernate.org/).
 
@@ -19,6 +19,7 @@ Install a driver package for your database:
 
 ```sh
 npm install @mikro-orm/postgresql   # PostgreSQL
+npm install @mikro-orm/pglite       # PGlite (embedded PostgreSQL in WASM)
 npm install @mikro-orm/mysql        # MySQL
 npm install @mikro-orm/mariadb      # MariaDB
 npm install @mikro-orm/sqlite       # SQLite

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mariadb",
-  "version": "7.1.0-dev.4",
+  "version": "7.1.0-dev.41",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",
@@ -47,14 +47,14 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/mysql": "7.1.0-dev.4",
-    "kysely": "0.28.16"
+    "@mikro-orm/mysql": "7.1.0-dev.41",
+    "kysely": "0.29.0"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.0.11"
+    "@mikro-orm/core": "^7.0.16"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.4"
+    "@mikro-orm/core": "7.1.0-dev.41"
   },
   "engines": {
     "node": ">= 22.17.0"