fix(core): exclude collections from returning clause from em.upsert

Closes #4382
mikro-orm · May 23, 2023 · e342449 · e342449
1 parent 6cc708c
commit e342449
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/packages/core/src/EntityManager.ts b/packages/core/src/EntityManager.ts
@@ -632,7 +632,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
 
     if (!helper(entity).hasPrimaryKey()) {
       const pk = await this.driver.findOne(meta.className, where, {
-        fields: meta.hydrateProps.filter(p => !p.lazy && !(p.name in data!)).map(p => p.name) as EntityField<Entity>[],
+        fields: meta.comparableProps.filter(p => !p.lazy && !(p.name in data!)).map(p => p.name) as EntityField<Entity>[],
         ctx: em.transactionContext,
         convertCustomTypes: true,
       });
@@ -806,7 +806,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
       }
 
       const pks = await this.driver.find(meta.className, { $or: [...loadPK.values()] as Dictionary[] }, {
-        fields: meta.hydrateProps.filter(p => !p.lazy && !(p.name in data![0] && !add.has(p.name))).map(p => p.name),
+        fields: meta.comparableProps.filter(p => !p.lazy && !(p.name in data![0] && !add.has(p.name))).map(p => p.name),
         ctx: em.transactionContext,
         convertCustomTypes: true,
       });

diff --git a/packages/knex/src/AbstractSqlDriver.ts b/packages/knex/src/AbstractSqlDriver.ts
@@ -426,7 +426,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
         qb.insert(data as T)
           .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
           .merge(Object.keys(data).filter(f => !uniqueFields.includes(f)))
-          .returning(meta?.hydrateProps.filter(p => !p.lazy && !(p.name in data)).map(p => p.name) ?? '*');
+          .returning(meta?.comparableProps.filter(p => !p.lazy && !(p.name in data)).map(p => p.name) ?? '*');
       } else {
         qb.update(data).where(where);
       }
@@ -452,7 +452,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
       qb.insert(data)
         .onConflict(uniqueFields.map(p => meta.properties[p]?.fieldNames[0] ?? p))
         .merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)))
-        .returning(meta.hydrateProps.filter(p => !p.lazy && !(p.name in data[0])).map(p => p.name) ?? '*');
+        .returning(meta.comparableProps.filter(p => !p.lazy && !(p.name in data[0])).map(p => p.name) ?? '*');
       return qb.execute('run', false);
     }
 

diff --git a/tests/features/upsert/upsert.test.ts b/tests/features/upsert/upsert.test.ts
@@ -1,4 +1,7 @@
-import { MikroORM, Entity, PrimaryKey, ManyToOne, Property, SimpleLogger, Unique, Ref, ref, EventSubscriber, EventArgs } from '@mikro-orm/core';
+import {
+  MikroORM, Entity, PrimaryKey, ManyToOne, Property, SimpleLogger,
+  Unique, Ref, ref, EventSubscriber, EventArgs, OneToMany, Collection,
+} from '@mikro-orm/core';
 import { mockLogger } from '../../helpers';
 
 @Entity()
@@ -15,6 +18,9 @@ export class Author {
   @Property({ name: 'current_age' })
   age: number;
 
+  @OneToMany(() => Book, b => b.author)
+  books = new Collection<Book>(this);
+
   constructor(email: string, age: number) {
     this.email = email;
     this.age = age;