@mikro-orm/core 6.6.5-dev.1 → 6.6.5-dev.2

package/metadata/MetadataDiscovery.js

@@ -974,7 +974,8 @@ class MetadataDiscovery {
         let i = 1;
         Object.values(meta.properties).forEach(prop => {
             const newProp = { ...prop };
-            if (meta.root.properties[prop.name] && meta.root.properties[prop.name].type !== prop.type) {
+            const rootProp = meta.root.properties[prop.name];
+            if (rootProp && (rootProp.type !== prop.type || (rootProp.fieldNames && prop.fieldNames && !(0, Utils_1.compareArrays)(rootProp.fieldNames, prop.fieldNames)))) {
                 const name = newProp.name;
                 this.initFieldName(newProp, newProp.object);
                 newProp.name = name + '_' + (i++);
@@ -985,11 +986,11 @@ class MetadataDiscovery {
                 newProp.inherited = true;
                 return;
             }
-            if (prop.enum && prop.items && meta.root.properties[prop.name]?.items) {
-                newProp.items = Utils_1.Utils.unique([...meta.root.properties[prop.name].items, ...prop.items]);
+            if (prop.enum && prop.items && rootProp?.items) {
+                newProp.items = Utils_1.Utils.unique([...rootProp.items, ...prop.items]);
             }
             newProp.nullable = true;
-            newProp.inherited = !meta.root.properties[prop.name];
+            newProp.inherited = !rootProp;
             meta.root.addProperty(newProp);
         });
         meta.collection = meta.root.collection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.6.5-dev.1",
+  "version": "6.6.5-dev.2",
   "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",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.3",
     "globby": "11.1.0",
-    "mikro-orm": "6.6.5-dev.1",
+    "mikro-orm": "6.6.5-dev.2",
     "reflect-metadata": "0.2.2"
   }
 }