@mikro-orm/knex 5.9.5-dev.2 → 5.9.5

package/AbstractSqlDriver.js

@@ -173,19 +173,21 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     relationPojo[prop.name] = root[alias];
                 }
             });
-            meta2.props
-                .filter(prop => this.platform.shouldHaveColumn(prop, p.children || []))
-                .forEach(prop => {
+            const props = meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, p.children || []));
+            for (const prop of props) {
                 if (prop.fieldNames.length > 1) { // composite keys
                     relationPojo[prop.name] = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
-                    prop.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
                 }
                 else {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;
                     relationPojo[prop.name] = root[alias];
-                    delete 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 prop of props) {
+                prop.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
+            }
             if ([core_1.ReferenceType.MANY_TO_MANY, core_1.ReferenceType.ONE_TO_MANY].includes(relation.reference)) {
                 result[relation.name] = result[relation.name] || [];
                 result[relation.name].push(relationPojo);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.9.5-dev.2",
+  "version": "5.9.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",
@@ -63,12 +63,12 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.9.4"
+    "@mikro-orm/core": "^5.9.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "5.9.5-dev.2",
-    "@mikro-orm/entity-generator": "5.9.5-dev.2",
-    "@mikro-orm/migrations": "5.9.5-dev.2",
+    "@mikro-orm/core": "^5.0.0",
+    "@mikro-orm/entity-generator": "^5.0.0",
+    "@mikro-orm/migrations": "^5.0.0",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",