@mikro-orm/knex 6.6.7-dev.4 → 6.6.7-dev.6

package/AbstractSqlDriver.d.ts

@@ -19,7 +19,12 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     findVirtual<T extends object>(entityName: string, where: ObjectQuery<T>, options: FindOptions<T, any, any, any>): Promise<EntityData<T>[]>;
     countVirtual<T extends object>(entityName: string, where: ObjectQuery<T>, options: CountOptions<T, any>): Promise<number>;
     protected findFromVirtual<T extends object>(entityName: string, where: ObjectQuery<T>, options: FindOptions<T, any> | CountOptions<T, any>, type: QueryType): Promise<EntityData<T>[] | number>;
-    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any>, type: QueryType): Promise<T[] | number>;
+    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any, any, any>, type: QueryType): Promise<T[] | number>;
+    /**
+     * Virtual entities have no PKs, so to-many populate joins can't be deduplicated.
+     * Force balanced strategy to load to-many relations via separate queries.
+     */
+    private forceBalancedStrategy;
     mapResult<T extends object>(result: EntityData<T>, meta: EntityMetadata<T>, populate?: PopulateOptions<T>[], qb?: QueryBuilder<T, any, any, any>, map?: Dictionary): EntityData<T> | null;
     private mapJoinedProps;
     count<T extends object>(entityName: string, where: any, options?: CountOptions<T>): Promise<number>;

package/AbstractSqlDriver.js

@@ -140,6 +140,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             .comment(options.comments)
             .hintComment(options.hintComments);
         qb.where(where);
+        options = this.forceBalancedStrategy(options);
         const { first, last, before, after } = options;
         const isCursorPagination = [first, last, before, after].some(v => v != null);
         if (type !== query_1.QueryType.COUNT) {
@@ -171,6 +172,24 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         return res.map(row => this.mapResult(row, meta));
     }
+    /**
+     * Virtual entities have no PKs, so to-many populate joins can't be deduplicated.
+     * Force balanced strategy to load to-many relations via separate queries.
+     */
+    forceBalancedStrategy(options) {
+        const clearStrategy = (hints) => {
+            return hints.map(hint => ({
+                ...hint,
+                strategy: undefined,
+                children: hint.children ? clearStrategy(hint.children) : undefined,
+            }));
+        };
+        const opts = { ...options, strategy: 'balanced' };
+        if (Array.isArray(opts.populate)) {
+            opts.populate = clearStrategy(opts.populate);
+        }
+        return opts;
+    }
     mapResult(result, meta, populate = [], qb, map = {}) {
         const ret = super.mapResult(result, meta);
         /* istanbul ignore if */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.6.7-dev.4",
+  "version": "6.6.7-dev.6",
   "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.6.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.6.7-dev.4",
+    "@mikro-orm/core": "6.6.7-dev.6",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/ObjectCriteriaNode.js

@@ -83,7 +83,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
             const operator = core_1.Utils.isOperator(field);
             const isRawField = core_1.RawQueryFragment.isKnownFragment(field);
             // we need to keep the prefixing for formulas otherwise we would lose aliasing context when nesting inside group operators
-            const virtual = childNode.prop?.persist === false && !childNode.prop?.formula;
+            const virtual = childNode.prop?.persist === false && !childNode.prop?.formula && !!options?.type;
             // 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 && [core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(childNode.prop.kind);

package/query/QueryBuilder.js

@@ -398,7 +398,7 @@ class QueryBuilder {
         if (core_1.Utils.isString(cond)) {
             cond = { [(0, core_1.raw)(`(${cond})`, params)]: [] };
         }
-        cond = CriteriaNodeFactory_1.CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, cond).process(this);
+        cond = CriteriaNodeFactory_1.CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, cond).process(this, { type: 'having' });
         if (!this._having || !operator) {
             this._having = cond;
         }
@@ -1193,7 +1193,7 @@ class QueryBuilder {
         if (!this.flags.has(core_1.QueryFlag.DISABLE_PAGINATE) && this._groupBy.length === 0 && this.hasToManyJoins()) {
             this.flags.add(core_1.QueryFlag.PAGINATE);
         }
-        if (meta && this.flags.has(core_1.QueryFlag.PAGINATE) && (this._limit > 0 || this._offset > 0)) {
+        if (meta && !meta.virtual && this.flags.has(core_1.QueryFlag.PAGINATE) && (this._limit > 0 || this._offset > 0)) {
             this.wrapPaginateSubQuery(meta);
         }
         if (meta && (this.flags.has(core_1.QueryFlag.UPDATE_SUB_QUERY) || this.flags.has(core_1.QueryFlag.DELETE_SUB_QUERY))) {

package/schema/SchemaComparator.js

@@ -143,6 +143,7 @@ class SchemaComparator {
         if (this.diffComment(fromTable.comment, toTable.comment)) {
             tableDifferences.changedComment = toTable.comment;
             this.log(`table comment changed for ${tableDifferences.name}`, { fromTableComment: fromTable.comment, toTableComment: toTable.comment });
+            changes++;
         }
         const fromTableColumns = fromTable.getColumns();
         const toTableColumns = toTable.getColumns();

package/typings.d.ts

@@ -172,7 +172,7 @@ export interface ICriteriaNodeProcessOptions {
     matchPopulateJoins?: boolean;
     ignoreBranching?: boolean;
     preferNoBranch?: boolean;
-    type?: 'orderBy';
+    type?: 'orderBy' | 'having';
     filter?: boolean;
 }
 export interface ICriteriaNode<T extends object> {