fix(core): support composite PKs in em.upsertMany()

Closes #4923
mikro-orm · Nov 17, 2023 · 85c38d4 · 85c38d4
1 parent c491af9
commit 85c38d4
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 2 deletions.
diff --git a/packages/core/src/EntityManager.ts b/packages/core/src/EntityManager.ts
@@ -893,7 +893,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
     });
 
     // skip if we got the PKs via returning statement (`rows`)
-    const uniqueFields = options.onConflictFields ?? (Utils.isPlainObject(allWhere![0]) ? Object.keys(allWhere![0]) : meta!.primaryKeys) as (keyof Entity)[];
+    const uniqueFields = options.onConflictFields ?? (Utils.isPlainObject(allWhere![0]) ? Object.keys(allWhere![0]).flatMap(key => Utils.splitPrimaryKeys(key)) : meta!.primaryKeys) as (keyof Entity)[];
     const returning = getOnConflictReturningFields(meta, data[0], uniqueFields, options) as string[];
     const reloadFields = returning.length > 0 && !this.getPlatform().usesReturningStatement();
 

diff --git a/packages/knex/src/AbstractSqlDriver.ts b/packages/knex/src/AbstractSqlDriver.ts
@@ -479,7 +479,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
     const meta = this.metadata.get<T>(entityName);
 
     if (options.upsert) {
-      const uniqueFields = options.onConflictFields ?? (Utils.isPlainObject(where[0]) ? Object.keys(where[0]) : meta!.primaryKeys) as (keyof T)[];
+      const uniqueFields = options.onConflictFields ?? (Utils.isPlainObject(where[0]) ? Object.keys(where[0]).flatMap(key => Utils.splitPrimaryKeys(key)) : meta!.primaryKeys) as (keyof T)[];
       const qb = this.createQueryBuilder<T>(entityName, options.ctx, 'write', options.convertCustomTypes).withSchema(this.getSchemaName(meta, options));
       const returning = getOnConflictReturningFields(meta, data[0], uniqueFields, options);
       qb.insert(data as T[])

diff --git a/tests/features/upsert/GH4923.test.ts b/tests/features/upsert/GH4923.test.ts
@@ -0,0 +1,57 @@
+import { Entity, IDatabaseDriver, MikroORM, PrimaryKey, Property, Utils } from '@mikro-orm/core';
+import { PLATFORMS } from '../../bootstrap';
+
+@Entity()
+class User {
+
+  @PrimaryKey()
+  foo!: number;
+
+  @PrimaryKey()
+  bar!: number;
+
+  @Property({ defaultRaw: `CURRENT_TIMESTAMP` })
+  createdAt?: Date;
+
+}
+
+const options = {
+  'sqlite': { dbName: ':memory:' },
+  'better-sqlite': { dbName: ':memory:' },
+  'mysql': { dbName: 'mikro_orm_upsert', port: 3308 },
+  'mariadb': { dbName: 'mikro_orm_upsert', port: 3309 },
+  'postgresql': { dbName: 'mikro_orm_upsert' },
+};
+
+describe.each(Utils.keys(options))('GH #4923 [%s]',  type => {
+  let orm: MikroORM;
+
+  beforeAll(async () => {
+    orm = await MikroORM.init<IDatabaseDriver>({
+      entities: [User],
+      driver: PLATFORMS[type],
+      ...options[type],
+    });
+    await orm.schema.refreshDatabase();
+  });
+
+  beforeEach(async () => {
+    await orm.schema.clearDatabase();
+    await orm.em.insert(User, { foo: 1, bar: 2 });
+  });
+
+  afterAll(() => orm.close());
+
+  test('GH #4923 em.upsert()', async () => {
+    const result = await orm.em.upsert(User, { foo: 1, bar: 2 });
+    expect(result).toBeInstanceOf(User);
+  });
+
+  test('GH #4923 em.upsertMany()', async () => {
+    const result = await orm.em.upsertMany(User, [
+      { foo: 1, bar: 2 },
+    ]);
+    expect(result).toHaveLength(1);
+  });
+
+});