fix(core): ensure merging of data to already loaded entities won't fa…

…il in some cases Closes #4688
mikro-orm · Sep 12, 2023 · f6e8204 · f6e8204
1 parent 9496979
commit f6e8204
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/core/src/entity/EntityFactory.ts b/packages/core/src/entity/EntityFactory.ts
@@ -134,7 +134,7 @@ export class EntityFactory {
       const prop = meta.properties[key];
 
       if ([ReferenceType.MANY_TO_ONE, ReferenceType.ONE_TO_ONE].includes(prop.reference) && Utils.isPlainObject(data[prop.name])) {
-        diff2[key] = helper(entity[prop.name]).getPrimaryKey(options.convertCustomTypes);
+        diff2[key] = entity[prop.name] ? helper(entity[prop.name]).getPrimaryKey(options.convertCustomTypes) : null;
       }
 
       originalEntityData[key] = diff2[key] === null ? nullVal : diff2[key];