From d7c28d64557084f4a7f95453214eef0c16f3ffdf Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Mon, 9 Feb 2026 14:40:35 +0100 Subject: [PATCH] Fix file constraint migration (#17796) ## Summary - Wrap `AddFileEntityUniqueConstraint` migration in a SAVEPOINT try-catch so it doesn't break when duplicate `(workspaceId, applicationId, path)` rows exist in `core.file` - Extend `DeleteFileRecordsCommand` upgrade command to add the unique constraint after cleaning up file records --- .../1-17/1-17-delete-all-files.command.ts | 51 +++++++++++++++++-- ...032815802-addFileEntityUniqueConstraint.ts | 32 ++++++++++-- 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-delete-all-files.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-delete-all-files.command.ts index 3346b29d74..9629652eb0 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-delete-all-files.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-delete-all-files.command.ts @@ -1,8 +1,8 @@ import { Logger } from '@nestjs/common'; -import { InjectRepository } from '@nestjs/typeorm'; +import { InjectDataSource, InjectRepository } from '@nestjs/typeorm'; import { Command } from 'nest-commander'; -import { Repository } from 'typeorm'; +import { DataSource, Repository } from 'typeorm'; import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner'; import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner'; @@ -13,10 +13,12 @@ import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspac @Command({ name: 'upgrade:delete-file-records', - description: 'Delete all file records from FileRepository for workspace', + description: + 'Delete all file records and add unique constraint on file entity', }) export class DeleteFileRecordsCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { protected readonly logger = new Logger(DeleteFileRecordsCommand.name); + private hasAddedConstraint = false; constructor( @InjectRepository(WorkspaceEntity) @@ -25,11 +27,18 @@ export class DeleteFileRecordsCommand extends ActiveOrSuspendedWorkspacesMigrati private readonly fileRepository: Repository, protected readonly twentyORMGlobalManager: GlobalWorkspaceOrmManager, protected readonly dataSourceService: DataSourceService, + @InjectDataSource() + private readonly coreDataSource: DataSource, ) { super(workspaceRepository, twentyORMGlobalManager, dataSourceService); } - override async runOnWorkspace({ + override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise { + await this.deleteFileRecords(args); + await this.addFileEntityUniqueConstraint(args); + } + + private async deleteFileRecords({ workspaceId, options, }: RunOnWorkspaceArgs): Promise { @@ -75,4 +84,38 @@ export class DeleteFileRecordsCommand extends ActiveOrSuspendedWorkspacesMigrati throw error; } } + + private async addFileEntityUniqueConstraint({ + options, + }: RunOnWorkspaceArgs): Promise { + if (this.hasAddedConstraint) { + return; + } + + if (options.dryRun) { + return; + } + + const queryRunner = this.coreDataSource.createQueryRunner(); + + await queryRunner.connect(); + await queryRunner.startTransaction(); + + try { + await queryRunner.query( + `ALTER TABLE "core"."file" ADD CONSTRAINT "IDX_APPLICATION_PATH_WORKSPACE_ID_APPLICATION_ID_UNIQUE" UNIQUE ("workspaceId", "applicationId", "path")`, + ); + + await queryRunner.commitTransaction(); + this.logger.log('Successfully added file entity unique constraint'); + this.hasAddedConstraint = true; + } catch (error) { + await queryRunner.rollbackTransaction(); + this.logger.error( + `Rolling back addFileEntityUniqueConstraint: ${error.message}`, + ); + } finally { + await queryRunner.release(); + } + } } diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1770032815802-addFileEntityUniqueConstraint.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1770032815802-addFileEntityUniqueConstraint.ts index 59377efea0..e3d6a0e150 100644 --- a/packages/twenty-server/src/database/typeorm/core/migrations/common/1770032815802-addFileEntityUniqueConstraint.ts +++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1770032815802-addFileEntityUniqueConstraint.ts @@ -6,9 +6,35 @@ export class AddFileEntityUniqueConstraint1770032815802 name = 'AddFileEntityUniqueConstraint1770032815802'; public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query( - `ALTER TABLE "core"."file" ADD CONSTRAINT "IDX_APPLICATION_PATH_WORKSPACE_ID_APPLICATION_ID_UNIQUE" UNIQUE ("workspaceId", "applicationId", "path")`, - ); + const savepointName = 'sp_add_file_entity_unique_constraint'; + + try { + await queryRunner.query(`SAVEPOINT ${savepointName}`); + + await queryRunner.query( + `ALTER TABLE "core"."file" ADD CONSTRAINT "IDX_APPLICATION_PATH_WORKSPACE_ID_APPLICATION_ID_UNIQUE" UNIQUE ("workspaceId", "applicationId", "path")`, + ); + + await queryRunner.query(`RELEASE SAVEPOINT ${savepointName}`); + } catch (e) { + try { + await queryRunner.query(`ROLLBACK TO SAVEPOINT ${savepointName}`); + await queryRunner.query(`RELEASE SAVEPOINT ${savepointName}`); + } catch (rollbackError) { + // eslint-disable-next-line no-console + console.error( + 'Failed to rollback to savepoint in AddFileEntityUniqueConstraint1770032815802', + rollbackError, + ); + throw rollbackError; + } + + // eslint-disable-next-line no-console + console.error( + 'Swallowing AddFileEntityUniqueConstraint1770032815802 error', + e, + ); + } } public async down(queryRunner: QueryRunner): Promise {