Skip to content

The open alternative to Salesforce, designed for AI.

fix: validate enum values before opening transaction in alterEnumValues (#20376)

Weikocb0b71dbdc04
diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/services/workspace-schema-enum-manager.service.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/services/workspace-schema-enum-manager.service.ts
index 886e457ae3d..e0a0760eb8f 100644
--- a/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/services/workspace-schema-enum-manager.service.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/services/workspace-schema-enum-manager.service.ts
@@ -129,12 +129,6 @@ export class WorkspaceSchemaEnumManagerService {
enumValues: string[];
oldToNewEnumOptionMap: Record<string, string>;
}): Promise<void> {
- const isTransactionAlreadyActive = queryRunner.isTransactionActive;
-
- if (!isTransactionAlreadyActive) {
- await queryRunner.startTransaction();
- }
-
if (!enumValues || enumValues.length === 0) {
throw new WorkspaceSchemaManagerException(
`Cannot alter enum values for column ${columnDefinition.name} because it has no enum values`,
@@ -142,6 +136,12 @@ export class WorkspaceSchemaEnumManagerService {
);
}
+ const isTransactionAlreadyActive = queryRunner.isTransactionActive;
+
+ if (!isTransactionAlreadyActive) {
+ await queryRunner.startTransaction();
+ }
+
try {
const columnName = columnDefinition.name;