@mikro-orm/knex 6.1.13-dev.29 → 6.1.13-dev.30

package/dialects/mssql/MsSqlTableCompiler.js

@@ -30,6 +30,7 @@ class MsSqlTableCompiler extends MonkeyPatchable_1.MonkeyPatchable.MsSqlTableCom
         });
     }
     dropForeign(columns, constraintName) {
+        /* istanbul ignore next */
         constraintName = constraintName
             ? this.formatter.wrap(constraintName)
             : this._indexCommand('foreign', this.tableNameRaw, columns);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.13-dev.29",
+  "version": "6.1.13-dev.30",
   "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.1.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.13-dev.29"
+    "@mikro-orm/core": "6.1.13-dev.30"
   }
 }

package/query/QueryBuilder.js

@@ -973,7 +973,7 @@ class QueryBuilder {
             }
         }
         for (const f of Object.keys(this._populateMap)) {
-            if (type === 'where') {
+            if (type === 'where' && this._joins[f]) {
                 const cols = this.helper.mapJoinColumns(this.type ?? enums_1.QueryType.SELECT, this._joins[f]);
                 for (const col of cols) {
                     ret.push(col);
@@ -1238,6 +1238,27 @@ class QueryBuilder {
         subSubQuery.__raw = true; // tag it as there is now way to check via `instanceof`
         this._limit = undefined;
         this._offset = undefined;
+        // remove joins that are not used for population or ordering to improve performance
+        const populate = new Set();
+        const orderByAliases = this._orderBy
+            .flatMap(hint => Object.keys(hint))
+            .map(k => k.split('.')[0]);
+        function addPath(hints, prefix = '') {
+            for (const hint of hints) {
+                const field = hint.field.split(':')[0];
+                populate.add((prefix ? prefix + '.' : '') + field);
+                if (hint.children) {
+                    addPath(hint.children, (prefix ? prefix + '.' : '') + field);
+                }
+            }
+        }
+        addPath(this._populate);
+        for (const [key, join] of Object.entries(this._joins)) {
+            const path = join.path?.replace(/\[populate]|\[pivot]|:ref/g, '').replace(new RegExp(`^${meta.className}.`), '');
+            if (!populate.has(path ?? '') && !orderByAliases.includes(join.alias)) {
+                delete this._joins[key];
+            }
+        }
         this.select(this._fields).where({ [core_1.Utils.getPrimaryKeyHash(meta.primaryKeys)]: { $in: subSubQuery } });
     }
     wrapModifySubQuery(meta) {