@mikro-orm/knex 6.0.0-dev.264 → 6.0.0-dev.265

package/AbstractSqlDriver.js

@@ -231,25 +231,26 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     relationPojo[prop.name] = root[alias];
                 }
             });
-            meta2.props
-                .filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []))
-                .forEach(prop => {
-                if (prop.fieldNames.length > 1) { // composite keys
-                    const fk = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
-                    prop.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
-                    relationPojo[prop.name] = core_1.Utils.mapFlatCompositePrimaryKey(fk, prop);
+            const props = 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}`]);
+                    relationPojo[prop1.name] = core_1.Utils.mapFlatCompositePrimaryKey(fk, prop1);
                 }
-                else if (prop.runtimeType === 'Date') {
-                    const alias = `${relationAlias}__${prop.fieldNames[0]}`;
-                    relationPojo[prop.name] = (typeof root[alias] === 'string' ? new Date(root[alias]) : root[alias]);
-                    delete root[alias];
+                else if (prop1.runtimeType === 'Date') {
+                    const alias = `${relationAlias}__${prop1.fieldNames[0]}`;
+                    relationPojo[prop1.name] = (typeof root[alias] === 'string' ? new Date(root[alias]) : root[alias]);
                 }
                 else {
-                    const alias = `${relationAlias}__${prop.fieldNames[0]}`;
-                    relationPojo[prop.name] = root[alias];
-                    delete root[alias];
+                    const alias = `${relationAlias}__${prop1.fieldNames[0]}`;
+                    relationPojo[prop1.name] = root[alias];
                 }
-            });
+            }
+            // properties can be mapped to multiple places, e.g. when sharing a column in multiple FKs,
+            // so we need to delete them after everything is mapped from given level
+            for (const prop1 of props) {
+                prop1.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
+            }
             if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(prop.kind)) {
                 result[prop.name] ??= [];
                 result[prop.name].push(relationPojo);

package/package.json

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