fix(core): ignore upsert with inlined embedded properties

Closes #5500
mikro-orm · Apr 24, 2024 · 7d2bed6 · 7d2bed6
1 parent 508389e
commit 7d2bed6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/packages/core/src/utils/upsert-utils.ts b/packages/core/src/utils/upsert-utils.ts
@@ -1,13 +1,15 @@
-import type { EntityData, EntityMetadata } from '../typings';
+import type { EntityData, EntityKey, EntityMetadata } from '../typings';
 import type { UpsertOptions } from '../drivers/IDatabaseDriver';
 
 /** @internal */
-export function getOnConflictFields<T>(data: EntityData<T>, uniqueFields: (keyof T)[], options: UpsertOptions<T>): (keyof T)[] {
+export function getOnConflictFields<T>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[], options: UpsertOptions<T>): (keyof T)[] {
   if (options.onConflictMergeFields) {
     return options.onConflictMergeFields;
   }
 
-  const keys = Object.keys(data).filter(f => !uniqueFields.includes(f as keyof T)) as (keyof T)[];
+  const keys = Object.keys(data).filter(f => {
+    return !uniqueFields.includes(f as keyof T) && !meta?.properties[f as EntityKey<T>]?.embeddable;
+  }) as (keyof T)[];
 
   if (options.onConflictExcludeFields) {
     return keys.filter(f => !options.onConflictExcludeFields!.includes(f));

diff --git a/packages/knex/src/AbstractSqlDriver.ts b/packages/knex/src/AbstractSqlDriver.ts
@@ -606,7 +606,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
           .returning(returning);
 
         if (!options.onConflictAction || options.onConflictAction === 'merge') {
-          const fields = getOnConflictFields(data, uniqueFields, options);
+          const fields = getOnConflictFields(meta, data, uniqueFields, options);
           qb.merge(fields);
         }
 
@@ -649,7 +649,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
         .returning(returning);
 
       if (!options.onConflictAction || options.onConflictAction === 'merge') {
-        const fields = getOnConflictFields(data[0], uniqueFields, options);
+        const fields = getOnConflictFields(meta, data[0], uniqueFields, options);
         qb.merge(fields);
       }
 

diff --git a/tests/features/upsert/upsert.test.ts b/tests/features/upsert/upsert.test.ts
@@ -519,6 +519,17 @@ describe.each(Utils.keys(options))('em.upsert [%s]',  type => {
   test('em.upsert(entity) with embeddable', async () => {
     const testEntity = orm.em.create(FooBarWithEmbeddable, { fooBarEmbeddable: {} });
 
+    await orm.em.upsert(testEntity);
+    orm.em.clear();
+
+    expect(testEntity.id).toBeDefined();
+
+    await orm.em.upsert(FooBarWithEmbeddable, { id: testEntity.id, fooBarEmbeddable: {} });
+  });
+
+  test('em.upsertMany(entity) with embeddable', async () => {
+    const testEntity = orm.em.create(FooBarWithEmbeddable, { fooBarEmbeddable: {} });
+
     await orm.em.upsert(testEntity);
 
     expect(testEntity.id).toBeDefined();