@mikro-orm/knex 6.0.0-dev.93 → 6.0.0-dev.95

package/AbstractSqlDriver.js

@@ -662,8 +662,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const pk = core_1.Utils.getCompositeKeyHash(item, meta);
             if (map[pk]) {
                 joinedProps.forEach(hint => {
-                    if (Array.isArray(map[pk][hint.field]) && Array.isArray(item[hint.field])) {
-                        map[pk][hint.field].push(...item[hint.field]);
+                    // Sometimes we might join a M:N relation with additional filter on the target entity, and as a result, we get
+                    // the first result with `null` for all target values, which is mapped as empty array. When we see that happen,
+                    // we need to merge the results of the next item.
+                    if (Array.isArray(map[pk][hint.field]) && Array.isArray(item[hint.field]) && map[pk][hint.field].length === 0) {
+                        item[hint.field].forEach((el) => map[pk][hint.field].push(el));
                     }
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.93",
+  "version": "6.0.0-dev.95",
   "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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.8.0"
+    "@mikro-orm/core": "^5.8.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.93"
+    "@mikro-orm/core": "~6.0.0-dev.95"
   }
 }