@mikro-orm/sql 7.0.0-rc.3 → 7.0.1-dev.0

package/AbstractSqlConnection.d.ts

@@ -1,15 +1,15 @@
 import { type ControlledTransaction, type Dialect, Kysely } from 'kysely';
-import { type AnyEntity, Connection, type Dictionary, type EntityData, type IsolationLevel, type LogContext, type LoggingOptions, type QueryResult, RawQueryFragment, type Transaction, type TransactionEventBroadcaster } from '@mikro-orm/core';
+import { type AnyEntity, Connection, type Dictionary, type EntityData, type IsolationLevel, type LogContext, type LoggingOptions, type MaybePromise, type QueryResult, RawQueryFragment, type Transaction, type TransactionEventBroadcaster } from '@mikro-orm/core';
 import type { AbstractSqlPlatform } from './AbstractSqlPlatform.js';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export declare abstract class AbstractSqlConnection extends Connection {
     #private;
     protected platform: AbstractSqlPlatform;
-    abstract createKyselyDialect(overrides: Dictionary): Dialect;
+    abstract createKyselyDialect(overrides: Dictionary): MaybePromise<Dialect>;
     connect(options?: {
         skipOnConnect?: boolean;
     }): Promise<void>;
-    createKysely(): void;
+    createKysely(): MaybePromise<void>;
     /**
      * @inheritDoc
      */
@@ -29,6 +29,7 @@ export declare abstract class AbstractSqlConnection extends Connection {
         error?: Error;
     }>;
     getClient<T = any>(): Kysely<T>;
+    initClient(): Promise<void>;
     transactional<T>(cb: (trx: Transaction<ControlledTransaction<any, any>>) => Promise<T>, options?: {
         isolationLevel?: IsolationLevel;
         readOnly?: boolean;
@@ -50,6 +51,6 @@ export declare abstract class AbstractSqlConnection extends Connection {
     stream<T extends EntityData<AnyEntity>>(query: string | NativeQueryBuilder | RawQueryFragment, params?: readonly unknown[], ctx?: Transaction<Kysely<any>>, loggerContext?: LoggingOptions): AsyncIterableIterator<T>;
     /** @inheritDoc */
     executeDump(dump: string): Promise<void>;
-    private getSql;
+    protected getSql(query: string, formatted: string, context?: LogContext): string;
     protected transformRawResult<T>(res: any, method?: 'all' | 'get' | 'run'): T;
 }

package/AbstractSqlConnection.js

@@ -4,7 +4,7 @@ import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export class AbstractSqlConnection extends Connection {
     #client;
     async connect(options) {
-        this.getClient();
+        await this.initClient();
         this.connected = true;
         if (options?.skipOnConnect !== true) {
             await this.onConnect();
@@ -24,9 +24,13 @@ export class AbstractSqlConnection extends Connection {
             this.#client = new Kysely({ dialect: driverOptions });
         }
         else {
-            this.#client = new Kysely({
-                dialect: this.createKyselyDialect(driverOptions),
-            });
+            const dialect = this.createKyselyDialect(driverOptions);
+            if (dialect instanceof Promise) {
+                return dialect.then(d => {
+                    this.#client = new Kysely({ dialect: d });
+                });
+            }
+            this.#client = new Kysely({ dialect });
         }
     }
     /**
@@ -62,10 +66,19 @@ export class AbstractSqlConnection extends Connection {
     }
     getClient() {
         if (!this.#client) {
-            this.createKysely();
+            const maybePromise = this.createKysely();
+            /* v8 ignore next */
+            if (maybePromise instanceof Promise) {
+                throw new Error('Current driver requires async initialization, use `MikroORM.init()` instead of the constructor');
+            }
         }
         return this.#client;
     }
+    async initClient() {
+        if (!this.#client) {
+            await this.createKysely();
+        }
+    }
     async transactional(cb, options = {}) {
         const trx = await this.begin(options);
         try {

package/AbstractSqlDriver.d.ts

@@ -53,7 +53,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     nativeInsert<T extends object>(entityName: EntityName<T>, data: EntityDictionary<T>, options?: NativeInsertUpdateOptions<T>): Promise<QueryResult<T>>;
     nativeInsertMany<T extends object>(entityName: EntityName<T>, data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T>, transform?: (sql: string) => string): Promise<QueryResult<T>>;
     nativeUpdate<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>, data: EntityDictionary<T>, options?: NativeInsertUpdateOptions<T> & UpsertOptions<T>): Promise<QueryResult<T>>;
-    nativeUpdateMany<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>[], data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T> & UpsertManyOptions<T>): Promise<QueryResult<T>>;
+    nativeUpdateMany<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>[], data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T> & UpsertManyOptions<T>, transform?: (sql: string, params: any[]) => string): Promise<QueryResult<T>>;
     nativeDelete<T extends object>(entityName: EntityName<T>, where: FilterQuery<T> | string | any, options?: DeleteOptions<T>): Promise<QueryResult<T>>;
     /**
      * Fast comparison for collection snapshots that are represented by PK arrays.

package/AbstractSqlDriver.js

@@ -60,7 +60,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         this.validateSqlOptions(options);
         const { first, last, before, after } = options;
         const isCursorPagination = [first, last, before, after].some(v => v != null);
-        qb.__populateWhere = options._populateWhere;
+        qb.state.resolvedPopulateWhere = options._populateWhere;
         qb.select(fields)
             // only add populateWhere if we are populate-joining, as this will be used to add `on` conditions
             .populate(populate, joinedProps.length > 0 ? populateWhere : undefined, joinedProps.length > 0 ? options.populateFilter : undefined)
@@ -200,7 +200,8 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (type === QueryType.COUNT) {
             native.clear('select').clear('limit').clear('offset').count();
         }
-        native.from(raw(`(${expression}) as ${this.platform.quoteIdentifier(qb.alias)}`));
+        const asKeyword = this.platform.usesAsKeyword() ? ' as ' : ' ';
+        native.from(raw(`(${expression})${asKeyword}${this.platform.quoteIdentifier(qb.alias)}`));
         const query = native.compile();
         const res = await this.execute(query.sql, query.params, 'all', options.ctx);
         if (type === QueryType.COUNT) {
@@ -215,7 +216,8 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const qb = await this.createQueryBuilderFromOptions(meta, where, this.forceBalancedStrategy(options));
         qb.unsetFlag(QueryFlag.DISABLE_PAGINATE);
         const native = qb.getNativeQuery(false);
-        native.from(raw(`(${expression}) as ${this.platform.quoteIdentifier(qb.alias)}`));
+        const asKeyword = this.platform.usesAsKeyword() ? ' as ' : ' ';
+        native.from(raw(`(${expression})${asKeyword}${this.platform.quoteIdentifier(qb.alias)}`));
         const query = native.compile();
         const connectionType = this.resolveConnectionType({ ctx: options.ctx, connectionType: options.connectionType });
         const res = this.getConnection(connectionType).stream(query.sql, query.params, options.ctx, options.loggerContext);
@@ -268,7 +270,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
      * and need to be renamed back to `column_name` for the result mapper to work.
      */
     mapTPTColumns(result, meta, qb) {
-        const tptAliases = qb._tptAlias;
+        const tptAliases = qb.state.tptAlias;
         // Walk up the TPT hierarchy
         let parentMeta = meta.tptParent;
         while (parentMeta) {
@@ -526,7 +528,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             this.buildFields(meta, populate, joinedProps, qb, qb.alias, options, schema);
         }
         this.validateSqlOptions(options);
-        qb.__populateWhere = options._populateWhere;
+        qb.state.resolvedPopulateWhere = options._populateWhere;
         qb.indexHint(options.indexHint)
             .collation(options.collation)
             .comment(options.comments)
@@ -556,7 +558,12 @@ export class AbstractSqlDriver extends DatabaseDriver {
         else {
             /* v8 ignore next */
             res.insertId = data[meta.primaryKeys[0]] ?? res.insertId ?? res.row[meta.primaryKeys[0]];
-            pk = [res.insertId];
+            if (options.convertCustomTypes && meta?.getPrimaryProp().customType) {
+                pk = [meta.getPrimaryProp().customType.convertToDatabaseValue(res.insertId, this.platform)];
+            }
+            else {
+                pk = [res.insertId];
+            }
         }
         await this.processManyToMany(meta, pk, collections, false, options);
         return res;
@@ -780,7 +787,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         await this.processManyToMany(meta, pk, collections, true, options);
         return res;
     }
-    async nativeUpdateMany(entityName, where, data, options = {}) {
+    async nativeUpdateMany(entityName, where, data, options = {}, transform) {
         options.processCollections ??= true;
         options.convertCustomTypes ??= true;
         const meta = this.metadata.get(entityName);
@@ -894,7 +901,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const pks = Utils.flatten(pkProps.map(pk => meta.properties[pk].fieldNames));
         sql +=
             pks.length > 1
-                ? `(${pks.map(pk => `${this.platform.quoteIdentifier(pk)}`).join(', ')})`
+                ? `(${pks.map(pk => this.platform.quoteIdentifier(pk)).join(', ')})`
                 : this.platform.quoteIdentifier(pks[0]);
         const conds = where.map(cond => {
             if (Utils.isPlainObject(cond) && Utils.getObjectKeysSize(cond) === 1) {
@@ -923,6 +930,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     ? ` returning ${returningFields.map(field => this.platform.quoteIdentifier(field)).join(', ')}`
                     : '';
         }
+        if (transform) {
+            sql = transform(sql, params);
+        }
         const res = await this.rethrow(this.execute(sql, params, 'run', options.ctx, options.loggerContext));
         for (let i = 0; i < collections.length; i++) {
             await this.processManyToMany(meta, where[i], collections[i], false, options);
@@ -1050,8 +1060,17 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const pivotProp1 = pivotMeta.relations[prop.owner ? 1 : 0];
         const pivotProp2 = pivotMeta.relations[prop.owner ? 0 : 1];
         const ownerMeta = pivotProp2.targetMeta;
+        // The pivot query builder doesn't convert custom types, so we need to manually
+        // convert owner PKs to DB format for the query and convert result FKs back to
+        // JS format for consistent key hashing in buildPivotResultMap.
+        const pkProp = ownerMeta.properties[ownerMeta.primaryKeys[0]];
+        const needsConversion = pkProp?.customType?.ensureComparable(ownerMeta, pkProp) && !ownerMeta.compositePK;
+        let ownerPks = ownerMeta.compositePK ? owners : owners.map(o => o[0]);
+        if (needsConversion) {
+            ownerPks = ownerPks.map(v => pkProp.customType.convertToDatabaseValue(v, this.platform, { mode: 'query' }));
+        }
         const cond = {
-            [pivotProp2.name]: { $in: ownerMeta.compositePK ? owners : owners.map(o => o[0]) },
+            [pivotProp2.name]: { $in: ownerPks },
         };
         if (!Utils.isEmpty(where)) {
             cond[pivotProp1.name] = { ...where };
@@ -1084,6 +1103,16 @@ export class AbstractSqlDriver extends DatabaseDriver {
             _populateWhere: 'infer',
             populateFilter: this.wrapPopulateFilter(options, pivotProp2.name),
         });
+        // Convert result FK values back to JS format so key hashing
+        // in buildPivotResultMap is consistent with the owner keys.
+        if (needsConversion) {
+            for (const item of res) {
+                const fk = item[pivotProp2.name];
+                if (fk != null) {
+                    item[pivotProp2.name] = pkProp.customType.convertToJSValue(fk, this.platform);
+                }
+            }
+        }
         return this.buildPivotResultMap(owners, res, pivotProp2.name, pivotProp1.name);
     }
     /**
@@ -1509,7 +1538,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
      * @internal
      */
     findTPTChildAlias(qb, childMeta) {
-        const joins = qb._joins;
+        const joins = qb.state.joins;
         for (const key of Object.keys(joins)) {
             if (joins[key].table === childMeta.tableName && key.includes('[tpt]')) {
                 return joins[key].alias;

package/AbstractSqlPlatform.d.ts

@@ -4,6 +4,7 @@ import { type SchemaHelper } from './schema/SchemaHelper.js';
 import type { IndexDef } from './typings.js';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export declare abstract class AbstractSqlPlatform extends Platform {
+    #private;
     protected readonly schemaHelper?: SchemaHelper;
     usesPivotTable(): boolean;
     indexForeignKeys(): boolean;
@@ -26,6 +27,12 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     quoteValue(value: any): string;
     getSearchJsonPropertySQL(path: string, type: string, aliased: boolean): string | RawQueryFragment;
     getSearchJsonPropertyKey(path: string[], type: string, aliased: boolean, value?: unknown): string | RawQueryFragment;
+    /**
+     * 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: string): string;
     getJsonIndexDefinition(index: IndexDef): string[];
     supportsUnionWhere(): boolean;
     supportsSchemas(): boolean;
@@ -42,4 +49,31 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     quoteCollation(collation: string): string;
     /** @internal */
     protected validateCollationName(collation: string): void;
+    /** @internal */
+    validateJsonPropertyName(name: string): void;
+    /**
+     * Returns FROM clause for JSON array iteration.
+     * @internal
+     */
+    getJsonArrayFromSQL(column: string, alias: string, _properties: {
+        name: string;
+        type: string;
+    }[]): string;
+    /**
+     * Returns SQL expression to access an element's property within a JSON array iteration.
+     * @internal
+     */
+    getJsonArrayElementPropertySQL(alias: string, property: string, _type: string): string;
+    /**
+     * 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: string, where: string): string;
+    /**
+     * 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: string): unknown;
 }

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,11 +65,18 @@ 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 => {
@@ -116,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.
      */

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/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;
 }