@mikro-orm/core 7.0.0-rc.2 → 7.0.0-rc.3

package/EntityManager.d.ts

@@ -121,6 +121,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     }): T;
     setFlushMode(flushMode?: FlushMode | `${FlushMode}`): void;
     protected processWhere<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entityName: EntityName<Entity>, where: FilterQuery<Entity>, options: FindOptions<Entity, Hint, Fields, Excludes> | FindOneOptions<Entity, Hint, Fields, Excludes>, type: 'read' | 'update' | 'delete'): Promise<FilterQuery<Entity>>;
+    protected processUnionWhere<Entity extends object, Hint extends string = never>(entityName: EntityName<Entity>, options: FindOptions<Entity, Hint, any, any> | CountOptions<Entity, Hint> | UpdateOptions<Entity> | DeleteOptions<Entity>, type: 'read' | 'update' | 'delete'): Promise<void>;
     protected applyDiscriminatorCondition<Entity extends object>(entityName: EntityName<Entity>, where: FilterQuery<Entity>): FilterQuery<Entity>;
     protected createPopulateWhere<Entity extends object>(cond: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any> | CountOptions<Entity, any>): ObjectQuery<Entity>;
     protected getJoinedFilters<Entity extends object>(meta: EntityMetadata<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any>): Promise<ObjectQuery<Entity> | undefined>;
@@ -593,7 +594,7 @@ export interface MergeOptions {
     schema?: string;
     disableContextResolution?: boolean;
     validate?: boolean;
-    cascade?: boolean; /** @default true */
+    cascade?: boolean /** @default true */;
 }
 export interface ForkOptions {
     /** do we want a clear identity map? defaults to true */

package/EntityManager.js

@@ -123,7 +123,7 @@ export class EntityManager {
         else {
             options.orderBy ??= {};
         }
-        options.populate = await em.preparePopulate(entityName, options);
+        options.populate = (await em.preparePopulate(entityName, options));
         const populate = options.populate;
         const cacheKey = em.cacheKey(entityName, options, 'em.find', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
@@ -141,6 +141,7 @@ export class EntityManager {
         options._populateWhere = options.populateWhere ?? this.config.get('populateWhere');
         options.populateWhere = this.createPopulateWhere({ ...where }, options);
         options.populateFilter = await this.getJoinedFilters(meta, options);
+        await em.processUnionWhere(entityName, options, 'read');
         const results = await em.driver.find(entityName, where, { ctx: em.transactionContext, em, ...options });
         if (results.length === 0) {
             await em.storeCache(options.cache, cached, []);
@@ -194,10 +195,10 @@ export class EntityManager {
         em.prepareOptions(options);
         options.strategy = 'joined';
         await em.tryFlush(entityName, options);
-        const where = await em.processWhere(entityName, options.where ?? {}, options, 'read');
+        const where = (await em.processWhere(entityName, options.where ?? {}, options, 'read'));
         validateParams(where);
         options.orderBy = options.orderBy || {};
-        options.populate = await em.preparePopulate(entityName, options);
+        options.populate = (await em.preparePopulate(entityName, options));
         const meta = this.metadata.get(entityName);
         options = { ...options };
         // save the original hint value so we know it was infer/all
@@ -298,6 +299,14 @@ export class EntityManager {
         where = this.applyDiscriminatorCondition(entityName, where);
         return where;
     }
+    async processUnionWhere(entityName, options, type) {
+        if (options.unionWhere?.length) {
+            if (!this.driver.getPlatform().supportsUnionWhere()) {
+                throw new Error(`unionWhere is only supported on SQL drivers`);
+            }
+            options.unionWhere = (await Promise.all(options.unionWhere.map(branch => this.processWhere(entityName, branch, options, type))));
+        }
+    }
     // this method only handles the problem for mongo driver, SQL drivers have their implementation inside QueryBuilder
     applyDiscriminatorCondition(entityName, where) {
         const meta = this.metadata.find(entityName);
@@ -314,7 +323,10 @@ export class EntityManager {
         };
         lookUpChildren(children, meta.class);
         /* v8 ignore next */
-        where[meta.root.discriminatorColumn] = children.length > 0 ? { $in: [meta.discriminatorValue, ...children.map(c => c.discriminatorValue)] } : meta.discriminatorValue;
+        where[meta.root.discriminatorColumn] =
+            children.length > 0
+                ? { $in: [meta.discriminatorValue, ...children.map(c => c.discriminatorValue)] }
+                : meta.discriminatorValue;
         return where;
     }
     createPopulateWhere(cond, options) {
@@ -381,10 +393,11 @@ export class EntityManager {
         }
         const ret = options.populate;
         for (const prop of meta.relations) {
-            if (prop.object
-                || ![ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind)
-                || !((options.fields?.length ?? 0) === 0 || options.fields?.some(f => prop.name === f || prop.name.startsWith(`${String(f)}.`)))
-                || (parent?.class === prop.targetMeta.root.class && parent.propName === prop.inversedBy)) {
+            if (prop.object ||
+                ![ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) ||
+                !((options.fields?.length ?? 0) === 0 ||
+                    options.fields?.some(f => prop.name === f || prop.name.startsWith(`${String(f)}.`))) ||
+                (parent?.class === prop.targetMeta.root.class && parent.propName === prop.inversedBy)) {
                 continue;
             }
             options = { ...options, filters: QueryHelper.mergePropertyFilters(prop.filters, options.filters) };
@@ -424,9 +437,7 @@ export class EntityManager {
         const ret = [];
         const active = new Set();
         const push = (source) => {
-            const activeFilters = QueryHelper
-                .getActiveFilters(meta, options, source)
-                .filter(f => !active.has(f.name));
+            const activeFilters = QueryHelper.getActiveFilters(meta, options, source).filter(f => !active.has(f.name));
             filters.push(...activeFilters);
             activeFilters.forEach(f => active.add(f.name));
         };
@@ -440,6 +451,7 @@ export class EntityManager {
             let cond;
             if (filter.cond instanceof Function) {
                 // @ts-ignore
+                // oxfmt-ignore
                 const args = Utils.isPlainObject(options?.[filter.name]) ? options[filter.name] : this.getContext().filterParams[filter.name];
                 if (!args && filter.cond.length > 0 && filter.args !== false) {
                     throw new Error(`No arguments provided for filter '${filter.name}'`);
@@ -582,12 +594,18 @@ export class EntityManager {
         for (const e of fork.unitOfWork.getIdentityMap()) {
             const ref = em.getReference(e.constructor, helper(e).getPrimaryKey());
             const data = helper(e).serialize({ ignoreSerializers: true, includeHidden: true, convertCustomTypes: false });
-            em.config.getHydrator(this.metadata).hydrate(ref, helper(ref).__meta, data, em.entityFactory, 'full', false, false);
+            em.config
+                .getHydrator(this.metadata)
+                .hydrate(ref, helper(ref).__meta, data, em.entityFactory, 'full', false, false);
             Utils.merge(helper(ref).__originalEntityData, this.comparator.prepareEntity(e));
             found ||= ref === entity;
         }
         if (!found) {
-            const data = helper(reloaded).serialize({ ignoreSerializers: true, includeHidden: true, convertCustomTypes: true });
+            const data = helper(reloaded).serialize({
+                ignoreSerializers: true,
+                includeHidden: true,
+                convertCustomTypes: true,
+            });
             em.config.getHydrator(this.metadata).hydrate(entity, wrapped.__meta, data, em.entityFactory, 'full', false, true);
             Utils.merge(wrapped.__originalEntityData, this.comparator.prepareEntity(reloaded));
         }
@@ -623,7 +641,7 @@ export class EntityManager {
             return em.lockAndPopulate(meta, entity, where, options);
         }
         validateParams(where);
-        options.populate = await em.preparePopulate(entityName, options);
+        options.populate = (await em.preparePopulate(entityName, options));
         const cacheKey = em.cacheKey(entityName, options, 'em.findOne', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
         if (cached?.data !== undefined) {
@@ -642,6 +660,7 @@ export class EntityManager {
         options._populateWhere = options.populateWhere ?? this.config.get('populateWhere');
         options.populateWhere = this.createPopulateWhere({ ...where }, options);
         options.populateFilter = await this.getJoinedFilters(meta, options);
+        await em.processUnionWhere(entityName, options, 'read');
         const data = await em.driver.findOne(entityName, where, {
             ctx: em.transactionContext,
             em,
@@ -770,9 +789,12 @@ export class EntityManager {
             initialized: true,
             schema: options.schema,
         });
-        const uniqueFields = options.onConflictFields ?? (Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
+        const uniqueFields = options.onConflictFields ??
+            (Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
         const returning = getOnConflictReturningFields(meta, data, uniqueFields, options);
-        if (options.onConflictAction === 'ignore' || !helper(entity).hasPrimaryKey() || (returning.length > 0 && !(this.getPlatform().usesReturningStatement() && ret.row))) {
+        if (options.onConflictAction === 'ignore' ||
+            !helper(entity).hasPrimaryKey() ||
+            (returning.length > 0 && !(this.getPlatform().usesReturningStatement() && ret.row))) {
             const where = {};
             if (Array.isArray(uniqueFields)) {
                 for (const prop of uniqueFields) {
@@ -896,7 +918,9 @@ export class EntityManager {
                 }
             }
             const unique = options.onConflictFields ?? meta.props.filter(p => p.unique).map(p => p.name);
-            propIndex = !isRaw(unique) && unique.findIndex(p => data[p] ?? data[p.substring(0, p.indexOf('.'))] != null);
+            propIndex =
+                !isRaw(unique) &&
+                    unique.findIndex(p => data[p] ?? data[p.substring(0, p.indexOf('.'))] != null);
             const tmp = getWhereCondition(meta, options.onConflictFields, row, where);
             propIndex = tmp.propIndex;
             where = QueryHelper.processWhere({
@@ -929,12 +953,16 @@ export class EntityManager {
         entitiesByData.clear();
         const loadPK = new Map();
         allData.forEach((row, i) => {
-            em.unitOfWork.getChangeSetPersister().mapReturnedValues(Utils.isEntity(data[i]) ? data[i] : null, Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
-            const entity = Utils.isEntity(data[i]) ? data[i] : em.entityFactory.create(entityName, row, {
-                refresh: true,
-                initialized: true,
-                schema: options.schema,
-            });
+            em.unitOfWork
+                .getChangeSetPersister()
+                .mapReturnedValues(Utils.isEntity(data[i]) ? data[i] : null, Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
+            const entity = Utils.isEntity(data[i])
+                ? data[i]
+                : em.entityFactory.create(entityName, row, {
+                    refresh: true,
+                    initialized: true,
+                    schema: options.schema,
+                });
             if (!helper(entity).hasPrimaryKey()) {
                 loadPK.set(entity, allWhere[i]);
             }
@@ -942,12 +970,15 @@ export class EntityManager {
             entitiesByData.set(row, entity);
         });
         // skip if we got the PKs via returning statement (`rows`)
+        // oxfmt-ignore
         const uniqueFields = options.onConflictFields ?? (Utils.isPlainObject(allWhere[0]) ? Object.keys(allWhere[0]).flatMap(key => Utils.splitPrimaryKeys(key)) : meta.primaryKeys);
         const returning = getOnConflictReturningFields(meta, data[0], uniqueFields, options);
         const reloadFields = returning.length > 0 && !(this.getPlatform().usesReturningStatement() && res.rows?.length);
         if (options.onConflictAction === 'ignore' || (!res.rows?.length && loadPK.size > 0) || reloadFields) {
             const unique = meta.hydrateProps.filter(p => !p.lazy).map(p => p.name);
-            const add = new Set(propIndex !== false && propIndex >= 0 ? [unique[propIndex]] : []);
+            const add = new Set(propIndex !== false && propIndex >= 0
+                ? [unique[propIndex]]
+                : []);
             for (const cond of loadPK.values()) {
                 Utils.keys(cond).forEach(key => add.add(key));
             }
@@ -960,7 +991,9 @@ export class EntityManager {
                 });
             });
             const data2 = await this.driver.find(meta.class, where, {
-                fields: returning.concat(...add).concat(...(Array.isArray(uniqueFields) ? uniqueFields : [])),
+                fields: returning
+                    .concat(...add)
+                    .concat(...(Array.isArray(uniqueFields) ? uniqueFields : [])),
                 ctx: em.transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
@@ -1136,7 +1169,10 @@ export class EntityManager {
         }
         data = QueryHelper.processObjectParams(data);
         validateParams(data, 'insert data');
-        const res = await em.driver.nativeInsert(entityName, data, { ctx: em.transactionContext, ...options });
+        const res = await em.driver.nativeInsert(entityName, data, {
+            ctx: em.transactionContext,
+            ...options,
+        });
         return res.insertId;
     }
     /**
@@ -1176,7 +1212,10 @@ export class EntityManager {
         }
         data = data.map(row => QueryHelper.processObjectParams(row));
         data.forEach(row => validateParams(row, 'insert data'));
-        const res = await em.driver.nativeInsertMany(entityName, data, { ctx: em.transactionContext, ...options });
+        const res = await em.driver.nativeInsertMany(entityName, data, {
+            ctx: em.transactionContext,
+            ...options,
+        });
         if (res.insertedIds) {
             return res.insertedIds;
         }
@@ -1188,11 +1227,16 @@ export class EntityManager {
     async nativeUpdate(entityName, where, data, options = {}) {
         const em = this.getContext(false);
         em.prepareOptions(options);
+        await em.processUnionWhere(entityName, options, 'update');
         data = QueryHelper.processObjectParams(data);
         where = await em.processWhere(entityName, where, { ...options, convertCustomTypes: false }, 'update');
         validateParams(data, 'update data');
         validateParams(where, 'update condition');
-        const res = await em.driver.nativeUpdate(entityName, where, data, { ctx: em.transactionContext, ...options });
+        const res = await em.driver.nativeUpdate(entityName, where, data, {
+            ctx: em.transactionContext,
+            em,
+            ...options,
+        });
         return res.affectedRows;
     }
     /**
@@ -1201,9 +1245,14 @@ export class EntityManager {
     async nativeDelete(entityName, where, options = {}) {
         const em = this.getContext(false);
         em.prepareOptions(options);
-        where = await em.processWhere(entityName, where, options, 'delete');
+        await em.processUnionWhere(entityName, options, 'delete');
+        where = (await em.processWhere(entityName, where, options, 'delete'));
         validateParams(where, 'delete condition');
-        const res = await em.driver.nativeDelete(entityName, where, { ctx: em.transactionContext, ...options });
+        const res = await em.driver.nativeDelete(entityName, where, {
+            ctx: em.transactionContext,
+            em,
+            ...options,
+        });
         return res.affectedRows;
     }
     /**
@@ -1214,7 +1263,10 @@ export class EntityManager {
         const data = this.driver.mapResult(result, meta);
         for (const k of Object.keys(data)) {
             const prop = meta.properties[k];
-            if (prop?.kind === ReferenceKind.SCALAR && SCALAR_TYPES.has(prop.runtimeType) && !prop.customType && (prop.setter || !prop.getter)) {
+            if (prop?.kind === ReferenceKind.SCALAR &&
+                SCALAR_TYPES.has(prop.runtimeType) &&
+                !prop.customType &&
+                (prop.setter || !prop.getter)) {
                 validateProperty(prop, data[k], data);
             }
         }
@@ -1243,7 +1295,9 @@ export class EntityManager {
             return entity;
         }
         const dataIsEntity = Utils.isEntity(data);
-        entity = dataIsEntity ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
+        entity = dataIsEntity
+            ? data
+            : em.entityFactory.create(entityName, data, { merge: true, ...options });
         const visited = options.cascade ? undefined : new Set([entity]);
         em.unitOfWork.merge(entity, visited);
         return entity;
@@ -1313,7 +1367,7 @@ export class EntityManager {
         em.prepareOptions(options);
         await em.tryFlush(entityName, options);
         where = await em.processWhere(entityName, where, options, 'read');
-        options.populate = await em.preparePopulate(entityName, options);
+        options.populate = (await em.preparePopulate(entityName, options));
         options = { ...options };
         // save the original hint value so we know it was infer/all
         const meta = em.metadata.find(entityName);
@@ -1322,6 +1376,7 @@ export class EntityManager {
         options.populateFilter = await this.getJoinedFilters(meta, options);
         validateParams(where);
         delete options.orderBy;
+        await em.processUnionWhere(entityName, options, 'read');
         const cacheKey = em.cacheKey(entityName, options, 'em.count', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey);
         if (cached?.data !== undefined) {
@@ -1459,7 +1514,8 @@ export class EntityManager {
         em.config.set('allowGlobalContext', true);
         const fork = new em.constructor(em.config, em.driver, em.metadata, options.useContext, eventManager);
         fork.setFlushMode(options.flushMode ?? em.flushMode);
-        fork.disableTransactions = options.disableTransactions ?? this.disableTransactions ?? this.config.get('disableTransactions');
+        fork.disableTransactions =
+            options.disableTransactions ?? this.disableTransactions ?? this.config.get('disableTransactions');
         em.config.set('allowGlobalContext', allowGlobalContext);
         if (options.keepTransactionContext) {
             fork.transactionContext = em.transactionContext;
@@ -1626,11 +1682,14 @@ export class EntityManager {
                 const ret = [];
                 for (let field of fields) {
                     if (field === PopulatePath.ALL || field.startsWith(`${PopulatePath.ALL}.`)) {
-                        ret.push(...meta.props.filter(prop => prop.lazy || [ReferenceKind.SCALAR, ReferenceKind.EMBEDDED].includes(prop.kind)).map(prop => prop.name));
+                        ret.push(...meta.props
+                            .filter(prop => prop.lazy || [ReferenceKind.SCALAR, ReferenceKind.EMBEDDED].includes(prop.kind))
+                            .map(prop => prop.name));
                         continue;
                     }
                     field = field.split(':')[0];
-                    if (!field.includes('.') && ![ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(meta.properties[field].kind)) {
+                    if (!field.includes('.') &&
+                        ![ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(meta.properties[field].kind)) {
                         ret.push(field);
                         continue;
                     }
@@ -1659,7 +1718,8 @@ export class EntityManager {
             return populate;
         }
         if (typeof options.populate !== 'boolean') {
-            options.populate = Utils.asArray(options.populate).map(field => {
+            options.populate = Utils.asArray(options.populate)
+                .map(field => {
                 /* v8 ignore next */
                 if (typeof field === 'boolean' || field === PopulatePath.ALL) {
                     return [{ field: meta.primaryKeys[0], strategy: options.strategy, all: !!field }]; //
@@ -1674,7 +1734,8 @@ export class EntityManager {
                     return [{ field, strategy: options.strategy }];
                 }
                 return [field];
-            }).flat();
+            })
+                .flat();
         }
         const populate = this.entityLoader.normalizePopulate(entityName, options.populate, options.strategy, true, options.exclude);
         const invalid = populate.find(({ field }) => !this.canPopulate(entityName, field));
@@ -1776,7 +1837,7 @@ export class EntityManager {
         config ??= this.config.get('resultCache').global;
         if (config) {
             const em = this.getContext();
-            const expiration = Array.isArray(config) ? config[1] : (typeof config === 'number' ? config : undefined);
+            const expiration = Array.isArray(config) ? config[1] : typeof config === 'number' ? config : undefined;
             await em.resultCache.set(key.key, data instanceof Function ? data() : data, '', expiration);
         }
     }
@@ -1818,9 +1879,12 @@ export class EntityManager {
         const { DataloaderUtils } = await import('@mikro-orm/core/dataloader');
         const DataLoader = await DataloaderUtils.getDataLoader();
         switch (type) {
-            case 'ref': return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getRefBatchLoadFn(em)));
-            case '1:m': return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getColBatchLoadFn(em)));
-            case 'm:n': return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getManyToManyColBatchLoadFn(em)));
+            case 'ref':
+                return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getRefBatchLoadFn(em)));
+            case '1:m':
+                return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getColBatchLoadFn(em)));
+            case 'm:n':
+                return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getManyToManyColBatchLoadFn(em)));
         }
     }
     /**

package/MikroORM.js

@@ -104,9 +104,7 @@ export class MikroORM {
      */
     constructor(options) {
         const env = loadEnvironmentVars();
-        options = options.preferEnvVars
-            ? Utils.merge(options, env)
-            : Utils.merge(env, options);
+        options = options.preferEnvVars ? Utils.merge(options, env) : Utils.merge(env, options);
         this.config = new Configuration(options);
         const discovery = this.config.get('discovery');
         this.driver = this.config.getDriver();
@@ -213,6 +211,8 @@ export class MikroORM {
      * Gets the EntityGenerator.
      */
     get entityGenerator() {
-        return this.driver.getPlatform().getExtension('EntityGenerator', '@mikro-orm/entity-generator', '@mikro-orm/entity-generator', this.em);
+        return this.driver
+            .getPlatform()
+            .getExtension('EntityGenerator', '@mikro-orm/entity-generator', '@mikro-orm/entity-generator', this.em);
     }
 }

package/cache/FileCacheAdapter.js

@@ -68,9 +68,7 @@ export class FileCacheAdapter {
         if (!this.options.combined) {
             return;
         }
-        let path = typeof this.options.combined === 'string'
-            ? this.options.combined
-            : './metadata.json';
+        let path = typeof this.options.combined === 'string' ? this.options.combined : './metadata.json';
         path = fs.normalizePath(this.options.cacheDir, path);
         this.options.combined = path; // override in the options, so we can log it from the CLI in `cache:generate` command
         writeFileSync(path, JSON.stringify(this.cache, null, this.pretty ? 2 : undefined));

package/connections/Connection.js

@@ -16,7 +16,18 @@ export class Connection {
             this.options = Utils.copy(options);
         }
         else {
-            const props = ['dbName', 'clientUrl', 'host', 'port', 'user', 'password', 'multipleStatements', 'pool', 'schema', 'driverOptions'];
+            const props = [
+                'dbName',
+                'clientUrl',
+                'host',
+                'port',
+                'user',
+                'password',
+                'multipleStatements',
+                'pool',
+                'schema',
+                'driverOptions',
+            ];
             this.options = props.reduce((o, i) => {
                 o[i] = this.config.get(i);
                 return o;
@@ -89,8 +100,10 @@ export class Connection {
             this.options.host = ret.host = this.options.host ?? this.config.get('host', decodeURIComponent(url.hostname));
             this.options.port = ret.port = this.options.port ?? this.config.get('port', +url.port);
             this.options.user = ret.user = this.options.user ?? this.config.get('user', decodeURIComponent(url.username));
-            this.options.password = ret.password = this.options.password ?? this.config.get('password', decodeURIComponent(url.password));
-            this.options.dbName = ret.database = this.options.dbName ?? this.config.get('dbName', decodeURIComponent(url.pathname).replace(/^\//, ''));
+            this.options.password = ret.password =
+                this.options.password ?? this.config.get('password', decodeURIComponent(url.password));
+            this.options.dbName = ret.database =
+                this.options.dbName ?? this.config.get('dbName', decodeURIComponent(url.pathname).replace(/^\//, ''));
         }
         return ret;
     }

package/drivers/DatabaseDriver.js

@@ -157,11 +157,11 @@ export class DatabaseDriver {
                     Object.assign(o, createOrderBy(key, direction[key]));
                     return o;
                 }, {});
-                return ({ [prop]: value });
+                return { [prop]: value };
             }
             const desc = direction === QueryOrderNumeric.DESC || direction.toString().toLowerCase() === 'desc';
             const dir = Utils.xor(desc, isLast) ? 'desc' : 'asc';
-            return ({ [prop]: dir });
+            return { [prop]: dir };
         };
         return {
             orderBy: definition.map(([prop, direction]) => createOrderBy(prop, direction)),
@@ -256,7 +256,7 @@ export class DatabaseDriver {
                 else {
                     data[prop.fieldNames[0]] = this.mapDataToFieldNames(copy, stringifyJsonArrays, prop.embeddedProps, convertCustomTypes, true);
                 }
-                if (stringifyJsonArrays && prop.array) {
+                if (stringifyJsonArrays && prop.array && !object) {
                     data[prop.fieldNames[0]] = this.platform.convertJsonToDatabaseValue(data[prop.fieldNames[0]]);
                 }
                 return;
@@ -301,16 +301,23 @@ export class DatabaseDriver {
             if (prop.joinColumns && Array.isArray(data[k])) {
                 const copy = Utils.flatten(data[k]);
                 delete data[k];
-                prop.joinColumns.forEach((joinColumn, idx) => data[joinColumn] = copy[idx]);
+                prop.joinColumns.forEach((joinColumn, idx) => (data[joinColumn] = copy[idx]));
                 return;
             }
             if (prop.joinColumns?.length > 1 && data[k] == null) {
                 delete data[k];
-                prop.ownColumns.forEach(joinColumn => data[joinColumn] = null);
+                prop.ownColumns.forEach(joinColumn => (data[joinColumn] = null));
                 return;
             }
-            if (prop.customType && convertCustomTypes && !(prop.customType instanceof JsonType && object) && !isRaw(data[k])) {
-                data[k] = prop.customType.convertToDatabaseValue(data[k], this.platform, { fromQuery: true, key: k, mode: 'query-data' });
+            if (prop.customType &&
+                convertCustomTypes &&
+                !(prop.customType instanceof JsonType && object) &&
+                !isRaw(data[k])) {
+                data[k] = prop.customType.convertToDatabaseValue(data[k], this.platform, {
+                    fromQuery: true,
+                    key: k,
+                    mode: 'query-data',
+                });
             }
             if (prop.hasConvertToDatabaseValueSQL && !prop.object && !isRaw(data[k])) {
                 const quoted = this.platform.quoteValue(data[k]);
@@ -390,7 +397,18 @@ export class DatabaseDriver {
     createReplicas(cb) {
         const replicas = this.config.get('replicas', []);
         const ret = [];
-        const props = ['dbName', 'clientUrl', 'host', 'port', 'user', 'password', 'multipleStatements', 'pool', 'name', 'driverOptions'];
+        const props = [
+            'dbName',
+            'clientUrl',
+            'host',
+            'port',
+            'user',
+            'password',
+            'multipleStatements',
+            'pool',
+            'name',
+            'driverOptions',
+        ];
         for (const conf of replicas) {
             const replicaConfig = Utils.copy(conf);
             for (const prop of props) {

package/drivers/IDatabaseDriver.d.ts

@@ -110,6 +110,22 @@ export interface FindOptions<Entity, Hint extends string = never, Fields extends
      * when nesting the condition. This is used for implementation of joined filters.
      */
     populateFilter?: ObjectQuery<Entity>;
+    /**
+     * Index-friendly alternative to `$or` for conditions that span joined relations.
+     * Each array element becomes an independent branch combined via `UNION ALL` subquery:
+     * `WHERE pk IN (branch_1 UNION ALL branch_2 ... branch_N)`.
+     * The database plans each branch independently, enabling per-table index usage
+     * (e.g. GIN trigram indexes for fuzzy search across related entities).
+     * sql only
+     */
+    unionWhere?: ObjectQuery<Entity>[];
+    /**
+     * Strategy for combining `unionWhere` branches.
+     * - `'union-all'` (default) — skips deduplication, faster for most use cases.
+     * - `'union'` — deduplicates rows between branches; useful when branch overlap is very high.
+     * sql only
+     */
+    unionWhereStrategy?: 'union-all' | 'union';
     /** Used for ordering of the populate queries. If not specified, the value of `options.orderBy` is used. */
     populateOrderBy?: OrderDefinition<Entity>;
     /** Per-relation overrides for populate loading behavior. Keys are populate paths (same as used in `populate`). */
@@ -199,6 +215,13 @@ export interface NativeInsertUpdateOptions<T> {
     /** `nativeUpdate()` only option */
     upsert?: boolean;
     loggerContext?: LogContext;
+    /** sql only */
+    unionWhere?: ObjectQuery<T>[];
+    /** sql only */
+    unionWhereStrategy?: 'union-all' | 'union';
+    filters?: FilterOptions;
+    /** @internal */
+    em?: EntityManager;
 }
 export interface NativeInsertUpdateManyOptions<T> extends NativeInsertUpdateOptions<T> {
     processCollections?: boolean;
@@ -223,6 +246,10 @@ export interface CountOptions<T extends object, P extends string = never> {
     populate?: Populate<T, P>;
     populateWhere?: ObjectQuery<T> | PopulateHint | `${PopulateHint}`;
     populateFilter?: ObjectQuery<T>;
+    /** @see FindOptions.unionWhere */
+    unionWhere?: ObjectQuery<T>[];
+    /** @see FindOptions.unionWhereStrategy */
+    unionWhereStrategy?: 'union-all' | 'union';
     ctx?: Transaction;
     connectionType?: ConnectionType;
     flushMode?: FlushMode | `${FlushMode}`;
@@ -245,12 +272,28 @@ export interface UpdateOptions<T> {
     filters?: FilterOptions;
     schema?: string;
     ctx?: Transaction;
+    /** sql only */
+    unionWhere?: ObjectQuery<T>[];
+    /** sql only */
+    unionWhereStrategy?: 'union-all' | 'union';
 }
 export interface DeleteOptions<T> extends DriverMethodOptions {
     filters?: FilterOptions;
+    /** sql only */
+    unionWhere?: ObjectQuery<T>[];
+    /** sql only */
+    unionWhereStrategy?: 'union-all' | 'union';
+    /** @internal */
+    em?: EntityManager;
 }
 export interface NativeDeleteOptions<T> extends DriverMethodOptions {
     filters?: FilterOptions;
+    /** sql only */
+    unionWhere?: ObjectQuery<T>[];
+    /** sql only */
+    unionWhereStrategy?: 'union-all' | 'union';
+    /** @internal */
+    em?: EntityManager;
 }
 export interface LockOptions extends DriverMethodOptions {
     lockMode?: LockMode;