@mikro-orm/sql 7.0.0-rc.2 → 7.0.0

package/AbstractSqlPlatform.js

@@ -3,6 +3,7 @@ import { SqlEntityRepository } from './SqlEntityRepository.js';
 import { SqlSchemaGenerator } from './schema/SqlSchemaGenerator.js';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export class AbstractSqlPlatform extends Platform {
+    static #JSON_PROPERTY_NAME_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
     schemaHelper;
     usesPivotTable() {
         return true;
@@ -64,15 +65,21 @@ export class AbstractSqlPlatform extends Platform {
     }
     getSearchJsonPropertyKey(path, type, aliased, value) {
         const [a, ...b] = path;
-        const quoteKey = (key) => key.match(/^[a-z]\w*$/i) ? key : `"${key}"`;
         if (aliased) {
-            return raw(alias => `json_extract(${this.quoteIdentifier(`${alias}.${a}`)}, '$.${b.map(quoteKey).join('.')}')`);
+            return raw(alias => `json_extract(${this.quoteIdentifier(`${alias}.${a}`)}, '$.${b.map(this.quoteJsonKey).join('.')}')`);
         }
-        return raw(`json_extract(${this.quoteIdentifier(a)}, '$.${b.map(quoteKey).join('.')}')`);
+        return raw(`json_extract(${this.quoteIdentifier(a)}, '$.${b.map(this.quoteJsonKey).join('.')}')`);
+    }
+    /**
+     * Quotes a key for use inside a JSON path expression (e.g. `$.key`).
+     * Simple alphanumeric keys are left unquoted; others are wrapped in double quotes.
+     * @internal
+     */
+    quoteJsonKey(key) {
+        return /^[a-z]\w*$/i.exec(key) ? key : `"${key}"`;
     }
     getJsonIndexDefinition(index) {
-        return index.columnNames
-            .map(column => {
+        return index.columnNames.map(column => {
             if (!column.includes('.')) {
                 return column;
             }
@@ -80,6 +87,9 @@ export class AbstractSqlPlatform extends Platform {
             return `(json_extract(${root}, '$.${path.join('.')}'))`;
         });
     }
+    supportsUnionWhere() {
+        return true;
+    }
     supportsSchemas() {
         return false;
     }
@@ -114,4 +124,40 @@ export class AbstractSqlPlatform extends Platform {
             throw new Error(`Invalid collation name: '${collation}'. Collation names must contain only word characters.`);
         }
     }
+    /** @internal */
+    validateJsonPropertyName(name) {
+        if (!AbstractSqlPlatform.#JSON_PROPERTY_NAME_RE.test(name)) {
+            throw new Error(`Invalid JSON property name: '${name}'. JSON property names must contain only alphanumeric characters and underscores.`);
+        }
+    }
+    /**
+     * Returns FROM clause for JSON array iteration.
+     * @internal
+     */
+    getJsonArrayFromSQL(column, alias, _properties) {
+        return `json_each(${column}) as ${this.quoteIdentifier(alias)}`;
+    }
+    /**
+     * Returns SQL expression to access an element's property within a JSON array iteration.
+     * @internal
+     */
+    getJsonArrayElementPropertySQL(alias, property, _type) {
+        return `${this.quoteIdentifier(alias)}.${this.quoteIdentifier(property)}`;
+    }
+    /**
+     * Wraps JSON array FROM clause and WHERE condition into a full EXISTS condition.
+     * MySQL overrides this because `json_table` doesn't support correlated subqueries.
+     * @internal
+     */
+    getJsonArrayExistsSQL(from, where) {
+        return `exists (select 1 from ${from} where ${where})`;
+    }
+    /**
+     * Maps a runtime type name (e.g. 'string', 'number') to a driver-specific bind type constant.
+     * Used by NativeQueryBuilder for output bindings.
+     * @internal
+     */
+    mapToBindType(type) {
+        return type;
+    }
 }

package/PivotCollectionPersister.d.ts

@@ -1,17 +1,8 @@
 import { type Dictionary, type EntityMetadata, type EntityProperty, type Primary, type Transaction } from '@mikro-orm/core';
 import { type AbstractSqlDriver } from './AbstractSqlDriver.js';
 export declare class PivotCollectionPersister<Entity extends object> {
-    private readonly meta;
-    private readonly driver;
-    private readonly ctx?;
-    private readonly schema?;
-    private readonly loggerContext?;
-    private readonly inserts;
-    private readonly upserts;
-    private readonly deletes;
-    private readonly batchSize;
-    private order;
-    constructor(meta: EntityMetadata<Entity>, driver: AbstractSqlDriver, ctx?: Transaction | undefined, schema?: string | undefined, loggerContext?: Dictionary | undefined);
+    #private;
+    constructor(meta: EntityMetadata<Entity>, driver: AbstractSqlDriver, ctx?: Transaction, schema?: string, loggerContext?: Dictionary);
     enqueueUpdate(prop: EntityProperty<Entity>, insertDiff: Primary<Entity>[][], deleteDiff: Primary<Entity>[][] | boolean, pks: Primary<Entity>[], isInitialized?: boolean): void;
     private enqueueInsert;
     private enqueueUpsert;

package/PivotCollectionPersister.js

@@ -1,55 +1,55 @@
 class InsertStatement {
-    keys;
-    data;
     order;
+    #keys;
+    #data;
     constructor(keys, data, order) {
-        this.keys = keys;
-        this.data = data;
         this.order = order;
+        this.#keys = keys;
+        this.#data = data;
     }
     getHash() {
-        return JSON.stringify(this.data);
+        return JSON.stringify(this.#data);
     }
     getData() {
         const data = {};
-        this.keys.forEach((key, idx) => data[key] = this.data[idx]);
+        this.#keys.forEach((key, idx) => (data[key] = this.#data[idx]));
         return data;
     }
 }
 class DeleteStatement {
-    keys;
-    cond;
+    #keys;
+    #cond;
     constructor(keys, cond) {
-        this.keys = keys;
-        this.cond = cond;
+        this.#keys = keys;
+        this.#cond = cond;
     }
     getHash() {
-        return JSON.stringify(this.cond);
+        return JSON.stringify(this.#cond);
     }
     getCondition() {
         const cond = {};
-        this.keys.forEach((key, idx) => cond[key] = this.cond[idx]);
+        this.#keys.forEach((key, idx) => (cond[key] = this.#cond[idx]));
         return cond;
     }
 }
 export class PivotCollectionPersister {
-    meta;
-    driver;
-    ctx;
-    schema;
-    loggerContext;
-    inserts = new Map();
-    upserts = new Map();
-    deletes = new Map();
-    batchSize;
-    order = 0;
+    #inserts = new Map();
+    #upserts = new Map();
+    #deletes = new Map();
+    #batchSize;
+    #order = 0;
+    #meta;
+    #driver;
+    #ctx;
+    #schema;
+    #loggerContext;
     constructor(meta, driver, ctx, schema, loggerContext) {
-        this.meta = meta;
-        this.driver = driver;
-        this.ctx = ctx;
-        this.schema = schema;
-        this.loggerContext = loggerContext;
-        this.batchSize = this.driver.config.get('batchSize');
+        this.#meta = meta;
+        this.#driver = driver;
+        this.#ctx = ctx;
+        this.#schema = schema;
+        this.#loggerContext = loggerContext;
+        this.#batchSize = this.#driver.config.get('batchSize');
     }
     enqueueUpdate(prop, insertDiff, deleteDiff, pks, isInitialized = true) {
         if (insertDiff.length) {
@@ -68,8 +68,8 @@ export class PivotCollectionPersister {
         for (const fks of insertDiff) {
             const statement = this.createInsertStatement(prop, fks, pks);
             const hash = statement.getHash();
-            if (prop.owner || !this.inserts.has(hash)) {
-                this.inserts.set(hash, statement);
+            if (prop.owner || !this.#inserts.has(hash)) {
+                this.#inserts.set(hash, statement);
             }
         }
     }
@@ -77,26 +77,26 @@ export class PivotCollectionPersister {
         for (const fks of insertDiff) {
             const statement = this.createInsertStatement(prop, fks, pks);
             const hash = statement.getHash();
-            if (prop.owner || !this.upserts.has(hash)) {
-                this.upserts.set(hash, statement);
+            if (prop.owner || !this.#upserts.has(hash)) {
+                this.#upserts.set(hash, statement);
             }
         }
     }
     createInsertStatement(prop, fks, pks) {
         const { data, keys } = this.buildPivotKeysAndData(prop, fks, pks);
-        return new InsertStatement(keys, data, this.order++);
+        return new InsertStatement(keys, data, this.#order++);
     }
     enqueueDelete(prop, deleteDiff, pks) {
         if (deleteDiff === true) {
             const { data, keys } = this.buildPivotKeysAndData(prop, [], pks, true);
             const statement = new DeleteStatement(keys, data);
-            this.deletes.set(statement.getHash(), statement);
+            this.#deletes.set(statement.getHash(), statement);
             return;
         }
         for (const fks of deleteDiff) {
             const { data, keys } = this.buildPivotKeysAndData(prop, fks, pks);
             const statement = new DeleteStatement(keys, data);
-            this.deletes.set(statement.getHash(), statement);
+            this.#deletes.set(statement.getHash(), statement);
         }
     }
     /**
@@ -130,46 +130,46 @@ export class PivotCollectionPersister {
         return items.filter(Boolean);
     }
     async execute() {
-        if (this.deletes.size > 0) {
-            const deletes = [...this.deletes.values()];
-            for (let i = 0; i < deletes.length; i += this.batchSize) {
-                const chunk = deletes.slice(i, i + this.batchSize);
+        if (this.#deletes.size > 0) {
+            const deletes = [...this.#deletes.values()];
+            for (let i = 0; i < deletes.length; i += this.#batchSize) {
+                const chunk = deletes.slice(i, i + this.#batchSize);
                 const cond = { $or: [] };
                 for (const item of chunk) {
                     cond.$or.push(item.getCondition());
                 }
-                await this.driver.nativeDelete(this.meta.class, cond, {
-                    ctx: this.ctx,
-                    schema: this.schema,
-                    loggerContext: this.loggerContext,
+                await this.#driver.nativeDelete(this.#meta.class, cond, {
+                    ctx: this.#ctx,
+                    schema: this.#schema,
+                    loggerContext: this.#loggerContext,
                 });
             }
         }
-        if (this.inserts.size > 0) {
-            const filtered = this.collectStatements(this.inserts);
-            for (let i = 0; i < filtered.length; i += this.batchSize) {
-                const chunk = filtered.slice(i, i + this.batchSize);
-                await this.driver.nativeInsertMany(this.meta.class, chunk, {
-                    ctx: this.ctx,
-                    schema: this.schema,
+        if (this.#inserts.size > 0) {
+            const filtered = this.collectStatements(this.#inserts);
+            for (let i = 0; i < filtered.length; i += this.#batchSize) {
+                const chunk = filtered.slice(i, i + this.#batchSize);
+                await this.#driver.nativeInsertMany(this.#meta.class, chunk, {
+                    ctx: this.#ctx,
+                    schema: this.#schema,
                     convertCustomTypes: false,
                     processCollections: false,
-                    loggerContext: this.loggerContext,
+                    loggerContext: this.#loggerContext,
                 });
             }
         }
-        if (this.upserts.size > 0) {
-            const filtered = this.collectStatements(this.upserts);
-            for (let i = 0; i < filtered.length; i += this.batchSize) {
-                const chunk = filtered.slice(i, i + this.batchSize);
-                await this.driver.nativeUpdateMany(this.meta.class, [], chunk, {
-                    ctx: this.ctx,
-                    schema: this.schema,
+        if (this.#upserts.size > 0) {
+            const filtered = this.collectStatements(this.#upserts);
+            for (let i = 0; i < filtered.length; i += this.#batchSize) {
+                const chunk = filtered.slice(i, i + this.#batchSize);
+                await this.#driver.nativeUpdateMany(this.#meta.class, [], chunk, {
+                    ctx: this.#ctx,
+                    schema: this.#schema,
                     convertCustomTypes: false,
                     processCollections: false,
                     upsert: true,
                     onConflictAction: 'ignore',
-                    loggerContext: this.loggerContext,
+                    loggerContext: this.#loggerContext,
                 });
             }
         }

package/README.md

@@ -2,14 +2,14 @@
   <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 and SQLite (including libSQL) 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, SQLite (including libSQL), MSSQL and Oracle databases. 
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Hibernate](https://hibernate.org/).
 
-[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
-[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://www.npmjs.com/package/@mikro-orm/core)
+[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://npmx.dev/package/@mikro-orm/core)
+[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://npmx.dev/package/@mikro-orm/core)
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
-[![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
+[![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://npmx.dev/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
@@ -181,6 +181,7 @@ yarn add @mikro-orm/core @mikro-orm/mysql         # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 yarn add @mikro-orm/core @mikro-orm/mssql         # for mssql
+yarn add @mikro-orm/core @mikro-orm/oracledb      # for oracle
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```

package/SqlEntityManager.d.ts

@@ -20,7 +20,7 @@ export declare class SqlEntityManager<Driver extends AbstractSqlDriver = Abstrac
     /**
      * Shortcut for `createQueryBuilder()`
      */
-    qb<Entity extends object, RootAlias extends string = never>(entityName: EntityName<Entity>, alias?: RootAlias, type?: ConnectionType, loggerContext?: LoggingOptions): QueryBuilder<Entity, RootAlias, never, never, never, "*">;
+    qb<Entity extends object, RootAlias extends string = never>(entityName: EntityName<Entity>, alias?: RootAlias, type?: ConnectionType, loggerContext?: LoggingOptions): QueryBuilder<Entity, RootAlias>;
     /**
      * Returns configured Kysely instance.
      */
@@ -29,6 +29,6 @@ export declare class SqlEntityManager<Driver extends AbstractSqlDriver = Abstrac
     getRepository<T extends object, U extends EntityRepository<T> = SqlEntityRepository<T>>(entityName: EntityName<T>): GetRepository<T, U>;
     protected applyDiscriminatorCondition<Entity extends object>(entityName: EntityName<Entity>, where: FilterQuery<Entity>): FilterQuery<Entity>;
 }
-type EntitiesFromManager<TEntityManager extends EntityManager<any>> = NonNullable<TEntityManager['~entities']> extends any[] ? (Extract<NonNullable<TEntityManager['~entities']>[number], EntitySchemaWithMeta>) : never;
+type EntitiesFromManager<TEntityManager extends EntityManager<any>> = NonNullable<TEntityManager['~entities']> extends any[] ? Extract<NonNullable<TEntityManager['~entities']>[number], EntitySchemaWithMeta> : never;
 type AllEntitiesFromManager<TEntityManager extends EntityManager<any>> = NonNullable<TEntityManager['~entities']> extends any[] ? NonNullable<TEntityManager['~entities']>[number] : never;
 export {};

package/SqlEntityManager.js

@@ -22,11 +22,11 @@ export class SqlEntityManager extends EntityManager {
      */
     getKysely(options = {}) {
         let kysely = this.getConnection(options.type).getClient();
-        if (options.columnNamingStrategy != null
-            || options.tableNamingStrategy != null
-            || options.processOnCreateHooks != null
-            || options.processOnUpdateHooks != null
-            || options.convertValues != null) {
+        if (options.columnNamingStrategy != null ||
+            options.tableNamingStrategy != null ||
+            options.processOnCreateHooks != null ||
+            options.processOnUpdateHooks != null ||
+            options.convertValues != null) {
             kysely = kysely.withPlugin(new MikroKyselyPlugin(this, options));
         }
         return kysely;

package/dialects/index.d.ts

@@ -2,3 +2,4 @@ export * from './mssql/index.js';
 export * from './mysql/index.js';
 export * from './postgresql/index.js';
 export * from './sqlite/index.js';
+export * from './oracledb/index.js';

package/dialects/index.js

@@ -2,3 +2,4 @@ export * from './mssql/index.js';
 export * from './mysql/index.js';
 export * from './postgresql/index.js';
 export * from './sqlite/index.js';
+export * from './oracledb/index.js';

package/dialects/mssql/MsSqlNativeQueryBuilder.d.ts

@@ -11,4 +11,6 @@ export declare class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
     protected compileSelect(): void;
     protected addLockClause(): void;
     protected compileTruncate(): void;
+    /** MSSQL has no RECURSIVE keyword — CTEs are implicitly recursive. */
+    protected getCteKeyword(_hasRecursive: boolean): string;
 }

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -19,6 +19,7 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         if (this.options.comment) {
             this.parts.push(...this.options.comment.map(comment => `/* ${comment} */`));
         }
+        this.compileCtes();
         if (this.options.onConflict && !Utils.isEmpty(Utils.asArray(this.options.data)[0])) {
             this.compileUpsert();
         }
@@ -77,9 +78,7 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             return { prefix: '', suffix: '' };
         }
         const returningFields = this.options.returning;
-        const selections = returningFields
-            .map(field => `[t].${this.platform.quoteIdentifier(field)}`)
-            .join(',');
+        const selections = returningFields.map(field => `[t].${this.platform.quoteIdentifier(field)}`).join(',');
         return {
             prefix: `select top(0) ${selections} into #out from ${this.getTableName()} as t left join ${this.getTableName()} on 0 = 1;`,
             suffix: `select ${selections} from #out as t; drop table #out`,
@@ -181,7 +180,8 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         }
     }
     addLockClause() {
-        if (!this.options.lockMode || ![LockMode.PESSIMISTIC_READ, LockMode.PESSIMISTIC_WRITE].includes(this.options.lockMode)) {
+        if (!this.options.lockMode ||
+            ![LockMode.PESSIMISTIC_READ, LockMode.PESSIMISTIC_WRITE].includes(this.options.lockMode)) {
             return;
         }
         const map = {
@@ -197,4 +197,8 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
         const sql = `delete from ${tableName}; declare @count int = case @@rowcount when 0 then 1 else 0 end; dbcc checkident ('${tableName.replace(/[[\]]/g, '')}', reseed, @count)`;
         this.parts.push(sql);
     }
+    /** MSSQL has no RECURSIVE keyword — CTEs are implicitly recursive. */
+    getCteKeyword(_hasRecursive) {
+        return 'with';
+    }
 }

package/dialects/mysql/BaseMySqlPlatform.d.ts

@@ -5,6 +5,7 @@ import { AbstractSqlPlatform } from '../../AbstractSqlPlatform.js';
 import type { IndexDef } from '../../typings.js';
 import { MySqlNativeQueryBuilder } from './MySqlNativeQueryBuilder.js';
 export declare class BaseMySqlPlatform extends AbstractSqlPlatform {
+    #private;
     protected readonly schemaHelper: MySqlSchemaHelper;
     protected readonly exceptionConverter: MySqlExceptionConverter;
     protected readonly ORDER_BY_NULLS_TRANSLATE: {
@@ -42,5 +43,10 @@ export declare class BaseMySqlPlatform extends AbstractSqlPlatform {
     getFullTextWhereClause(): string;
     getFullTextIndexExpression(indexName: string, schemaName: string | undefined, tableName: string, columns: SimpleColumnMeta[]): string;
     getOrderByExpression(column: string, direction: string, collation?: string): string[];
+    getJsonArrayFromSQL(column: string, alias: string, properties: {
+        name: string;
+        type: string;
+    }[]): string;
+    getJsonArrayExistsSQL(from: string, where: string): string;
     getDefaultClientUrl(): string;
 }

package/dialects/mysql/BaseMySqlPlatform.js

@@ -6,6 +6,12 @@ import { MySqlNativeQueryBuilder } from './MySqlNativeQueryBuilder.js';
 export class BaseMySqlPlatform extends AbstractSqlPlatform {
     schemaHelper = new MySqlSchemaHelper(this);
     exceptionConverter = new MySqlExceptionConverter();
+    #jsonTypeCasts = {
+        string: 'text',
+        number: 'double',
+        bigint: 'bigint',
+        boolean: 'unsigned',
+    };
     ORDER_BY_NULLS_TRANSLATE = {
         [QueryOrder.asc_nulls_first]: 'is not null',
         [QueryOrder.asc_nulls_last]: 'is null',
@@ -44,8 +50,7 @@ export class BaseMySqlPlatform extends AbstractSqlPlatform {
         return JSON.stringify(value);
     }
     getJsonIndexDefinition(index) {
-        return index.columnNames
-            .map(column => {
+        return index.columnNames.map(column => {
             if (!column.includes('.')) {
                 return column;
             }
@@ -115,6 +120,17 @@ export class BaseMySqlPlatform extends AbstractSqlPlatform {
         ret.push(`${col} ${dir.replace(/(\s|nulls|first|last)*/gi, '')}`);
         return ret;
     }
+    getJsonArrayFromSQL(column, alias, properties) {
+        const columns = properties
+            .map(p => `${this.quoteIdentifier(p.name)} ${this.#jsonTypeCasts[p.type] ?? 'text'} path '$.${this.quoteJsonKey(p.name)}'`)
+            .join(', ');
+        return `json_table(${column}, '$[*]' columns (${columns})) as ${this.quoteIdentifier(alias)}`;
+    }
+    // MySQL does not support correlated json_table inside EXISTS subqueries,
+    // so we use a semi-join via the comma-join pattern instead.
+    getJsonArrayExistsSQL(from, where) {
+        return `(select 1 from ${from} where ${where} limit 1) is not null`;
+    }
     getDefaultClientUrl() {
         return 'mysql://root@127.0.0.1:3306';
     }

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -5,7 +5,7 @@ import { SchemaHelper } from '../../schema/SchemaHelper.js';
 import type { DatabaseSchema } from '../../schema/DatabaseSchema.js';
 import type { DatabaseTable } from '../../schema/DatabaseTable.js';
 export declare class MySqlSchemaHelper extends SchemaHelper {
-    private readonly _cache;
+    #private;
     static readonly DEFAULT_VALUES: {
         'now()': string[];
         'current_timestamp(?)': string[];

package/dialects/mysql/MySqlSchemaHelper.js

@@ -1,7 +1,7 @@
 import { EnumType, StringType, TextType } from '@mikro-orm/core';
 import { SchemaHelper } from '../../schema/SchemaHelper.js';
 export class MySqlSchemaHelper extends SchemaHelper {
-    _cache = {};
+    #cache = {};
     static DEFAULT_VALUES = {
         'now()': ['now()', 'current_timestamp'],
         'current_timestamp(?)': ['current_timestamp(?)'],
@@ -46,7 +46,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
                 const createView = await connection.execute(`show create view \`${view.view_name}\``);
                 if (createView[0]?.['Create View']) {
                     // Extract SELECT statement from CREATE VIEW ... AS SELECT ...
-                    const match = createView[0]['Create View'].match(/\bAS\s+(.+)$/is);
+                    const match = /\bAS\s+(.+)$/is.exec(createView[0]['Create View']);
                     definition = match?.[1]?.trim();
                 }
             }
@@ -89,11 +89,13 @@ export class MySqlSchemaHelper extends SchemaHelper {
             };
             // Capture column options (prefix length, sort order)
             if (index.sub_part != null || index.sort_order === 'D') {
-                indexDef.columns = [{
+                indexDef.columns = [
+                    {
                         name: index.column_name,
                         ...(index.sub_part != null && { length: index.sub_part }),
                         ...(index.sort_order === 'D' && { sort: 'DESC' }),
-                    }];
+                    },
+                ];
             }
             // Capture index type for fulltext and spatial indexes
             if (index.index_type === 'FULLTEXT') {
@@ -149,7 +151,8 @@ export class MySqlSchemaHelper extends SchemaHelper {
      */
     getIndexColumns(index) {
         if (index.columns?.length) {
-            return index.columns.map(col => {
+            return index.columns
+                .map(col => {
                 const quotedName = this.quote(col.name);
                 // MySQL supports collation via expression: (column_name COLLATE collation_name)
                 // When collation is specified, wrap in parentheses as an expression
@@ -173,7 +176,8 @@ export class MySqlSchemaHelper extends SchemaHelper {
                     colDef += ` ${col.sort}`;
                 }
                 return colDef;
-            }).join(', ');
+            })
+                .join(', ');
         }
         return index.columnNames.map(c => this.quote(c)).join(', ');
     }
@@ -205,20 +209,24 @@ export class MySqlSchemaHelper extends SchemaHelper {
       from information_schema.columns where table_schema = database() and table_name in (${tables.map(t => this.platform.quoteValue(t.table_name))})
       order by ordinal_position`;
         const allColumns = await connection.execute(sql);
-        const str = (val) => val != null ? '' + val : val;
+        const str = (val) => (val != null ? '' + val : val);
         const extra = (val) => val.replace(/auto_increment|default_generated|(stored|virtual) generated/i, '').trim() || undefined;
         const ret = {};
         for (const col of allColumns) {
             const mappedType = this.platform.getMappedType(col.column_type);
-            const defaultValue = str(this.normalizeDefaultValue((mappedType.compareAsType() === 'boolean' && ['0', '1'].includes(col.column_default))
+            const defaultValue = str(this.normalizeDefaultValue(mappedType.compareAsType() === 'boolean' && ['0', '1'].includes(col.column_default)
                 ? ['false', 'true'][+col.column_default]
                 : col.column_default, col.length));
             const key = this.getTableKey(col);
-            const generated = col.generation_expression ? `(${col.generation_expression.replaceAll(`\\'`, `'`)}) ${col.extra.match(/stored generated/i) ? 'stored' : 'virtual'}` : undefined;
+            const generated = col.generation_expression
+                ? `(${col.generation_expression.replaceAll(`\\'`, `'`)}) ${col.extra.match(/stored generated/i) ? 'stored' : 'virtual'}`
+                : undefined;
             ret[key] ??= [];
             ret[key].push({
                 name: col.column_name,
-                type: this.platform.isNumericColumn(mappedType) ? col.column_type.replace(/ unsigned$/, '').replace(/\(\d+\)$/, '') : col.column_type,
+                type: this.platform.isNumericColumn(mappedType)
+                    ? col.column_type.replace(/ unsigned$/, '').replace(/\(\d+\)$/, '')
+                    : col.column_type,
                 mappedType,
                 unsigned: col.column_type.endsWith(' unsigned'),
                 length: col.length,
@@ -328,17 +336,20 @@ export class MySqlSchemaHelper extends SchemaHelper {
         const enums = await connection.execute(sql);
         return enums.reduce((o, item) => {
             o[item.table_name] ??= {};
-            o[item.table_name][item.column_name] = item.column_type.match(/enum\((.*)\)/)[1].split(',').map((item) => item.match(/'(.*)'/)[1]);
+            o[item.table_name][item.column_name] = item.column_type
+                .match(/enum\((.*)\)/)[1]
+                .split(',')
+                .map((item) => /'(.*)'/.exec(item)[1]);
             return o;
         }, {});
     }
     async supportsCheckConstraints(connection) {
-        if (this._cache.supportsCheckConstraints != null) {
-            return this._cache.supportsCheckConstraints;
+        if (this.#cache.supportsCheckConstraints != null) {
+            return this.#cache.supportsCheckConstraints;
         }
         const sql = `select 1 from information_schema.tables where table_name = 'CHECK_CONSTRAINTS' and table_schema = 'information_schema'`;
         const res = await connection.execute(sql);
-        return this._cache.supportsCheckConstraints = res.length > 0;
+        return (this.#cache.supportsCheckConstraints = res.length > 0);
     }
     getChecksSQL(tables) {
         return `select cc.constraint_schema as table_schema, tc.table_name as table_name, cc.constraint_name as name, cc.check_clause as expression