@mikro-orm/knex 6.3.13-dev.12 → 6.3.13-dev.13

package/AbstractSqlDriver.d.ts

@@ -55,7 +55,8 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     protected getFieldsForJoinedLoad<T extends object>(qb: QueryBuilder<T, any, any, any>, meta: EntityMetadata<T>, explicitFields?: Field<T>[], exclude?: Field<T>[], populate?: PopulateOptions<T>[], options?: {
         strategy?: Options['loadStrategy'];
         populateWhere?: FindOptions<any>['populateWhere'];
-    }, parentTableAlias?: string, parentJoinPath?: string): Field<T>[];
+        populateFilter?: FindOptions<any>['populateFilter'];
+    }, parentTableAlias?: string, parentJoinPath?: string, count?: boolean): Field<T>[];
     /**
      * @internal
      */
@@ -76,5 +77,5 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     protected normalizeFields<T extends object>(fields: Field<T>[], prefix?: string): string[];
     protected processField<T extends object>(meta: EntityMetadata<T>, prop: EntityProperty<T> | undefined, field: string, ret: Field<T>[], populate: PopulateOptions<T>[], joinedProps: PopulateOptions<T>[], qb: QueryBuilder<T, any, any, any>): void;
     protected isPopulated<T extends object>(meta: EntityMetadata<T>, prop: EntityProperty<T>, hint: PopulateOptions<T>, name?: string): boolean;
-    protected buildFields<T extends object>(meta: EntityMetadata<T>, populate: PopulateOptions<T>[], joinedProps: PopulateOptions<T>[], qb: QueryBuilder<T, any, any, any>, alias: string, options: Pick<FindOptions<T, any, any, any>, 'strategy' | 'fields' | 'exclude'>): Field<T>[];
+    protected buildFields<T extends object>(meta: EntityMetadata<T>, populate: PopulateOptions<T>[], joinedProps: PopulateOptions<T>[], qb: QueryBuilder<T, any, any, any>, alias: string, options: Pick<FindOptions<T, any, any, any>, 'strategy' | 'fields' | 'exclude'>, count?: boolean): Field<T>[];
 }

package/AbstractSqlDriver.js

@@ -311,15 +311,21 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (meta?.virtual) {
             return this.countVirtual(entityName, where, options);
         }
+        const joinedProps = meta ? this.joinedProps(meta, options.populate ?? []) : [];
+        const populateWhere = meta ? this.buildPopulateWhere(meta, joinedProps, options) : undefined;
+        const populate = options.populate ?? [];
         const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false, options.logging)
             .indexHint(options.indexHint)
             .comment(options.comments)
             .hintComment(options.hintComments)
             .groupBy(options.groupBy)
             .having(options.having)
-            .populate(options.populate ?? [])
+            .populate(populate, joinedProps.length > 0 ? populateWhere : undefined, joinedProps.length > 0 ? options.populateFilter : undefined)
             .withSchema(this.getSchemaName(meta, options))
             .where(where);
+        if (meta && !core_1.Utils.isEmpty(populate)) {
+            this.buildFields(meta, populate, joinedProps, qb, qb.alias, options, true);
+        }
         return this.rethrow(qb.getCount());
     }
     async nativeInsert(entityName, data, options = {}) {
@@ -909,7 +915,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         return res;
     }
-    getFieldsForJoinedLoad(qb, meta, explicitFields, exclude, populate = [], options, parentTableAlias, parentJoinPath) {
+    getFieldsForJoinedLoad(qb, meta, explicitFields, exclude, populate = [], options, parentTableAlias, parentJoinPath, count) {
         const fields = [];
         const joinedProps = this.joinedProps(meta, populate, options);
         const shouldHaveColumn = (prop, populate, fields) => {
@@ -929,12 +935,15 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 .filter(prop => shouldHaveColumn(prop, populate, explicitFields))
                 .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, parentTableAlias)));
         }
-        joinedProps.forEach(hint => {
+        for (const hint of joinedProps) {
             const [propName, ref] = hint.field.split(':', 2);
             const prop = meta.properties[propName];
             // ignore ref joins of known FKs unless it's a filter hint
             if (ref && !hint.filter && (prop.kind === core_1.ReferenceKind.MANY_TO_ONE || (prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner))) {
-                return;
+                continue;
+            }
+            if (count && (!options?.populateFilter || !options.populateFilter[prop.name])) {
+                continue;
             }
             const meta2 = this.metadata.find(prop.type);
             const pivotRefJoin = prop.kind === core_1.ReferenceKind.MANY_TO_MANY && ref;
@@ -954,7 +963,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 fields.push(...prop.joinColumns.map(col => qb.helper.mapper(`${tableAlias}.${col}`, qb.type, undefined, `${tableAlias}__${col}`)), ...prop.inverseJoinColumns.map(col => qb.helper.mapper(`${tableAlias}.${col}`, qb.type, undefined, `${tableAlias}__${col}`)));
             }
             if (prop.kind === core_1.ReferenceKind.ONE_TO_MANY && ref) {
-                fields.push(...this.getFieldsForJoinedLoad(qb, meta2, prop.referencedColumnNames, undefined, hint.children, options, tableAlias, path));
+                fields.push(...this.getFieldsForJoinedLoad(qb, meta2, prop.referencedColumnNames, undefined, hint.children, options, tableAlias, path, count));
             }
             const childExplicitFields = explicitFields?.filter(f => core_1.Utils.isPlainObject(f)).map(o => o[prop.name])[0] || [];
             explicitFields?.forEach(f => {
@@ -964,12 +973,12 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             });
             const childExclude = exclude ? core_1.Utils.extractChildElements(exclude, prop.name) : exclude;
             if (!ref) {
-                fields.push(...this.getFieldsForJoinedLoad(qb, meta2, childExplicitFields.length === 0 ? undefined : childExplicitFields, childExclude, hint.children, options, tableAlias, path));
+                fields.push(...this.getFieldsForJoinedLoad(qb, meta2, childExplicitFields.length === 0 ? undefined : childExplicitFields, childExclude, hint.children, options, tableAlias, path, count));
             }
             else if (hint.filter) {
                 fields.push(...prop.referencedColumnNames.map(col => qb.helper.mapper(`${tableAlias}.${col}`, qb.type, undefined, `${tableAlias}__${col}`)));
             }
-        });
+        }
         return fields;
     }
     /**
@@ -1232,7 +1241,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         return false;
     }
-    buildFields(meta, populate, joinedProps, qb, alias, options) {
+    buildFields(meta, populate, joinedProps, qb, alias, options, count = false) {
         const lazyProps = meta.props.filter(prop => prop.lazy && !populate.some(p => this.isPopulated(meta, prop, p)));
         const hasLazyFormulas = meta.props.some(p => p.lazy && p.formula);
         const requiresSQLConversion = meta.props.some(p => p.customType?.convertToJSValueSQL && p.persist !== false);
@@ -1287,7 +1296,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         // add joined relations after the root entity fields
         if (joinedProps.length > 0) {
-            ret.push(...this.getFieldsForJoinedLoad(qb, meta, options.fields, options.exclude, populate, options, alias));
+            ret.push(...this.getFieldsForJoinedLoad(qb, meta, options.fields, options.exclude, populate, options, alias, undefined, count));
         }
         return core_1.Utils.unique(ret);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.13-dev.12",
+  "version": "6.3.13-dev.13",
   "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,7 +66,7 @@
     "@mikro-orm/core": "^6.3.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.13-dev.12",
+    "@mikro-orm/core": "6.3.13-dev.13",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -1172,7 +1172,6 @@ class QueryBuilder {
         let joins = Object.values(this._joins);
         for (const join of joins) {
             join.cond_ ??= join.cond;
-            // join.cond = {};
             join.cond = filter ? { ...join.cond } : {};
         }
         if (typeof this[key] === 'object') {