@mikro-orm/core 7.2.5-dev.9 → 7.2.6-dev.0

package/metadata/MetadataDiscovery.js

@@ -1506,6 +1506,9 @@ export class MetadataDiscovery {
             if (isInverseSideRelation && rootProp && rootProp.type !== prop.type) {
                 return;
             }
+            // a sibling matching the root property must not drop the column variants of already renamed siblings
+            newProp.stiFieldNames ??= rootProp?.stiFieldNames;
+            newProp.stiFieldNameMap ??= rootProp?.stiFieldNameMap;
             meta.root.addProperty(newProp);
         });
         meta.tableName = meta.root.tableName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.5-dev.9",
+  "version": "7.2.6-dev.0",
   "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/unit-of-work/ChangeSetPersister.js

@@ -502,7 +502,8 @@ export class ChangeSetPersister {
         }
         if (upsert) {
             for (const prop of meta.props) {
-                if (prop.customType && prop.name in mapped) {
+                // null is not converted, the same way the hydrator handles it
+                if (prop.customType && mapped[prop.name] != null) {
                     mapped[prop.name] = prop.customType.convertToJSValue(mapped[prop.name], this.#platform);
                 }
             }

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.9';
+    static #ORM_VERSION = '7.2.6-dev.0';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;