@mikro-orm/knex 6.0.0-dev.188 → 6.0.0-dev.189

package/AbstractSqlDriver.js

@@ -34,6 +34,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const fields = this.buildFields(meta, populate, joinedProps, qb, qb.alias, options.fields);
         const joinedPropsOrderBy = this.buildJoinedPropsOrderBy(entityName, qb, meta, joinedProps);
         const orderBy = [...core_1.Utils.asArray(options.orderBy), ...joinedPropsOrderBy];
+        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 };
         }
@@ -61,7 +62,6 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (options.lockMode) {
             qb.setLockMode(options.lockMode, options.lockTableAliases);
         }
-        core_1.Utils.asArray(options.flags).forEach(flag => qb.setFlag(flag));
         const result = await this.rethrow(qb.execute('all'));
         if (isCursorPagination && !first && !!last) {
             result.reverse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.188",
+  "version": "6.0.0-dev.189",
   "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": "^5.9.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.188"
+    "@mikro-orm/core": "6.0.0-dev.189"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -155,13 +155,16 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         const scalar = core_1.Utils.isPrimaryKey(this.payload) || this.payload instanceof RegExp || this.payload instanceof Date || customExpression;
         const operator = core_1.Utils.isPlainObject(this.payload) && Object.keys(this.payload).every(k => core_1.Utils.isOperator(k, false));
         const field = `${alias}.${this.prop.name}`;
+        const method = qb.hasFlag(core_1.QueryFlag.INFER_POPULATE) ? 'joinAndSelect' : 'join';
         if (this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY && (scalar || operator)) {
             qb.join(field, nestedAlias, undefined, enums_1.JoinType.pivotJoin, this.getPath());
         }
         else {
             const prev = qb._fields?.slice();
-            qb.join(field, nestedAlias, undefined, enums_1.JoinType.leftJoin, this.getPath());
-            qb._fields = prev;
+            qb[method](field, nestedAlias, undefined, enums_1.JoinType.leftJoin, this.getPath());
+            if (!qb.hasFlag(core_1.QueryFlag.INFER_POPULATE)) {
+                qb._fields = prev;
+            }
         }
         return nestedAlias;
     }

package/query/QueryBuilder.d.ts

@@ -132,6 +132,7 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
     setFlushMode(flushMode?: FlushMode): this;
     setFlag(flag: QueryFlag): this;
     unsetFlag(flag: QueryFlag): this;
+    hasFlag(flag: QueryFlag): boolean;
     cache(config?: boolean | number | [string, number]): this;
     /**
      * Adds index hint to the FROM clause.

package/query/QueryBuilder.js

@@ -186,7 +186,6 @@ class QueryBuilder {
         if (subquery) {
             this._joins[`${fromAlias}.${prop.name}#${alias}`].subquery = subquery;
         }
-        this.addSelect(this.getFieldsForJoinedLoad(prop, alias, fields));
         const populate = this._joinedProps.get(fromAlias);
         const item = { field: prop.name, strategy: core_1.LoadStrategy.JOINED, children: [] };
         if (populate) {
@@ -196,6 +195,7 @@ class QueryBuilder {
             this._populate.push(item);
         }
         this._joinedProps.set(alias, item);
+        this.addSelect(this.getFieldsForJoinedLoad(prop, alias, fields));
         return this;
     }
     leftJoinAndSelect(field, alias, cond = {}, fields, schema) {
@@ -212,8 +212,22 @@ class QueryBuilder {
     }
     getFieldsForJoinedLoad(prop, alias, explicitFields) {
         const fields = [];
+        const populate = [];
+        const joinKey = Object.keys(this._joins).find(join => join.endsWith(`#${alias}`));
+        if (joinKey) {
+            const path = this._joins[joinKey].path.split('.').slice(1);
+            let children = this._populate;
+            for (let i = 0; i < path.length; i++) {
+                const child = children.filter(hint => hint.field === path[i]);
+                if (child.length === 0) {
+                    break;
+                }
+                children = child.flatMap(c => c.children);
+            }
+            populate.push(...children);
+        }
         prop.targetMeta.props
-            .filter(prop => explicitFields ? explicitFields.includes(prop.name) || prop.primary : this.platform.shouldHaveColumn(prop, this._populate))
+            .filter(prop => explicitFields ? explicitFields.includes(prop.name) || prop.primary : this.platform.shouldHaveColumn(prop, populate))
             .forEach(prop => fields.push(...this.driver.mapPropToFieldNames(this, prop, alias)));
         return fields;
     }
@@ -337,7 +351,7 @@ class QueryBuilder {
         return this;
     }
     returning(fields) {
-        this._returning = fields != null ? core_1.Utils.asArray(fields) : fields;
+        this._returning = core_1.Utils.asArray(fields);
         return this;
     }
     /**
@@ -391,6 +405,9 @@ class QueryBuilder {
         this.flags.delete(flag);
         return this;
     }
+    hasFlag(flag) {
+        return this.flags.has(flag);
+    }
     cache(config = true) {
         this.ensureNotFinalized();
         this._cache = config;

package/typings.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import type { CheckCallback, Dictionary, EntityProperty, GroupOperator, RawQueryFragment, QBFilterQuery, QueryOrderMap, Type } from '@mikro-orm/core';
+import type { CheckCallback, Dictionary, EntityProperty, GroupOperator, RawQueryFragment, QBFilterQuery, QueryOrderMap, Type, QueryFlag } from '@mikro-orm/core';
 import type { JoinType, QueryType } from './query/enums';
 import type { DatabaseSchema, DatabaseTable } from './schema';
 export interface Table {
@@ -144,6 +144,9 @@ export interface IQueryBuilder<T> {
     getAliasForJoinPath(path: string): string | undefined;
     getNextAlias(entityName?: string): string;
     clone(reset?: boolean): IQueryBuilder<T>;
+    setFlag(flag: QueryFlag): this;
+    unsetFlag(flag: QueryFlag): this;
+    hasFlag(flag: QueryFlag): boolean;
 }
 export interface ICriteriaNode<T extends object> {
     readonly entityName: string;