@mikro-orm/core 7.2.5-dev.8 → 7.2.5-dev.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.5-dev.8",
+  "version": "7.2.5-dev.9",
   "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.",
   "keywords": [
     "data-mapper",

package/utils/EntityComparator.js

@@ -366,8 +366,16 @@ export class EntityComparator {
                 if (prop.renamedFrom) {
                     lines.push(`${padding}  ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
                     defined = `${this.propName(prop.fieldNames[0])} != null`;
-                    // a column shared with a differently typed subtype is left for each subtype's hydrator to convert
-                    if (meta.props.some(p => p !== prop && p.name === prop.name && p.fieldNames?.[0] === prop.fieldNames[0])) {
+                    const sharesColumn = meta.props.some(p => p !== prop && p.name === prop.name && p.fieldNames?.[0] === prop.fieldNames[0]);
+                    // hydrators expect mapped embeddable keys, so a shared object embeddable is mapped only for its own subtypes
+                    if (sharesColumn && prop.kind === ReferenceKind.EMBEDDED && prop.object && meta.discriminatorMap) {
+                        const owners = Object.entries(meta.discriminatorMap)
+                            .filter(([, cls]) => this.#metadata.find(cls)?.properties[prop.name]?.targetMeta === prop.targetMeta)
+                            .map(([value]) => `${this.propName(meta.discriminatorColumn)} == ${JSON.stringify(value)}`);
+                        defined += ` && (${owners.join(' || ')})`;
+                    }
+                    else if (sharesColumn) {
+                        // a column shared with a differently typed subtype is left for each subtype's hydrator to convert
                         lines.push(`${padding}  if (${defined}) {`);
                         lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])};`);
                         lines.push(`${padding}  }`);

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.5-dev.8';
+    static #ORM_VERSION = '7.2.5-dev.9';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;