diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/utils/build-sql-column-definition.util.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/utils/build-sql-column-definition.util.ts index cdb25aaf021..622269573e9 100644 --- a/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/utils/build-sql-column-definition.util.ts +++ b/packages/twenty-server/src/engine/twenty-orm/workspace-schema-manager/utils/build-sql-column-definition.util.ts @@ -31,11 +31,7 @@ export const buildSqlColumnDefinition = ( parts.push('UNIQUE'); } - if ( - isDefined(column.default) && - column.default !== '' && - column.type !== 'tsvector' - ) { + if (isDefined(column.default) && column.type !== 'tsvector') { const safeDefault = sanitizeDefaultValue(column.default); parts.push(`DEFAULT ${safeDefault}`); diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-migration-runner-v2.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-migration-runner-v2.module.ts index 02dedd30461..129a343c507 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-migration-runner-v2.module.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-migration-runner-v2.module.ts @@ -31,23 +31,13 @@ import { WorkspaceSchemaObjectActionRunnerService } from 'src/engine/workspace-m WorkspaceMetadataObjectActionRunnerService, WorkspaceMetadataIndexActionRunnerService, WorkspaceMetadataFieldActionRunnerService, - WorkspaceSchemaObjectActionRunnerService, WorkspaceSchemaIndexActionRunnerService, - WorkspaceSchemaFieldActionRunnerService, WorkspaceMetadataMigrationRunnerService, WorkspaceSchemaMigrationRunnerService, WorkspaceMigrationRunnerV2Service, - ], - exports: [ - WorkspaceMigrationRunnerV2Service, - WorkspaceMetadataObjectActionRunnerService, - WorkspaceMetadataIndexActionRunnerService, - WorkspaceMetadataFieldActionRunnerService, WorkspaceSchemaObjectActionRunnerService, - WorkspaceSchemaIndexActionRunnerService, WorkspaceSchemaFieldActionRunnerService, - WorkspaceMetadataMigrationRunnerService, - WorkspaceSchemaMigrationRunnerService, ], + exports: [WorkspaceMigrationRunnerV2Service], }) export class WorkspaceMigrationRunnerV2Module {} diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-schema-migration-runner/workspace-schema-object-action-runner.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-schema-migration-runner/workspace-schema-object-action-runner.service.ts index 5d1f6bd5c0d..77dd73d6572 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-schema-migration-runner/workspace-schema-object-action-runner.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/workspace-schema-migration-runner/workspace-schema-object-action-runner.service.ts @@ -49,14 +49,17 @@ export class WorkspaceSchemaObjectActionRunnerService tableName, }); - const enumFlatFieldMetadatas = Object.values( + const enumOrCompositeFlatFieldMetadatas = Object.values( flatObjectMetadataWithFlatFieldMaps.fieldsById, ) .filter((field): field is FlatFieldMetadata => field != null) - .filter((field) => isEnumFlatFieldMetadata(field)); + .filter( + (field) => + isEnumFlatFieldMetadata(field) || isCompositeFlatFieldMetadata(field), + ); const enumOperations = collectEnumOperationsForObject({ - flatFieldMetadatas: enumFlatFieldMetadatas, + flatFieldMetadatas: enumOrCompositeFlatFieldMetadatas, tableName, operation: EnumOperation.DROP, });