@mikro-orm/knex 6.0.8-dev.15 → 6.0.8-dev.16

package/AbstractSqlDriver.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import { type AnyEntity, type Collection, type Configuration, type ConnectionType, type Constructor, type CountOptions, DatabaseDriver, type DeleteOptions, type Dictionary, type DriverMethodOptions, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityMetadata, type EntityName, type EntityProperty, type FilterQuery, type FindOneOptions, type FindOptions, type IDatabaseDriver, type LockOptions, type LoggingOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type Options, type OrderDefinition, type PopulateOptions, type Primary, type QueryOrderMap, type QueryResult, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
+import { type AnyEntity, type Collection, type Configuration, type ConnectionType, type Constructor, type CountOptions, DatabaseDriver, type DeleteOptions, type Dictionary, type DriverMethodOptions, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityMetadata, type EntityName, type EntityProperty, type FilterQuery, type FindOneOptions, type FindOptions, type IDatabaseDriver, type LockOptions, type LoggingOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type ObjectQuery, type Options, type OrderDefinition, type PopulateOptions, type Primary, type QueryOrderMap, type QueryResult, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
 import type { AbstractSqlConnection } from './AbstractSqlConnection';
 import type { AbstractSqlPlatform } from './AbstractSqlPlatform';
 import { QueryBuilder, QueryType } from './query';
@@ -63,6 +63,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     protected extractManyToMany<T>(entityName: string, data: EntityDictionary<T>): EntityData<T>;
     protected processManyToMany<T extends object>(meta: EntityMetadata<T> | undefined, pks: Primary<T>[], collections: EntityData<T>, clear: boolean, options?: DriverMethodOptions): Promise<void>;
     lockPessimistic<T extends object>(entity: T, options: LockOptions): Promise<void>;
+    protected buildPopulateWhere<T extends object>(meta: EntityMetadata<T>, joinedProps: PopulateOptions<T>[], options: Pick<FindOptions<any>, 'populateWhere'>): ObjectQuery<T>;
     protected buildOrderBy<T extends object>(qb: QueryBuilder<T>, meta: EntityMetadata<T>, populate: PopulateOptions<T>[], options: Pick<FindOptions<any>, 'strategy' | 'orderBy' | 'populateOrderBy'>): QueryOrderMap<T>[];
     protected buildPopulateOrderBy<T extends object>(qb: QueryBuilder<T>, meta: EntityMetadata<T>, populateOrderBy: QueryOrderMap<T>[], parentPath: string, explicit: boolean, parentAlias?: string): QueryOrderMap<T>[];
     protected buildJoinedPropsOrderBy<T extends object>(qb: QueryBuilder<T>, meta: EntityMetadata<T>, populate: PopulateOptions<T>[], options?: Pick<FindOptions<any>, 'strategy' | 'orderBy' | 'populateOrderBy'>, parentPath?: string): QueryOrderMap<T>[];

package/AbstractSqlDriver.js

@@ -34,6 +34,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false, options.logging);
         const fields = this.buildFields(meta, populate, joinedProps, qb, qb.alias, options);
         const orderBy = this.buildOrderBy(qb, meta, populate, options);
+        const populateWhere = this.buildPopulateWhere(meta, joinedProps, options);
         core_1.Utils.asArray(options.flags).forEach(flag => qb.setFlag(flag));
         if (core_1.Utils.isPrimaryKey(where, meta.compositePK)) {
             where = { [core_1.Utils.getPrimaryKeyHash(meta.primaryKeys)]: where };
@@ -43,7 +44,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         qb.__populateWhere = 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 ? options.populateWhere : undefined)
+            .populate(populate, joinedProps.length > 0 ? populateWhere : undefined)
             .where(where)
             .groupBy(options.groupBy)
             .having(options.having)
@@ -981,6 +982,31 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         qb.select((0, core_1.raw)('1')).where(cond).setLockMode(options.lockMode, options.lockTableAliases);
         await this.rethrow(qb.execute());
     }
+    buildPopulateWhere(meta, joinedProps, options) {
+        const where = {};
+        for (const hint of joinedProps) {
+            const [propName] = hint.field.split(':', 2);
+            const prop = meta.properties[propName];
+            if (!core_1.Utils.isEmpty(prop.where)) {
+                where[prop.name] = core_1.Utils.copy(prop.where);
+            }
+            if (hint.children) {
+                const inner = this.buildPopulateWhere(prop.targetMeta, hint.children, {});
+                if (!core_1.Utils.isEmpty(inner)) {
+                    where[prop.name] ??= {};
+                    Object.assign(where[prop.name], inner);
+                }
+            }
+        }
+        if (core_1.Utils.isEmpty(options.populateWhere)) {
+            return where;
+        }
+        if (core_1.Utils.isEmpty(where)) {
+            return options.populateWhere;
+        }
+        /* istanbul ignore next */
+        return { $and: [options.populateWhere, where] };
+    }
     buildOrderBy(qb, meta, populate, options) {
         const joinedProps = this.joinedProps(meta, populate, options);
         // `options._populateWhere` is a copy of the value provided by user with a fallback to the global config option

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.8-dev.15",
+  "version": "6.0.8-dev.16",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^6.0.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.8-dev.15"
+    "@mikro-orm/core": "6.0.8-dev.16"
   }
 }

package/query/QueryBuilderHelper.js

@@ -205,7 +205,11 @@ class QueryBuilderHelper {
             for (const key of Object.keys(join.cond)) {
                 const hasPrefix = key.includes('.') || core_1.Utils.isOperator(key) || core_1.RawQueryFragment.isKnownFragment(key);
                 const newKey = hasPrefix ? key : `${join.alias}.${key}`;
-                conditions.push(this.processJoinClause(newKey, join.cond[key], join.alias, params));
+                const clause = this.processJoinClause(newKey, join.cond[key], join.alias, params);
+                /* istanbul ignore else */
+                if (clause !== '()') {
+                    conditions.push(clause);
+                }
             }
             let sql = method + ' ';
             if (join.subquery) {