@mikro-orm/knex 7.0.0-dev.23 → 7.0.0-dev.25

package/AbstractSqlDriver.d.ts

@@ -74,7 +74,7 @@ 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'>, count?: boolean): 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'>): Field<T>[];
 }
 interface FieldsForJoinedLoadOptions<T extends object> {
     explicitFields?: readonly Field<T>[];

package/AbstractSqlDriver.js

@@ -238,7 +238,6 @@ export class AbstractSqlDriver extends DatabaseDriver {
             let relationPojo = {};
             meta2.props
                 .filter(prop => !ref && prop.persist === false && prop.fieldNames)
-                .filter(prop => !prop.lazy || populate.some(p => p.field === prop.name || p.all))
                 .forEach(prop => {
                 /* v8 ignore next 3 */
                 if (prop.fieldNames.length > 1) { // composite keys
@@ -312,15 +311,20 @@ export class AbstractSqlDriver extends DatabaseDriver {
         });
     }
     async count(entityName, where, options = {}) {
-        const meta = this.metadata.find(entityName);
-        if (meta?.virtual) {
+        const meta = this.metadata.get(entityName);
+        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)
+        options = { populate: [], ...options };
+        const populate = options.populate;
+        const joinedProps = this.joinedProps(meta, populate, options);
+        const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false, options.logging);
+        const populateWhere = this.buildPopulateWhere(meta, joinedProps, options);
+        if (meta && !Utils.isEmpty(populate)) {
+            this.buildFields(meta, populate, joinedProps, qb, qb.alias, options);
+        }
+        qb.__populateWhere = options._populateWhere;
+        qb.indexHint(options.indexHint)
             .comment(options.comments)
             .hintComment(options.hintComments)
             .groupBy(options.groupBy)
@@ -328,9 +332,6 @@ export class AbstractSqlDriver extends DatabaseDriver {
             .populate(populate, joinedProps.length > 0 ? populateWhere : undefined, joinedProps.length > 0 ? options.populateFilter : undefined)
             .withSchema(this.getSchemaName(meta, options))
             .where(where);
-        if (meta && !Utils.isEmpty(populate)) {
-            this.buildFields(meta, populate, joinedProps, qb, qb.alias, options, true);
-        }
         if (options.em) {
             await qb.applyJoinedFilters(options.em, options.filters);
         }
@@ -941,9 +942,6 @@ export class AbstractSqlDriver extends DatabaseDriver {
             if (ref && !hint.filter && (prop.kind === ReferenceKind.MANY_TO_ONE || (prop.kind === ReferenceKind.ONE_TO_ONE && prop.owner))) {
                 continue;
             }
-            if (options.count && !options?.populateFilter?.[prop.name]) {
-                continue;
-            }
             const meta2 = this.metadata.find(prop.type);
             const pivotRefJoin = prop.kind === ReferenceKind.MANY_TO_MANY && ref;
             const tableAlias = qb.getNextAlias(prop.name);
@@ -1254,7 +1252,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         return false;
     }
-    buildFields(meta, populate, joinedProps, qb, alias, options, count = false) {
+    buildFields(meta, populate, joinedProps, qb, alias, options) {
         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);
@@ -1320,7 +1318,6 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 exclude: options.exclude,
                 populate,
                 parentTableAlias: alias,
-                count,
                 ...options,
             }));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.23",
+  "version": "7.0.0-dev.25",
   "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.",
   "type": "module",
   "exports": {
@@ -54,9 +54,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.5.1"
+    "@mikro-orm/core": "^6.5.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.23"
+    "@mikro-orm/core": "7.0.0-dev.25"
   }
 }

package/query/CriteriaNode.d.ts

@@ -20,7 +20,7 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
-    renameFieldToPK<T>(qb: IQueryBuilder<T>): string;
+    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
     getPath(addIndex?: boolean): string;
     private isPivotJoin;
     getPivotPath(path: string): string;

package/query/CriteriaNode.js

@@ -65,13 +65,13 @@ export class CriteriaNode {
             default: return false;
         }
     }
-    renameFieldToPK(qb) {
-        let joinAlias = qb.getAliasForJoinPath(this.getPath(), { matchPopulateJoins: true });
+    renameFieldToPK(qb, ownerAlias) {
+        const joinAlias = qb.getAliasForJoinPath(this.getPath(), { matchPopulateJoins: true });
         if (!joinAlias && this.parent && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) && this.prop.owner) {
-            joinAlias = qb.getAliasForJoinPath(this.parent.getPath());
-            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
+            const alias = qb.getAliasForJoinPath(this.parent.getPath()) ?? ownerAlias ?? qb.alias;
+            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
         }
-        const alias = joinAlias ?? qb.alias;
+        const alias = joinAlias ?? ownerAlias ?? qb.alias;
         if (this.prop.kind === ReferenceKind.MANY_TO_MANY) {
             return Utils.getPrimaryKeyHash(this.prop.inverseJoinColumns.map(col => `${alias}.${col}`));
         }

package/query/ObjectCriteriaNode.js

@@ -67,13 +67,14 @@ export class ObjectCriteriaNode extends CriteriaNode {
             const virtual = childNode.prop?.persist === false && !childNode.prop?.formula;
             // if key is missing, we are inside group operator and we need to prefix with alias
             const primaryKey = this.key && this.metadata.find(this.entityName)?.primaryKeys.includes(field);
+            const isToOne = childNode.prop && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(childNode.prop.kind);
             if (childNode.shouldInline(payload)) {
-                const childAlias = qb.getAliasForJoinPath(childNode.getPath(), options);
+                const childAlias = qb.getAliasForJoinPath(childNode.getPath(), { preferNoBranch: isToOne, ...options });
                 const a = qb.helper.isTableNameAliasRequired(qb.type) ? alias : undefined;
                 this.inlineChildPayload(o, payload, field, a, childAlias);
             }
             else if (childNode.shouldRename(payload)) {
-                this.inlineCondition(childNode.renameFieldToPK(qb), o, payload);
+                this.inlineCondition(childNode.renameFieldToPK(qb, alias), o, payload);
             }
             else if (isRawField) {
                 const rawField = RawQueryFragment.getKnownFragment(field);

package/query/QueryBuilder.js

@@ -285,7 +285,7 @@ export class QueryBuilder {
                     }
                 }
                 if (Utils.hasObjectKeys(join.cond)) {
-                    /* istanbul ignore next */
+                    /* v8 ignore next */
                     join.cond = { $and: [join.cond, cond] };
                 }
                 else {
@@ -1249,17 +1249,27 @@ export class QueryBuilder {
             return;
         }
         const joins = Object.values(this._joins);
+        const lookupParentGroup = (j) => {
+            return j.nested ?? (j.parent ? lookupParentGroup(j.parent) : undefined);
+        };
         for (const join of joins) {
             if (join.type === JoinType.innerJoin) {
-                const parentJoin = joins.find(j => j.alias === join.ownerAlias);
+                join.parent = joins.find(j => j.alias === join.ownerAlias);
                 // https://stackoverflow.com/a/56815807/3665878
-                if (parentJoin?.type === JoinType.leftJoin || parentJoin?.type === JoinType.nestedLeftJoin) {
-                    const nested = (parentJoin.nested ??= new Set());
+                if (join.parent?.type === JoinType.leftJoin || join.parent?.type === JoinType.nestedLeftJoin) {
+                    const nested = ((join.parent).nested ??= new Set());
                     join.type = join.type === JoinType.innerJoin
                         ? JoinType.nestedInnerJoin
                         : JoinType.nestedLeftJoin;
                     nested.add(join);
                 }
+                else if (join.parent?.type === JoinType.nestedInnerJoin) {
+                    const group = lookupParentGroup(join.parent);
+                    join.type = join.type === JoinType.innerJoin
+                        ? JoinType.nestedInnerJoin
+                        : JoinType.nestedLeftJoin;
+                    group?.add(join);
+                }
             }
         }
     }

package/query/QueryBuilderHelper.js

@@ -251,105 +251,6 @@ export class QueryBuilderHelper {
         }
         return { sql, params };
     }
-    // <<<<<<< HEAD
-    //   private processJoinClause(key: string, value: unknown, alias: string, params: Knex.Value[], operator = '$eq'): string {
-    //     if (Utils.isGroupOperator(key) && Array.isArray(value)) {
-    //       const parts = value.map(sub => {
-    //         return this.wrapQueryGroup(Object.keys(sub).map(k => this.processJoinClause(k, sub[k], alias, params)));
-    //       });
-    //       return this.wrapQueryGroup(parts, key);
-    //     }
-    //
-    //     const rawField = RawQueryFragment.getKnownFragment(key);
-    //
-    //     if (!rawField && !Utils.isOperator(key, false) && !this.isPrefixed(key)) {
-    //       key = `${alias}.${key}`;
-    //     }
-    //
-    //     if (this.isSimpleRegExp(value)) {
-    //       params.push(this.getRegExpParam(value));
-    //       return `${this.knex.ref(this.mapper(key))} like ?`;
-    //     }
-    //
-    //     if (value instanceof RegExp) {
-    //       value = this.platform.getRegExpValue(value);
-    //     }
-    //
-    //     if (Utils.isOperator(key, false) && Utils.isPlainObject(value)) {
-    //       const parts = Object.keys(value).map(k => this.processJoinClause(k, (value as Dictionary)[k], alias, params, key));
-    //
-    //       return key === '$not' ? `not ${this.wrapQueryGroup(parts)}` : this.wrapQueryGroup(parts);
-    //     }
-    //
-    //     if (Utils.isPlainObject(value) && Object.keys(value).every(k => Utils.isOperator(k, false))) {
-    //       const parts = Object.keys(value).map(op => this.processJoinClause(key, (value as Dictionary)[op], alias, params, op));
-    //
-    //       return this.wrapQueryGroup(parts);
-    //     }
-    //
-    //     const [fromAlias, fromField] = this.splitField(key as EntityKey);
-    //     const prop = this.getProperty(fromField, fromAlias);
-    //     operator = operator === '$not' ? '$eq' : operator;
-    //     const column = this.mapper(key, undefined, undefined, null);
-    //
-    //     if (value === null) {
-    //       return `${this.knex.ref(column)} is ${operator === '$ne' ? 'not ' : ''}null`;
-    //     }
-    //
-    //     if (operator === '$fulltext' && prop) {
-    //       const query = this.knex.raw(this.platform.getFullTextWhereClause(prop), {
-    //         column,
-    //         query: this.knex.raw('?'),
-    //       }).toSQL().toNative();
-    //       params.push(value as Knex.Value);
-    //
-    //       return query.sql;
-    //     }
-    //
-    //     const replacement = this.getOperatorReplacement(operator, { [operator]: value });
-    //
-    //     if (['$in', '$nin'].includes(operator) && Array.isArray(value)) {
-    //       params.push(...value as Knex.Value[]);
-    //       return `${this.knex.ref(column)} ${replacement} (${value.map(() => '?').join(', ')})`;
-    //     }
-    //
-    //     if (operator === '$exists') {
-    //       value = null;
-    //     }
-    //
-    //     if (rawField) {
-    //       let sql = rawField.sql.replaceAll(ALIAS_REPLACEMENT, alias);
-    //       params.push(...rawField.params as Knex.Value[]);
-    //       params.push(...Utils.asArray(value) as Knex.Value[]);
-    //
-    //       if ((Utils.asArray(value) as Knex.Value[]).length > 0) {
-    //         sql += ' = ?';
-    //       }
-    //
-    //       return sql;
-    //     }
-    //
-    //     if (value !== null) {
-    //       if (prop?.customType) {
-    //         value = prop.customType.convertToDatabaseValue(value, this.platform, { fromQuery: true, key, mode: 'query' });
-    //       }
-    //
-    //       params.push(value as Knex.Value);
-    //     }
-    //
-    //     return `${this.knex.ref(column)} ${replacement} ${value === null ? 'null' : '?'}`;
-    //   }
-    //
-    //   private wrapQueryGroup(parts: string[], operator = '$and') {
-    //     if (parts.length === 1) {
-    //       return parts[0];
-    //     }
-    //
-    //     return `(${parts.join(` ${GroupOperator[operator as keyof typeof GroupOperator]} `)})`;
-    //   }
-    //
-    //   mapJoinColumns(type: QueryType, join: JoinOptions): (string | Knex.Raw)[] {
-    // =======
     mapJoinColumns(type, join) {
         if (join.prop && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(join.prop.kind)) {
             return join.prop.fieldNames.map((_fieldName, idx) => {

package/typings.d.ts

@@ -27,6 +27,7 @@ export interface JoinOptions {
     cond_?: Dictionary;
     subquery?: string;
     nested?: Set<JoinOptions>;
+    parent?: JoinOptions;
 }
 export interface Column {
     name: string;
@@ -185,7 +186,7 @@ export interface ICriteriaNode<T extends object> {
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
-    renameFieldToPK<T>(qb: IQueryBuilder<T>): string;
+    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
     getPath(addIndex?: boolean): string;
     getPivotPath(path: string): string;
 }