@mikro-orm/knex 6.0.0-dev.268 → 6.0.0-dev.269

package/AbstractSqlDriver.js

@@ -217,9 +217,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 }
                 return;
             }
-            const relationPojo = {};
+            let relationPojo = {};
             meta2.props
-                .filter(prop => prop.persist === false && prop.fieldNames)
+                .filter(prop => !ref && prop.persist === false && prop.fieldNames)
                 .filter(prop => !prop.lazy || populate.some(p => p.field === prop.name || p.all))
                 .forEach(prop => {
                 /* istanbul ignore if */
@@ -231,7 +231,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     relationPojo[prop.name] = root[alias];
                 }
             });
-            const props = meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
+            const props = ref
+                ? meta2.getPrimaryProps()
+                : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
             for (const prop1 of props) {
                 if (prop1.fieldNames.length > 1) { // composite keys
                     const fk = prop1.fieldNames.map(name => root[`${relationAlias}__${name}`]);
@@ -251,6 +253,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             for (const prop1 of props) {
                 prop1.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
             }
+            if (ref) {
+                const tmp = Object.values(relationPojo);
+                relationPojo = meta2.compositePK ? tmp : tmp[0];
+            }
             if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(prop.kind)) {
                 result[prop.name] ??= [];
                 result[prop.name].push(relationPojo);
@@ -764,8 +770,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 return false;
             }
             if (ref) {
-                // keep only pivot ref joins here, as that only triggers actual join
-                return prop.kind === core_1.ReferenceKind.MANY_TO_MANY;
+                return [core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(prop.kind);
             }
             return ![core_1.ReferenceKind.SCALAR, core_1.ReferenceKind.EMBEDDED].includes(prop.kind);
         });
@@ -847,6 +852,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             if (pivotRefJoin) {
                 fields.push(...prop.joinColumns.map(col => qb.helper.mapper(`${tableAlias}.${col}`, qb.type, undefined, `${tableAlias}__${col}`)), ...prop.inverseJoinColumns.map(col => qb.helper.mapper(`${tableAlias}.${col}`, qb.type, undefined, `${tableAlias}__${col}`)));
             }
+            if (prop.kind === core_1.ReferenceKind.ONE_TO_MANY && ref) {
+                fields.push(...this.getFieldsForJoinedLoad(qb, meta2, prop.referencedColumnNames, hint.children, options, tableAlias, path));
+            }
             const childExplicitFields = explicitFields?.filter(f => core_1.Utils.isPlainObject(f)).map(o => o[prop.name])[0] || [];
             explicitFields?.forEach(f => {
                 if (typeof f === 'string' && f.startsWith(`${prop.name}.`)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.268",
+  "version": "6.0.0-dev.269",
   "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.268"
+    "@mikro-orm/core": "6.0.0-dev.269"
   }
 }