@mikro-orm/knex 6.6.5-dev.3 → 6.6.5-dev.5

package/AbstractSqlDriver.js

@@ -250,7 +250,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     relationPojo[prop.name] = root[alias];
                 }
             });
-            const mapToPk = !!(ref || prop.mapToPk);
+            const mapToPk = !hint.dataOnly && !!(ref || prop.mapToPk);
             const targetProps = mapToPk
                 ? meta2.getPrimaryProps()
                 : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
@@ -437,19 +437,21 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     }
                     if (prop.fieldNames.length > 1) {
                         const newFields = [];
-                        const allParam = [...core_1.Utils.asArray(row[prop.name]) ?? prop.fieldNames.map(() => null)];
+                        const rawParam = core_1.Utils.asArray(row[prop.name]) ?? prop.fieldNames.map(() => null);
+                        // Deep flatten nested arrays when needed (for deeply nested composite keys like Tag -> Comment -> Post -> User)
+                        const needsFlatten = rawParam.length !== prop.fieldNames.length && rawParam.some(v => Array.isArray(v));
+                        const allParam = needsFlatten ? core_1.Utils.flatten(rawParam, true) : rawParam;
                         // TODO(v7): instead of making this conditional here, the entity snapshot should respect `ownColumns`,
                         //  but that means changing the compiled PK getters, which might be seen as breaking
                         const columns = allParam.length > 1 ? prop.fieldNames : prop.ownColumns;
-                        const newParam = [];
+                        const param = [];
                         columns.forEach((field, idx) => {
                             if (usedDups.includes(field)) {
                                 return;
                             }
                             newFields.push(field);
-                            newParam.push(allParam[idx]);
+                            param.push(allParam[idx]);
                         });
-                        const param = core_1.Utils.flatten(newParam);
                         newFields.forEach((field, idx) => {
                             if (!duplicates.includes(field) || !usedDups.includes(field)) {
                                 params.push(param[idx]);
@@ -801,7 +803,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             fields,
             exclude: childExclude,
             orderBy: this.getPivotOrderBy(prop, pivotProp1, orderBy, options?.orderBy),
-            populate: [{ field: populateField, strategy: core_1.LoadStrategy.JOINED, joinType: query_1.JoinType.innerJoin, children: populate }],
+            populate: [{ field: populateField, strategy: core_1.LoadStrategy.JOINED, joinType: query_1.JoinType.innerJoin, children: populate, dataOnly: pivotProp1.mapToPk && !pivotJoin }],
             populateWhere: undefined,
             // @ts-ignore
             _populateWhere: 'infer',
@@ -989,10 +991,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 }
             });
             const childExclude = exclude ? core_1.Utils.extractChildElements(exclude, prop.name) : exclude;
-            if (!ref && !prop.mapToPk) {
+            if (!ref && (!prop.mapToPk || hint.dataOnly)) {
                 fields.push(...this.getFieldsForJoinedLoad(qb, meta2, childExplicitFields.length === 0 ? undefined : childExplicitFields, childExclude, hint.children, options, tableAlias, path));
             }
-            else if (hint.filter || prop.mapToPk || (ref && [core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind))) {
+            else if (hint.filter || (prop.mapToPk && !hint.dataOnly) || (ref && [core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind))) {
                 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.6.5-dev.3",
+  "version": "6.6.5-dev.5",
   "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.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.6.5-dev.3",
+    "@mikro-orm/core": "6.6.5-dev.5",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"