@mikro-orm/knex 6.4.2-dev.2 → 6.4.2-dev.4

package/AbstractSqlDriver.js

@@ -248,7 +248,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     relationPojo[prop.name] = root[alias];
                 }
             });
-            const targetProps = ref
+            const mapToPk = !!(ref || prop.mapToPk);
+            const targetProps = mapToPk
                 ? meta2.getPrimaryProps()
                 : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
             const tz = this.platform.getTimezone();
@@ -290,7 +291,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             for (const prop of targetProps) {
                 prop.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
             }
-            if (ref) {
+            if (mapToPk) {
                 const tmp = Object.values(relationPojo);
                 /* istanbul ignore next */
                 relationPojo = (meta2.compositePK ? tmp : tmp[0]);
@@ -870,6 +871,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             if (hint.filter && hint.strategy === core_1.LoadStrategy.JOINED) {
                 return true;
             }
+            // skip redundant joins for 1:1 owner population hints when using `mapToPk`
+            if (prop.kind === core_1.ReferenceKind.ONE_TO_ONE && prop.mapToPk && prop.owner) {
+                return false;
+            }
             if ((options?.strategy || hint.strategy || prop.strategy || this.config.get('loadStrategy')) !== core_1.LoadStrategy.JOINED) {
                 // force joined strategy for explicit 1:1 owner populate hint as it would require a join anyway
                 return prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner;
@@ -972,10 +977,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 }
             });
             const childExclude = exclude ? core_1.Utils.extractChildElements(exclude, prop.name) : exclude;
-            if (!ref) {
+            if (!ref && !prop.mapToPk) {
                 fields.push(...this.getFieldsForJoinedLoad(qb, meta2, childExplicitFields.length === 0 ? undefined : childExplicitFields, childExclude, hint.children, options, tableAlias, path, count));
             }
-            else if (hint.filter) {
+            else if (hint.filter || prop.mapToPk) {
                 fields.push(...prop.referencedColumnNames.map(col => qb.helper.mapper(`${tableAlias}.${col}`, qb.type, undefined, `${tableAlias}__${col}`)));
             }
         }

package/package.json

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