Merge branch 'next' into develop

packages/core/database/src/__tests__/repository/update.test.ts

@@ -87,6 +87,40 @@ describe('update', () => {
     await db.sync();
   });
 
+  it('should update collection that without primary key', async () => {
+    const collection = db.collection({
+      name: 'without_pk',
+      autoGenId: false,
+      timestamps: false,
+      fields: [{ type: 'string', name: 'nameWithUnderscore' }],
+    });
+
+    await collection.sync();
+
+    await collection.repository.create({
+      values: {
+        nameWithUnderscore: 'item1',
+      },
+    });
+
+    await collection.repository.update({
+      values: {
+        nameWithUnderscore: 'item2',
+      },
+      filter: {
+        nameWithUnderscore: 'item1',
+      },
+    });
+
+    const item = await collection.repository.findOne({
+      filter: {
+        nameWithUnderscore: 'item2',
+      },
+    });
+
+    expect(item).toBeDefined();
+  });
+
   it('should throw error when update data conflicted', async () => {
     const t1 = await Tag.repository.create({
       values: {

packages/core/database/src/repository.ts

@@ -22,6 +22,7 @@ import {
   FindOptions as SequelizeFindOptions,
   UpdateOptions as SequelizeUpdateOptions,
   Transactionable,
+  Utils,
   WhereOperators,
 } from 'sequelize';
 
@@ -420,6 +421,10 @@ export class Repository<TModelAttributes extends {} = any, TCreationAttributes e
 
       rows = eagerLoadingTree.root.instances;
     } else {
+      if (opts.where && model.primaryKeyAttributes.length === 0) {
+        opts.where = Utils.mapWhereFieldNames(opts.where, model);
+      }
+
       rows = await model.findAll({
         ...opts,
         transaction,