fix TypeORM error "Empty criteria(s) are not allowed for the delete method."
- https://github.com/typeorm/typeorm/issues/11455 - https://github.com/typeorm/typeorm/pull/11459
This commit is contained in:
parent
23594d7373
commit
8cc3b8dd1e
11 changed files with 27 additions and 27 deletions
|
|
@ -166,10 +166,10 @@ describe('AbuseReportNotificationService', () => {
|
|||
emailService.sendEmail.mockClear();
|
||||
webhookService.enqueueSystemWebhook.mockClear();
|
||||
|
||||
await usersRepository.delete({});
|
||||
await userProfilesRepository.delete({});
|
||||
await systemWebhooksRepository.delete({});
|
||||
await abuseReportNotificationRecipientRepository.delete({});
|
||||
await usersRepository.deleteAll();
|
||||
await userProfilesRepository.deleteAll();
|
||||
await systemWebhooksRepository.deleteAll();
|
||||
await abuseReportNotificationRecipientRepository.deleteAll();
|
||||
});
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -116,10 +116,10 @@ describe('AnnouncementService', () => {
|
|||
|
||||
afterEach(async () => {
|
||||
await Promise.all([
|
||||
app.get(DI.metasRepository).delete({}),
|
||||
usersRepository.delete({}),
|
||||
announcementsRepository.delete({}),
|
||||
announcementReadsRepository.delete({}),
|
||||
app.get(DI.metasRepository).deleteAll(),
|
||||
usersRepository.deleteAll(),
|
||||
announcementsRepository.deleteAll(),
|
||||
announcementReadsRepository.deleteAll(),
|
||||
]);
|
||||
moderationLogService.log.mockReset();
|
||||
globalEventService.publishMainStream.mockReset();
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ describe('CustomEmojiService', () => {
|
|||
}
|
||||
|
||||
afterEach(async () => {
|
||||
await emojisRepository.delete({});
|
||||
await emojisRepository.deleteAll();
|
||||
});
|
||||
|
||||
describe('単独', () => {
|
||||
|
|
|
|||
|
|
@ -95,9 +95,9 @@ describe('FlashService', () => {
|
|||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await usersRepository.delete({});
|
||||
await userProfilesRepository.delete({});
|
||||
await flashsRepository.delete({});
|
||||
await usersRepository.deleteAll();
|
||||
await userProfilesRepository.deleteAll();
|
||||
await flashsRepository.deleteAll();
|
||||
cacheManagementService.clear();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -171,10 +171,10 @@ describe('RoleService', () => {
|
|||
|
||||
afterEach(async () => {
|
||||
await Promise.all([
|
||||
metasRepository.delete({}),
|
||||
usersRepository.delete({}),
|
||||
rolesRepository.delete({}),
|
||||
roleAssignmentsRepository.delete({}),
|
||||
metasRepository.deleteAll(),
|
||||
usersRepository.deleteAll(),
|
||||
rolesRepository.deleteAll(),
|
||||
roleAssignmentsRepository.deleteAll(),
|
||||
]);
|
||||
|
||||
cacheManagementService.clear();
|
||||
|
|
|
|||
|
|
@ -97,8 +97,8 @@ describe('SystemWebhookService', () => {
|
|||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await usersRepository.delete({});
|
||||
await systemWebhooksRepository.delete({});
|
||||
await usersRepository.deleteAll();
|
||||
await systemWebhooksRepository.deleteAll();
|
||||
queueService.systemWebhookDeliver.mockReset();
|
||||
cacheManagementService.clear();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ describe('UserSearchService', () => {
|
|||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await usersRepository.delete({});
|
||||
await usersRepository.deleteAll({});
|
||||
cacheManagementService.clear();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -93,8 +93,8 @@ describe('UserWebhookService', () => {
|
|||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await usersRepository.delete({});
|
||||
await userWebhooksRepository.delete({});
|
||||
await usersRepository.deleteAll({});
|
||||
await userWebhooksRepository.deleteAll({});
|
||||
queueService.userWebhookDeliver.mockReset();
|
||||
cacheManagementService.clear();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -110,8 +110,8 @@ describe('WebhookTestService', () => {
|
|||
userWebhookService.fetchWebhooks.mockClear();
|
||||
systemWebhookService.fetchSystemWebhooks.mockClear();
|
||||
|
||||
await userProfilesRepository.delete({});
|
||||
await usersRepository.delete({});
|
||||
await userProfilesRepository.deleteAll();
|
||||
await usersRepository.deleteAll();
|
||||
cacheManagementService.clear();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -146,8 +146,8 @@ describe('CheckModeratorsActivityProcessorService', () => {
|
|||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await userProfilesRepository.delete({});
|
||||
await usersRepository.delete({});
|
||||
await usersRepository.deleteAll();
|
||||
await userProfilesRepository.deleteAll();
|
||||
roleService.getModerators.mockReset();
|
||||
announcementService.create.mockReset();
|
||||
emailService.sendEmail.mockReset();
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ describe('/drive/files/create', () => {
|
|||
idService = module.get(IdService);
|
||||
|
||||
const usersRepository = module.get<UsersRepository>(DI.usersRepository);
|
||||
await usersRepository.delete({});
|
||||
await usersRepository.deleteAll();
|
||||
root = await usersRepository.insert({
|
||||
id: idService.gen(),
|
||||
username: 'root',
|
||||
|
|
@ -52,7 +52,7 @@ describe('/drive/files/create', () => {
|
|||
}).then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
|
||||
|
||||
const userProfilesRepository = module.get<UserProfilesRepository>(DI.userProfilesRepository);
|
||||
await userProfilesRepository.delete({});
|
||||
await userProfilesRepository.deleteAll();
|
||||
await userProfilesRepository.insert({
|
||||
userId: root.id,
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue