Skip to content

The open alternative to Salesforce, designed for AI.

perf(server): index core foreign keys that cascade from workspace and application deletes (#26655)

Charles Bochet3d5a9d7cb26a
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-slow-1790343790126-add-core-foreign-key-indexes.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-slow-1790343790126-add-core-foreign-key-indexes.ts
new file mode 100644
index 00000000000..5577fff0e61
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-slow-1790343790126-add-core-foreign-key-indexes.ts
@@ -0,0 +1,107 @@
+import { DataSource, QueryRunner } from 'typeorm';
+
+import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
+import { SlowInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/slow-instance-command.interface';
+
+const CREATE_INDEX_QUERIES = [
+ 'CREATE INDEX IF NOT EXISTS "IDX_LOGIC_FUNCTION_APPLICATION_ID" ON "core"."logicFunction" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_VIEW_FIELD_GROUP_APPLICATION_ID" ON "core"."viewFieldGroup" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_VIEW_GROUP_APPLICATION_ID" ON "core"."viewGroup" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_VIEW_OBJECT_METADATA_ID_WORKSPACE_ID" ON "core"."view" ("objectMetadataId", "workspaceId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_VIEW_APPLICATION_ID" ON "core"."view" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_NAVIGATION_MENU_ITEM_TARGET_OBJECT_METADATA_ID" ON "core"."navigationMenuItem" ("targetObjectMetadataId") WHERE "targetObjectMetadataId" IS NOT NULL',
+ 'CREATE INDEX IF NOT EXISTS "IDX_NAVIGATION_MENU_ITEM_APPLICATION_ID" ON "core"."navigationMenuItem" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_PAGE_LAYOUT_WIDGET_APPLICATION_ID" ON "core"."pageLayoutWidget" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_PAGE_LAYOUT_TAB_APPLICATION_ID" ON "core"."pageLayoutTab" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_PAGE_LAYOUT_DEFAULT_TAB_TO_FOCUS_ID" ON "core"."pageLayout" ("defaultTabToFocusOnMobileAndSidePanelId") WHERE "defaultTabToFocusOnMobileAndSidePanelId" IS NOT NULL',
+ 'CREATE INDEX IF NOT EXISTS "IDX_PAGE_LAYOUT_OBJECT_METADATA_ID_WORKSPACE_ID" ON "core"."pageLayout" ("objectMetadataId", "workspaceId") WHERE "objectMetadataId" IS NOT NULL',
+ 'CREATE INDEX IF NOT EXISTS "IDX_PAGE_LAYOUT_APPLICATION_ID" ON "core"."pageLayout" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_COMMAND_MENU_ITEM_APPLICATION_ID" ON "core"."commandMenuItem" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_SEARCH_FIELD_METADATA_TS_VECTOR_FIELD_METADATA_ID" ON "core"."searchFieldMetadata" ("tsVectorFieldMetadataId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_SEARCH_FIELD_METADATA_APPLICATION_ID" ON "core"."searchFieldMetadata" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_OBJECT_METADATA_APPLICATION_ID" ON "core"."objectMetadata" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_INDEX_METADATA_APPLICATION_ID" ON "core"."indexMetadata" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_INDEX_METADATA_OBJECT_METADATA_ID_WORKSPACE_ID" ON "core"."indexMetadata" ("objectMetadataId", "workspaceId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_INDEX_FIELD_METADATA_INDEX_METADATA_ID" ON "core"."indexFieldMetadata" ("indexMetadataId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_FIELD_METADATA_APPLICATION_ID" ON "core"."fieldMetadata" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_VIEW_FIELD_APPLICATION_ID" ON "core"."viewField" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_APP_TOKEN_WORKSPACE_ID" ON "core"."appToken" ("workspaceId") WHERE "workspaceId" IS NOT NULL',
+ 'CREATE INDEX IF NOT EXISTS "IDX_APP_TOKEN_USER_ID" ON "core"."appToken" ("userId") WHERE "userId" IS NOT NULL',
+ 'CREATE INDEX IF NOT EXISTS "IDX_SKILL_APPLICATION_ID" ON "core"."skill" ("applicationId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_MESSAGE_FOLDER_WORKSPACE_ID" ON "core"."messageFolder" ("workspaceId")',
+ 'CREATE INDEX IF NOT EXISTS "IDX_MESSAGE_FOLDER_MESSAGE_CHANNEL_ID" ON "core"."messageFolder" ("messageChannelId")',
+ 'CREATE UNIQUE INDEX IF NOT EXISTS "IDX_FILE_APPLICATION_ID_WORKSPACE_ID_PATH_UNIQUE" ON "core"."file" ("applicationId", "workspaceId", "path")',
+ 'CREATE UNIQUE INDEX IF NOT EXISTS "IDX_SEARCH_FIELD_METADATA_FIELD_OBJECT_UNIQUE" ON "core"."searchFieldMetadata" ("fieldMetadataId", "objectMetadataId")',
+ 'CREATE UNIQUE INDEX IF NOT EXISTS "IDX_TIMELINE_ACTIVITY_TYPE_APPLICATION_WORKSPACE_NAME_UNIQUE" ON "core"."timelineActivityType" ("applicationId", "workspaceId", "name")',
+];
+
+@RegisteredInstanceCommand('2.43.0', 1790343790126, { type: 'slow' })
+export class AddCoreForeignKeyIndexesSlowInstanceCommand implements SlowInstanceCommand {
+ async runDataMigration(dataSource: DataSource): Promise<void> {
+ for (const query of CREATE_INDEX_QUERIES) {
+ await dataSource.query(query.replace(/ INDEX /, ' INDEX CONCURRENTLY '));
+ }
+ }
+
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ for (const query of CREATE_INDEX_QUERIES) {
+ await queryRunner.query(query);
+ }
+
+ await queryRunner.query('ALTER TABLE "core"."file" DROP CONSTRAINT "IDX_APPLICATION_PATH_WORKSPACE_ID_APPLICATION_ID_UNIQUE"');
+ await queryRunner.query('ALTER TABLE "core"."searchFieldMetadata" DROP CONSTRAINT "IDX_SEARCH_FIELD_METADATA_OBJECT_FIELD_UNIQUE"');
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" DROP CONSTRAINT "IDX_TIMELINE_ACTIVITY_TYPE_NAME_APPLICATION_WORKSPACE_UNIQUE"');
+ await queryRunner.query('ALTER TABLE "core"."file" ADD CONSTRAINT "IDX_FILE_APPLICATION_ID_WORKSPACE_ID_PATH_UNIQUE" UNIQUE USING INDEX "IDX_FILE_APPLICATION_ID_WORKSPACE_ID_PATH_UNIQUE"');
+ await queryRunner.query('ALTER TABLE "core"."searchFieldMetadata" ADD CONSTRAINT "IDX_SEARCH_FIELD_METADATA_FIELD_OBJECT_UNIQUE" UNIQUE USING INDEX "IDX_SEARCH_FIELD_METADATA_FIELD_OBJECT_UNIQUE"');
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" ADD CONSTRAINT "IDX_TIMELINE_ACTIVITY_TYPE_APPLICATION_WORKSPACE_NAME_UNIQUE" UNIQUE USING INDEX "IDX_TIMELINE_ACTIVITY_TYPE_APPLICATION_WORKSPACE_NAME_UNIQUE"');
+ await queryRunner.query('DROP INDEX "core"."IDX_FILE_APPLICATION_REGISTRATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_VIEW_WORKSPACE_ID_OBJECT_METADATA_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_PAGE_LAYOUT_WORKSPACE_ID_OBJECT_METADATA_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_SEARCH_FIELD_METADATA_WORKSPACE_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_INDEX_METADATA_WORKSPACE_ID_OBJECT_METADATA_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_FIELD_METADATA_OBJECT_METADATA_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_FIELD_METADATA_WORKSPACE_ID"');
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" DROP CONSTRAINT "IDX_TIMELINE_ACTIVITY_TYPE_APPLICATION_WORKSPACE_NAME_UNIQUE"');
+ await queryRunner.query('ALTER TABLE "core"."searchFieldMetadata" DROP CONSTRAINT "IDX_SEARCH_FIELD_METADATA_FIELD_OBJECT_UNIQUE"');
+ await queryRunner.query('ALTER TABLE "core"."file" DROP CONSTRAINT "IDX_FILE_APPLICATION_ID_WORKSPACE_ID_PATH_UNIQUE"');
+ await queryRunner.query('DROP INDEX "core"."IDX_MESSAGE_FOLDER_MESSAGE_CHANNEL_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_MESSAGE_FOLDER_WORKSPACE_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_SKILL_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_APP_TOKEN_USER_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_APP_TOKEN_WORKSPACE_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_VIEW_FIELD_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_FIELD_METADATA_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_INDEX_FIELD_METADATA_INDEX_METADATA_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_INDEX_METADATA_OBJECT_METADATA_ID_WORKSPACE_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_INDEX_METADATA_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_OBJECT_METADATA_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_SEARCH_FIELD_METADATA_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_SEARCH_FIELD_METADATA_TS_VECTOR_FIELD_METADATA_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_COMMAND_MENU_ITEM_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_PAGE_LAYOUT_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_PAGE_LAYOUT_OBJECT_METADATA_ID_WORKSPACE_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_PAGE_LAYOUT_DEFAULT_TAB_TO_FOCUS_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_PAGE_LAYOUT_TAB_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_PAGE_LAYOUT_WIDGET_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_NAVIGATION_MENU_ITEM_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_NAVIGATION_MENU_ITEM_TARGET_OBJECT_METADATA_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_VIEW_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_VIEW_OBJECT_METADATA_ID_WORKSPACE_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_VIEW_GROUP_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_VIEW_FIELD_GROUP_APPLICATION_ID"');
+ await queryRunner.query('DROP INDEX "core"."IDX_LOGIC_FUNCTION_APPLICATION_ID"');
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" ADD CONSTRAINT "IDX_TIMELINE_ACTIVITY_TYPE_NAME_APPLICATION_WORKSPACE_UNIQUE" UNIQUE ("name", "applicationId", "workspaceId")');
+ await queryRunner.query('ALTER TABLE "core"."searchFieldMetadata" ADD CONSTRAINT "IDX_SEARCH_FIELD_METADATA_OBJECT_FIELD_UNIQUE" UNIQUE ("objectMetadataId", "fieldMetadataId")');
+ await queryRunner.query('ALTER TABLE "core"."file" ADD CONSTRAINT "IDX_APPLICATION_PATH_WORKSPACE_ID_APPLICATION_ID_UNIQUE" UNIQUE ("workspaceId", "applicationId", "path")');
+ await queryRunner.query('CREATE INDEX "IDX_FIELD_METADATA_WORKSPACE_ID" ON "core"."fieldMetadata" ("workspaceId") ');
+ await queryRunner.query('CREATE INDEX "IDX_FIELD_METADATA_OBJECT_METADATA_ID" ON "core"."fieldMetadata" ("objectMetadataId") ');
+ await queryRunner.query('CREATE INDEX "IDX_INDEX_METADATA_WORKSPACE_ID_OBJECT_METADATA_ID" ON "core"."indexMetadata" ("workspaceId", "objectMetadataId") ');
+ await queryRunner.query('CREATE INDEX "IDX_SEARCH_FIELD_METADATA_WORKSPACE_ID" ON "core"."searchFieldMetadata" ("workspaceId") ');
+ await queryRunner.query('CREATE INDEX "IDX_PAGE_LAYOUT_WORKSPACE_ID_OBJECT_METADATA_ID" ON "core"."pageLayout" ("workspaceId", "objectMetadataId") WHERE ("deletedAt" IS NULL)');
+ await queryRunner.query('CREATE INDEX "IDX_VIEW_WORKSPACE_ID_OBJECT_METADATA_ID" ON "core"."view" ("workspaceId", "objectMetadataId") ');
+ await queryRunner.query('CREATE INDEX "IDX_FILE_APPLICATION_REGISTRATION_ID" ON "core"."file" ("applicationRegistrationId") ');
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
index cb1bcec7432..9d159167976 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
@@ -210,6 +210,7 @@ import { AddChatMessageSenderFastInstanceCommand } from 'src/database/commands/u
import { AddWorkspaceAllowedIframeOriginsFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790232481570-add-workspace-allowed-iframe-origins';
import { AddUsageLimitInstanceOverrideFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790245573467-add-usage-limit-instance-override';
import { EnforceWorkflowVersionCoreParentSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-slow-1790323148754-enforce-workflow-version-core-parent';
+import { AddCoreForeignKeyIndexesSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-slow-1790343790126-add-core-foreign-key-indexes';
export const INSTANCE_COMMANDS = [
AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,
@@ -422,4 +423,5 @@ export const INSTANCE_COMMANDS = [
AddWorkspaceAllowedIframeOriginsFastInstanceCommand,
AddUsageLimitInstanceOverrideFastInstanceCommand,
EnforceWorkflowVersionCoreParentSlowInstanceCommand,
+ AddCoreForeignKeyIndexesSlowInstanceCommand,
];
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
index dc6475bf924..bb162cab669 100644
--- a/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
@@ -30,6 +30,10 @@ export enum AppTokenType {
}
@Entity({ name: 'appToken', schema: 'core' })
+@Index('IDX_APP_TOKEN_USER_ID', ['userId'], { where: '"userId" IS NOT NULL' })
+@Index('IDX_APP_TOKEN_WORKSPACE_ID', ['workspaceId'], {
+ where: '"workspaceId" IS NOT NULL',
+})
@Index('IDX_APP_TOKEN_TYPE_VALUE_SSO_EXCHANGE_UNIQUE', ['type', 'value'], {
unique: true,
where: `"type" = 'SSO_EXCHANGE_TOKEN' AND "deletedAt" IS NULL AND "revokedAt" IS NULL`,
diff --git a/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts b/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts
index a238b7de5b8..566360eef15 100644
--- a/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts
@@ -41,10 +41,9 @@ import { nullableBigintColumnTransformer } from 'src/engine/twenty-orm/utils/nul
)
@Index('IDX_FILE_WORKSPACE_ID', ['workspaceId'])
@Index('IDX_FILE_STATUS', ['status'])
-@Index('IDX_FILE_APPLICATION_REGISTRATION_ID', ['applicationRegistrationId'])
-@Unique('IDX_APPLICATION_PATH_WORKSPACE_ID_APPLICATION_ID_UNIQUE', [
- 'workspaceId',
+@Unique('IDX_FILE_APPLICATION_ID_WORKSPACE_ID_PATH_UNIQUE', [
'applicationId',
+ 'workspaceId',
'path',
])
@Unique('IDX_FILE_APPLICATION_REGISTRATION_ID_PATH_UNIQUE', [
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
index c335c5d4306..11a734b2e02 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
@@ -42,6 +42,7 @@ export type CommandMenuItemOverrides = {
};
@Entity({ name: 'commandMenuItem', schema: 'core' })
+@Index('IDX_COMMAND_MENU_ITEM_APPLICATION_ID', ['applicationId'])
@Index('IDX_COMMAND_MENU_ITEM_WORKFLOW_VERSION_ID_WORKSPACE_ID', [
'workflowVersionId',
'workspaceId',
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
index 4e2ac28f677..f6b7c0690fd 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
@@ -47,6 +47,7 @@ import { JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/
// This entity is used as a reference test case for type utilities in:
// Modifying relations or properties may require updating type test expectations for Typecheck to pass.
@Entity('fieldMetadata')
+@Index('IDX_FIELD_METADATA_APPLICATION_ID', ['applicationId'])
@Check(
'CHK_FIELD_METADATA_MORPH_RELATION_REQUIRES_MORPH_ID',
`("type" != 'MORPH_RELATION') OR ("type" = 'MORPH_RELATION' AND "morphId" IS NOT NULL)`,
@@ -66,7 +67,6 @@ import { JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/
'objectMetadataId',
'workspaceId',
])
-@Index('IDX_FIELD_METADATA_WORKSPACE_ID', ['workspaceId'])
export class FieldMetadataEntity<
TFieldMetadataType extends FieldMetadataType = FieldMetadataType,
>
@@ -84,7 +84,6 @@ export class FieldMetadataEntity<
nullable: false,
})
@JoinColumn({ name: 'objectMetadataId' })
- @Index('IDX_FIELD_METADATA_OBJECT_METADATA_ID', ['objectMetadataId'])
object: Relation<ObjectMetadataEntity>;
@Column({
diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts
index 581facabca4..9db5d231793 100644
--- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts
@@ -16,6 +16,7 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
@Entity({ name: 'indexFieldMetadata', schema: 'core' })
+@Index('IDX_INDEX_FIELD_METADATA_INDEX_METADATA_ID', ['indexMetadataId'])
export class IndexFieldMetadataEntity implements Required<IndexFieldMetadataEntity> {
@PrimaryGeneratedColumn('uuid')
id: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.entity.ts
index c98ee584cea..897ba86bf71 100644
--- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.entity.ts
@@ -24,11 +24,12 @@ import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-enti
'workspaceId',
'objectMetadataId',
])
-@Index('IDX_INDEX_METADATA_WORKSPACE_ID_OBJECT_METADATA_ID', [
- 'workspaceId',
+@Index('IDX_INDEX_METADATA_OBJECT_METADATA_ID_WORKSPACE_ID', [
'objectMetadataId',
+ 'workspaceId',
])
@Entity('indexMetadata')
+@Index('IDX_INDEX_METADATA_APPLICATION_ID', ['applicationId'])
export class IndexMetadataEntity
extends SyncableEntity
implements Required<IndexMetadataEntity>
diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.entity.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.entity.ts
index ad55d072135..324764546e7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.entity.ts
@@ -33,6 +33,7 @@ export enum LogicFunctionExecutionMode {
}
@Entity('logicFunction')
+@Index('IDX_LOGIC_FUNCTION_APPLICATION_ID', ['applicationId'])
@Index('IDX_LOGIC_FUNCTION_ID_DELETED_AT', ['id', 'deletedAt'])
export class LogicFunctionEntity
extends SyncableEntity
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts b/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts
index c4c4a0921c8..a24894a3aac 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts
@@ -4,6 +4,7 @@ import {
Column,
CreateDateColumn,
Entity,
+ Index,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
@@ -21,6 +22,8 @@ registerEnumType(MessageFolderPendingSyncAction, {
});
@Entity({ name: 'messageFolder', schema: 'core' })
+@Index('IDX_MESSAGE_FOLDER_MESSAGE_CHANNEL_ID', ['messageChannelId'])
+@Index('IDX_MESSAGE_FOLDER_WORKSPACE_ID', ['workspaceId'])
export class MessageFolderEntity extends WorkspaceRelatedEntity {
@PrimaryGeneratedColumn('uuid')
id: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity.ts
index 56cb93fdfc9..1c6adb6103c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity.ts
@@ -19,6 +19,12 @@ import { NavigationMenuItemType } from 'src/engine/metadata-modules/navigation-m
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
@Entity({ name: 'navigationMenuItem', schema: 'core' })
+@Index('IDX_NAVIGATION_MENU_ITEM_APPLICATION_ID', ['applicationId'])
+@Index(
+ 'IDX_NAVIGATION_MENU_ITEM_TARGET_OBJECT_METADATA_ID',
+ ['targetObjectMetadataId'],
+ { where: '"targetObjectMetadataId" IS NOT NULL' },
+)
@Index('IDX_NAVIGATION_MENU_ITEM_USER_WORKSPACE_ID_WORKSPACE_ID', [
'userWorkspaceId',
'workspaceId',
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
index 9816efd3396..37765fafbfd 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
@@ -2,6 +2,7 @@ import {
Column,
CreateDateColumn,
Entity,
+ Index,
OneToMany,
PrimaryGeneratedColumn,
type Relation,
@@ -40,6 +41,7 @@ import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/ty
import { type JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/jsonb-property.type';
@Entity('objectMetadata')
+@Index('IDX_OBJECT_METADATA_APPLICATION_ID', ['applicationId'])
@Unique('IDX_OBJECT_METADATA_NAME_SINGULAR_WORKSPACE_ID_UNIQUE', [
'nameSingular',
'workspaceId',
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
index a2da230e18a..58fbf87bd17 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
@@ -29,6 +29,7 @@ export type PageLayoutTabOverrides = {
};
@Entity({ name: 'pageLayoutTab', schema: 'core' })
+@Index('IDX_PAGE_LAYOUT_TAB_APPLICATION_ID', ['applicationId'])
@ObjectType('PageLayoutTab')
@Index(
'IDX_PAGE_LAYOUT_TAB_WORKSPACE_ID_PAGE_LAYOUT_ID',
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
index b6eacf4face..8cd933c12db 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
@@ -40,6 +40,7 @@ export type PageLayoutWidgetOverrides = {
};
@Entity({ name: 'pageLayoutWidget', schema: 'core' })
+@Index('IDX_PAGE_LAYOUT_WIDGET_APPLICATION_ID', ['applicationId'])
@ObjectType('PageLayoutWidget')
@Index(
'IDX_PAGE_LAYOUT_WIDGET_WORKSPACE_ID_PAGE_LAYOUT_TAB_ID',
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts
index 5fb7fcfaddb..ec0d9867e8d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts
@@ -24,11 +24,17 @@ import { PageLayoutType } from 'twenty-shared/types';
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
@Entity({ name: 'pageLayout', schema: 'core' })
+@Index('IDX_PAGE_LAYOUT_APPLICATION_ID', ['applicationId'])
@ObjectType('PageLayout')
@Index(
- 'IDX_PAGE_LAYOUT_WORKSPACE_ID_OBJECT_METADATA_ID',
- ['workspaceId', 'objectMetadataId'],
- { where: '"deletedAt" IS NULL' },
+ 'IDX_PAGE_LAYOUT_OBJECT_METADATA_ID_WORKSPACE_ID',
+ ['objectMetadataId', 'workspaceId'],
+ { where: '"objectMetadataId" IS NOT NULL' },
+)
+@Index(
+ 'IDX_PAGE_LAYOUT_DEFAULT_TAB_TO_FOCUS_ID',
+ ['defaultTabToFocusOnMobileAndSidePanelId'],
+ { where: '"defaultTabToFocusOnMobileAndSidePanelId" IS NOT NULL' },
)
export class PageLayoutEntity
extends SyncableEntity
diff --git a/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity.ts
index 3aca0c8a179..cb9ebc0fe1d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity.ts
@@ -20,15 +20,18 @@ import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadat
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
@Entity({ name: 'searchFieldMetadata', schema: 'core' })
+@Index('IDX_SEARCH_FIELD_METADATA_APPLICATION_ID', ['applicationId'])
@WasIntroducedInUpgrade({
upgradeCommandName:
ADD_UNIVERSAL_IDENTIFIER_AND_APPLICATION_ID_TO_SEARCH_FIELD_METADATA_UPGRADE_COMMAND_NAME,
})
-@Unique('IDX_SEARCH_FIELD_METADATA_OBJECT_FIELD_UNIQUE', [
- 'objectMetadataId',
+@Unique('IDX_SEARCH_FIELD_METADATA_FIELD_OBJECT_UNIQUE', [
'fieldMetadataId',
+ 'objectMetadataId',
+])
+@Index('IDX_SEARCH_FIELD_METADATA_TS_VECTOR_FIELD_METADATA_ID', [
+ 'tsVectorFieldMetadataId',
])
-@Index('IDX_SEARCH_FIELD_METADATA_WORKSPACE_ID', ['workspaceId'])
@Index('IDX_SEARCH_FIELD_METADATA_OBJECT_METADATA_ID', ['objectMetadataId'])
export class SearchFieldMetadataEntity extends SyncableEntity {
@PrimaryGeneratedColumn('uuid')
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts b/packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts
index 9fca49a9d5f..c079a75f875 100644
--- a/packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts
@@ -12,6 +12,7 @@ import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorato
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
@Entity('skill')
+@Index('IDX_SKILL_APPLICATION_ID', ['applicationId'])
@Index('IDX_SKILL_ID_IS_ACTIVE', ['id', 'isActive'])
@Index('IDX_SKILL_NAME_WORKSPACE_ID_UNIQUE', ['name', 'workspaceId'], {
unique: true,
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
index 2962c0973ff..22049b17fbc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
@@ -33,10 +33,10 @@ export type TimelineActivityTypeOverrides = {
};
@Entity({ name: 'timelineActivityType', schema: 'core' })
-@Unique('IDX_TIMELINE_ACTIVITY_TYPE_NAME_APPLICATION_WORKSPACE_UNIQUE', [
- 'name',
+@Unique('IDX_TIMELINE_ACTIVITY_TYPE_APPLICATION_WORKSPACE_NAME_UNIQUE', [
'applicationId',
'workspaceId',
+ 'name',
])
@Index('IDX_TIMELINE_ACTIVITY_TYPE_BASE_EMIT_SLOT_UNIQUE', {
synchronize: false,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
index ee6c4488230..ccd62f7c102 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
@@ -26,6 +26,7 @@ export type ViewFieldGroupOverrides = {
};
@Entity({ name: 'viewFieldGroup', schema: 'core' })
+@Index('IDX_VIEW_FIELD_GROUP_APPLICATION_ID', ['applicationId'])
@Index('IDX_VIEW_FIELD_GROUP_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
@Index('IDX_VIEW_FIELD_GROUP_VIEW_ID', ['viewId'])
export class ViewFieldGroupEntity
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
index 69e80a5356a..d90358a71eb 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
@@ -32,6 +32,7 @@ export type ViewFieldOverrides = {
};
@Entity({ name: 'viewField', schema: 'core' })
+@Index('IDX_VIEW_FIELD_APPLICATION_ID', ['applicationId'])
@Index('IDX_VIEW_FIELD_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
@Index('IDX_VIEW_FIELD_VIEW_ID', ['viewId'])
@Index('IDX_VIEW_FIELD_FIELD_METADATA_ID', ['fieldMetadataId'])
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/entities/view-group.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/entities/view-group.entity.ts
index 824b73b3e93..9f4e0659411 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-group/entities/view-group.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/entities/view-group.entity.ts
@@ -15,6 +15,7 @@ import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entit
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
@Entity({ name: 'viewGroup', schema: 'core' })
+@Index('IDX_VIEW_GROUP_APPLICATION_ID', ['applicationId'])
@Index('IDX_VIEW_GROUP_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
@Index('IDX_VIEW_GROUP_VIEW_ID', ['viewId'])
export class ViewGroupEntity
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
index 9dfd2b3775f..96516b42343 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
@@ -63,9 +63,10 @@ export type ViewOverrides = {
// We could refactor this type to be dynamic to view type
@Entity({ name: 'view', schema: 'core' })
-@Index('IDX_VIEW_WORKSPACE_ID_OBJECT_METADATA_ID', [
- 'workspaceId',
+@Index('IDX_VIEW_APPLICATION_ID', ['applicationId'])
+@Index('IDX_VIEW_OBJECT_METADATA_ID_WORKSPACE_ID', [
'objectMetadataId',
+ 'workspaceId',
])
@Index('IDX_VIEW_VISIBILITY', ['visibility'])
@Index('IDX_VIEW_CALENDAR_FIELD_METADATA', ['calendarFieldMetadataId'])