fix(mongo): fix using custom field name on relations

Closes #1279
mikro-orm · Jan 7, 2021 · 44becca · 44becca
1 parent 4924e55
commit 44becca
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/packages/mongodb/src/MongoDriver.ts b/packages/mongodb/src/MongoDriver.ts
@@ -210,11 +210,6 @@ export class MongoDriver extends DatabaseDriver<MongoConnection> {
 
       if (meta?.properties[k]) {
         const prop = meta.properties[k];
-
-        if (prop.fieldNames) {
-          Utils.renameKey(data, k, prop.fieldNames[0]);
-        }
-
         let isObjectId = false;
 
         if (prop.reference === ReferenceType.SCALAR) {
@@ -228,6 +223,10 @@ export class MongoDriver extends DatabaseDriver<MongoConnection> {
         if (isObjectId) {
           data[k] = this.convertObjectIds(data[k]);
         }
+
+        if (prop.fieldNames) {
+          Utils.renameKey(data, k, prop.fieldNames[0]);
+        }
       }
 
       if (Utils.isPlainObject(data[k]) && '$re' in data[k]) {