fix(query-builder): allow passing array of keys to `qb.onConflict().m…

…erge()` Related: #1774
mikro-orm · May 12, 2021 · e4a1cf0 · e4a1cf0
1 parent b33be4a
commit e4a1cf0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/knex/src/query/QueryBuilder.ts b/packages/knex/src/query/QueryBuilder.ts
@@ -67,7 +67,7 @@ export class QueryBuilder<T extends AnyEntity<T> = AnyEntity> {
   private _orderBy: QueryOrderMap = {};
   private _groupBy: Field<T>[] = [];
   private _having: Dictionary = {};
-  private _onConflict?: { fields: string[]; ignore?: boolean; merge?: EntityData<T>; where?: QBFilterQuery<T> }[];
+  private _onConflict?: { fields: string[]; ignore?: boolean; merge?: EntityData<T> | Field<T>[]; where?: QBFilterQuery<T> }[];
   private _limit?: number;
   private _offset?: number;
   private _joinedProps = new Map<string, PopulateOptions<any>>();
@@ -261,7 +261,7 @@ export class QueryBuilder<T extends AnyEntity<T> = AnyEntity> {
     return this;
   }
 
-  merge(data?: EntityData<T>): this {
+  merge(data?: EntityData<T> | Field<T>[]): this {
     this._onConflict![this._onConflict!.length - 1].merge = data;
     return this;
   }

diff --git a/tests/QueryBuilder.test.ts b/tests/QueryBuilder.test.ts
@@ -1180,7 +1180,7 @@ describe('QueryBuilder', () => {
     expect(qb3.getParams()).toEqual([123]);
   });
 
-  test('insert on conflict ignore/merge', async () => {
+  test('insert on conflict ignore/merge (GH #1774)', async () => {
     const qb0 = orm.em.createQueryBuilder(Author2);
     qb0.insert({ email: 'ignore@example.com', name: 'John Doe' }).onConflict('email').ignore();
     expect(qb0.getQuery()).toEqual('insert ignore into `author2` (`email`, `name`) values (?, ?)');
@@ -1215,6 +1215,19 @@ describe('QueryBuilder', () => {
 
     expect(qb2.getQuery()).toEqual('insert into `author2` (`created_at`, `email`, `name`, `updated_at`) values (?, ?, ?, ?) on duplicate key update `created_at` = values(`created_at`), `email` = values(`email`), `name` = values(`name`), `updated_at` = values(`updated_at`)');
     expect(qb2.getParams()).toEqual([timestamp, 'ignore@example.com', 'John Doe', timestamp]);
+
+    const qb3 = orm.em.createQueryBuilder(Author2)
+      .insert({
+        createdAt: timestamp,
+        email: 'ignore@example.com',
+        name: 'John Doe',
+        updatedAt: timestamp,
+      })
+      .onConflict('email')
+      .merge(['name']);
+
+    expect(qb3.getQuery()).toEqual('insert into `author2` (`created_at`, `email`, `name`, `updated_at`) values (?, ?, ?, ?) on duplicate key update `name` = values(`name`)');
+    expect(qb3.getParams()).toEqual([timestamp, 'ignore@example.com', 'John Doe', timestamp]);
   });
 
   test('insert many query', async () => {