Fix - revert standard sync logic on index + fix command (#16421)
This commit is contained in:
+49
-48
@@ -1,17 +1,18 @@
|
||||
import { Logger } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
|
||||
|
||||
import { Command } from 'nest-commander';
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
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';
|
||||
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
|
||||
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
|
||||
import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
|
||||
import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
|
||||
import { generateDeterministicIndexNameV2 } from 'src/engine/metadata-modules/index-metadata/utils/generate-deterministic-index-name-v2';
|
||||
import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace.datasource';
|
||||
import { generateFlatIndexMetadataWithNameOrThrow } from 'src/engine/metadata-modules/index-metadata/utils/generate-flat-index.util';
|
||||
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
|
||||
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
|
||||
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
|
||||
@@ -27,10 +28,10 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration
|
||||
@InjectRepository(WorkspaceEntity)
|
||||
protected readonly workspaceRepository: Repository<WorkspaceEntity>,
|
||||
protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
|
||||
@InjectRepository(IndexMetadataEntity)
|
||||
private readonly indexMetadataRepository: Repository<IndexMetadataEntity>,
|
||||
protected readonly dataSourceService: DataSourceService,
|
||||
protected readonly workspaceCacheService: WorkspaceCacheService,
|
||||
protected readonly dataSourceService: DataSourceService,
|
||||
@InjectDataSource()
|
||||
private readonly coreDataSource: DataSource,
|
||||
) {
|
||||
super(workspaceRepository, twentyORMGlobalManager, dataSourceService);
|
||||
}
|
||||
@@ -54,27 +55,30 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration
|
||||
this.logger.log('Dry run mode: No changes will be applied');
|
||||
}
|
||||
|
||||
const indexes = await this.indexMetadataRepository.find({
|
||||
where: {
|
||||
workspaceId,
|
||||
},
|
||||
relations: ['objectMetadata', 'indexFieldMetadatas.fieldMetadata'],
|
||||
});
|
||||
const { flatIndexMaps, flatObjectMetadataMaps, flatFieldMetadataMaps } =
|
||||
await this.workspaceCacheService.getOrRecompute(workspaceId, [
|
||||
'flatIndexMaps',
|
||||
'flatObjectMetadataMaps',
|
||||
'flatFieldMetadataMaps',
|
||||
]);
|
||||
|
||||
let hasIndexNameChanges = false;
|
||||
|
||||
for (const index of indexes) {
|
||||
const indexNameV2 = generateDeterministicIndexNameV2({
|
||||
flatObjectMetadata: {
|
||||
nameSingular: index.objectMetadata.nameSingular,
|
||||
isCustom: index.objectMetadata.isCustom,
|
||||
},
|
||||
relatedFieldNames: index.indexFieldMetadatas.map(
|
||||
(indexFieldMetadata) => ({
|
||||
name: indexFieldMetadata.fieldMetadata.name,
|
||||
}),
|
||||
),
|
||||
isUnique: index.isUnique,
|
||||
for (const index of Object.values(flatIndexMaps.byId).filter(isDefined)) {
|
||||
const flatObjectMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({
|
||||
flatEntityId: index.objectMetadataId,
|
||||
flatEntityMaps: flatObjectMetadataMaps,
|
||||
});
|
||||
|
||||
const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({
|
||||
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
|
||||
flatEntityMaps: flatFieldMetadataMaps,
|
||||
});
|
||||
|
||||
const { name: indexNameV2 } = generateFlatIndexMetadataWithNameOrThrow({
|
||||
flatObjectMetadata,
|
||||
objectFlatFieldMetadatas: flatFieldMetadatas,
|
||||
flatIndex: index,
|
||||
});
|
||||
|
||||
if (indexNameV2 === index.name) {
|
||||
@@ -84,16 +88,27 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration
|
||||
this.logger.log(`Renaming index ${index.name} to ${indexNameV2}`);
|
||||
hasIndexNameChanges = true;
|
||||
if (!isDryRun) {
|
||||
await this.renameIndexOnDatabase(
|
||||
dataSource,
|
||||
schemaName,
|
||||
index.name,
|
||||
indexNameV2,
|
||||
);
|
||||
const queryRunner = this.coreDataSource.createQueryRunner();
|
||||
|
||||
await this.indexMetadataRepository.update(index.id, {
|
||||
name: indexNameV2,
|
||||
});
|
||||
await queryRunner.connect();
|
||||
await queryRunner.startTransaction();
|
||||
|
||||
try {
|
||||
await queryRunner.query(
|
||||
`ALTER INDEX "${schemaName}"."${index.name}" RENAME TO "${indexNameV2}"`,
|
||||
);
|
||||
|
||||
await queryRunner.manager.update(IndexMetadataEntity, index.id, {
|
||||
name: indexNameV2,
|
||||
});
|
||||
|
||||
await queryRunner.commitTransaction();
|
||||
} catch (error) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
throw error;
|
||||
} finally {
|
||||
await queryRunner.release();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -108,18 +123,4 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async renameIndexOnDatabase(
|
||||
dataSource: WorkspaceDataSource,
|
||||
schemaName: string,
|
||||
oldIndexName: string,
|
||||
newIndexName: string,
|
||||
): Promise<void> {
|
||||
await dataSource.query(
|
||||
`ALTER INDEX "${schemaName}"."${oldIndexName}" RENAME TO "${newIndexName}"`,
|
||||
[],
|
||||
undefined,
|
||||
{ shouldBypassPermissionChecks: true },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user