Skip to content

The open alternative to Salesforce, designed for AI.

Fix 2.38 and 2.43 system relation provisioning on objects without a table (#27326)

Paul Rastoin29a0d69aefe7
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788266912940-provision-missing-object-system-relations.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788266912940-provision-missing-object-system-relations.command.ts
index 3b1102eecd2..5c5d872f5e7 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788266912940-provision-missing-object-system-relations.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788266912940-provision-missing-object-system-relations.command.ts
@@ -4,7 +4,6 @@ import {
STANDARD_OBJECTS,
} from 'twenty-shared/metadata';
import { isDefined } from 'twenty-shared/utils';
-import { type DataSource } from 'typeorm';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
@@ -14,6 +13,7 @@ import {
type DefaultRelationHolderNameSingular,
type MissingObjectSystemRelationCandidate,
} from 'src/database/commands/upgrade-version-command/2-38/utils/build-missing-object-system-relation-candidates.util';
+import { readExistingColumnNamesByTableName } from 'src/database/commands/upgrade-version-command/2-38/utils/read-existing-column-names-by-table-name.util';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
@@ -22,15 +22,16 @@ import {
buildSystemRelationFlatFieldMetadatasForObject,
type SystemRelationFlatFieldMetadataBundle,
} from 'src/engine/metadata-modules/object-metadata/utils/build-system-relation-flat-field-metadatas-for-object.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
-import { getWorkspaceSchemaContextForMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/get-workspace-schema-context-for-migration.util';
@RegisteredWorkspaceCommand('2.38.0', 1788266912940)
@Command({
name: 'upgrade:2-38:provision-missing-object-system-relations',
description:
- 'Provision the default system-relation pairs (forward relation field on the object, target* morph leg on timelineActivity/attachment/noteTarget/taskTarget, join-column index) for non-standard objects that lost them, typically to pre-2.20 application syncs. The 2-35 restore command only recreated the pairs twenty-standard authors for its own objects; pairs of custom or app-installed objects were never restored, so runtime writes deriving the join column from the object name throw UNKNOWN_COLUMN on every event (Sentry TWENTY-SERVER-JRV). Mints exactly what the objectSystemRelationsOnCreate handler mints at object creation, only for pairs where both legs are absent, and reports pairs it cannot complete safely (partial pair, taken field name, surviving physical column) instead of guessing.',
+ 'Provision the default system-relation pairs (forward relation field on the object, target* morph leg on timelineActivity/attachment/noteTarget/taskTarget, join-column index) for non-standard objects that lost them, typically to pre-2.20 application syncs. The 2-35 restore command only recreated the pairs twenty-standard authors for its own objects; pairs of custom or app-installed objects were never restored, so runtime writes deriving the join column from the object name throw UNKNOWN_COLUMN on every event (Sentry TWENTY-SERVER-JRV). Mints exactly what the objectSystemRelationsOnCreate handler mints at object creation, only for pairs where both legs are absent, and reports pairs it cannot complete safely (partial pair, taken field name, surviving physical column, missing source table) instead of guessing.',
})
export class ProvisionMissingObjectSystemRelationsCommand extends ProvisionedWorkspaceCommandRunner {
constructor(
@@ -89,12 +90,29 @@ export class ProvisionMissingObjectSystemRelationsCommand extends ProvisionedWor
return;
}
- const existingColumnNamesByHolderNameSingular =
- await this.readExistingColumnNamesByHolder({
- dataSource,
- workspaceId,
- holderFlatObjectMetadataByNameSingular,
- });
+ const columnNamesByTableName = await readExistingColumnNamesByTableName({
+ dataSource,
+ schemaName: getWorkspaceSchemaName(workspaceId),
+ tableNames: Object.values(flatObjectMetadataMaps.byUniversalIdentifier)
+ .filter(isDefined)
+ .map((flatObjectMetadata) =>
+ computeObjectTargetTable(flatObjectMetadata),
+ ),
+ });
+
+ const existingColumnNamesByHolderNameSingular = {} as Record<
+ DefaultRelationHolderNameSingular,
+ Set<string>
+ >;
+
+ for (const holderNameSingular of DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS) {
+ existingColumnNamesByHolderNameSingular[holderNameSingular] =
+ columnNamesByTableName.get(
+ computeObjectTargetTable(
+ holderFlatObjectMetadataByNameSingular[holderNameSingular],
+ ),
+ ) ?? new Set();
+ }
const { twentyStandardFlatApplication } =
await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
@@ -107,6 +125,7 @@ export class ProvisionMissingObjectSystemRelationsCommand extends ProvisionedWor
flatFieldMetadataMaps,
holderFlatObjectMetadataByNameSingular,
existingColumnNamesByHolderNameSingular,
+ existingTableNames: new Set(columnNamesByTableName.keys()),
twentyStandardApplicationUniversalIdentifier:
twentyStandardFlatApplication.universalIdentifier,
});
@@ -263,41 +282,4 @@ export class ProvisionMissingObjectSystemRelationsCommand extends ProvisionedWor
),
);
}
-
- private async readExistingColumnNamesByHolder({
- dataSource,
- workspaceId,
- holderFlatObjectMetadataByNameSingular,
- }: {
- dataSource: DataSource;
- workspaceId: string;
- holderFlatObjectMetadataByNameSingular: Record<
- DefaultRelationHolderNameSingular,
- FlatObjectMetadata
- >;
- }): Promise<Record<DefaultRelationHolderNameSingular, Set<string>>> {
- const existingColumnNamesByHolderNameSingular = {} as Record<
- DefaultRelationHolderNameSingular,
- Set<string>
- >;
-
- for (const holderNameSingular of DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS) {
- const { schemaName, tableName } = getWorkspaceSchemaContextForMigration({
- workspaceId,
- objectMetadata:
- holderFlatObjectMetadataByNameSingular[holderNameSingular],
- });
-
- const rows = await dataSource.query<{ column_name: string }[]>(
- `SELECT column_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2`,
- [schemaName, tableName],
- );
-
- existingColumnNamesByHolderNameSingular[holderNameSingular] = new Set(
- rows.map(({ column_name }) => column_name),
- );
- }
-
- return existingColumnNamesByHolderNameSingular;
- }
}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-missing-object-system-relation-candidates.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-missing-object-system-relation-candidates.util.spec.ts
index 98371a77832..e31fcdee1d7 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-missing-object-system-relation-candidates.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-missing-object-system-relation-candidates.util.spec.ts
@@ -16,6 +16,7 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
const STANDARD_APP_UID = '20202020-0000-4000-8000-000000000001';
const CUSTOM_APP_UID = '20202020-0000-4000-8000-000000000002';
@@ -42,6 +43,7 @@ type SourceSpecification = {
nameSingular: string;
isActive?: boolean;
applicationUniversalIdentifier?: string;
+ hasTable?: boolean;
pairedHolders?: DefaultRelationHolderNameSingular[];
reverseOnlyHolders?: DefaultRelationHolderNameSingular[];
forwardOnlyHolders?: DefaultRelationHolderNameSingular[];
@@ -71,6 +73,7 @@ const buildArgs = ({
}: BuildArgs) => {
const flatObjectMetadatas: FlatObjectMetadata[] = [];
const flatFieldMetadatas: FlatFieldMetadata[] = [];
+ const existingTableNames = new Set<string>();
const holderFieldIds: Record<DefaultRelationHolderNameSingular, string[]> = {
timelineActivity: [],
attachment: [],
@@ -175,18 +178,24 @@ const buildArgs = ({
});
}
- flatObjectMetadatas.push(
- getFlatObjectMetadataMock({
- id: `object-${source.key}`,
- universalIdentifier: `object-uid-${source.key}`,
- applicationUniversalIdentifier:
- source.applicationUniversalIdentifier ?? CUSTOM_APP_UID,
- nameSingular: source.nameSingular,
- namePlural: `${source.nameSingular}s`,
- isActive: source.isActive ?? true,
- fieldIds: sourceFieldIds,
- }),
- );
+ const sourceFlatObjectMetadata = getFlatObjectMetadataMock({
+ id: `object-${source.key}`,
+ universalIdentifier: `object-uid-${source.key}`,
+ applicationUniversalIdentifier:
+ source.applicationUniversalIdentifier ?? CUSTOM_APP_UID,
+ nameSingular: source.nameSingular,
+ namePlural: `${source.nameSingular}s`,
+ isActive: source.isActive ?? true,
+ fieldIds: sourceFieldIds,
+ });
+
+ flatObjectMetadatas.push(sourceFlatObjectMetadata);
+
+ if (source.hasTable ?? true) {
+ existingTableNames.add(
+ computeObjectTargetTable(sourceFlatObjectMetadata),
+ );
+ }
}
detachedFields.forEach(registerField);
@@ -234,6 +243,7 @@ const buildArgs = ({
noteTarget: new Set(columnNamesByHolder.noteTarget ?? []),
taskTarget: new Set(columnNamesByHolder.taskTarget ?? []),
},
+ existingTableNames,
twentyStandardApplicationUniversalIdentifier: STANDARD_APP_UID,
};
};
@@ -446,6 +456,47 @@ describe('buildMissingObjectSystemRelationCandidates', () => {
]);
});
+ it('reports every missing pair of an object whose table does not exist', () => {
+ const result = buildMissingObjectSystemRelationCandidates(
+ buildArgs({
+ sources: [
+ { key: 'viewField', nameSingular: 'viewField', hasTable: false },
+ { key: 'phone', nameSingular: 'phoneNumber2' },
+ ],
+ }),
+ );
+
+ expect(result.unprovisionableSystemRelations).toEqual(
+ DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS.map((holderNameSingular) => ({
+ sourceObjectNameSingular: 'viewField',
+ holderNameSingular,
+ reason: 'table "_viewField" does not exist in the workspace schema',
+ })),
+ );
+ expect(result.candidates).toHaveLength(1);
+ expect(result.candidates[0].sourceFlatObjectMetadata.nameSingular).toBe(
+ 'phoneNumber2',
+ );
+ });
+
+ it('does not report an object whose table does not exist when its pairs are complete', () => {
+ const result = buildMissingObjectSystemRelationCandidates(
+ buildArgs({
+ sources: [
+ {
+ key: 'viewField',
+ nameSingular: 'viewField',
+ hasTable: false,
+ pairedHolders: [...DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS],
+ },
+ ],
+ }),
+ );
+
+ expect(result.candidates).toEqual([]);
+ expect(result.unprovisionableSystemRelations).toEqual([]);
+ });
+
it('counts a leg held by its deterministic identifier even without matching relation semantics', () => {
const result = buildMissingObjectSystemRelationCandidates(
buildArgs({
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/read-existing-column-names-by-table-name.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/read-existing-column-names-by-table-name.util.spec.ts
new file mode 100644
index 00000000000..6b4d4a5c514
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/read-existing-column-names-by-table-name.util.spec.ts
@@ -0,0 +1,43 @@
+import { type DataSource } from 'typeorm';
+
+import { readExistingColumnNamesByTableName } from 'src/database/commands/upgrade-version-command/2-38/utils/read-existing-column-names-by-table-name.util';
+
+const buildDataSource = (
+ rows: { tableName: string; columnName: string }[],
+): DataSource =>
+ ({ query: jest.fn().mockResolvedValue(rows) }) as unknown as DataSource;
+
+describe('readExistingColumnNamesByTableName', () => {
+ it('groups columns by table and leaves missing tables out', async () => {
+ const result = await readExistingColumnNamesByTableName({
+ dataSource: buildDataSource([
+ { tableName: 'timelineActivity', columnName: 'id' },
+ { tableName: 'timelineActivity', columnName: 'targetPersonId' },
+ { tableName: '_pet', columnName: 'id' },
+ ]),
+ schemaName: 'workspace_test',
+ tableNames: ['timelineActivity', '_pet', '_viewField'],
+ });
+
+ expect(result).toEqual(
+ new Map([
+ ['timelineActivity', new Set(['id', 'targetPersonId'])],
+ ['_pet', new Set(['id'])],
+ ]),
+ );
+ });
+
+ it('finds the truncated table of a 63-character custom object under its requested name', async () => {
+ const requestedTableName = `_${'a'.repeat(63)}`;
+
+ const result = await readExistingColumnNamesByTableName({
+ dataSource: buildDataSource([
+ { tableName: requestedTableName.slice(0, 63), columnName: 'id' },
+ ]),
+ schemaName: 'workspace_test',
+ tableNames: [requestedTableName],
+ });
+
+ expect(result.get(requestedTableName)).toEqual(new Set(['id']));
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/build-missing-object-system-relation-candidates.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/build-missing-object-system-relation-candidates.util.ts
index 85a4d358980..01645785f45 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/build-missing-object-system-relation-candidates.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/build-missing-object-system-relation-candidates.util.ts
@@ -10,6 +10,7 @@ import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/work
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
export type DefaultRelationHolderNameSingular =
(typeof DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS)[number];
@@ -42,6 +43,7 @@ type BuildMissingObjectSystemRelationCandidatesArgs = Pick<
DefaultRelationHolderNameSingular,
Set<string>
>;
+ existingTableNames: Set<string>;
twentyStandardApplicationUniversalIdentifier: string;
};
@@ -50,6 +52,7 @@ export const buildMissingObjectSystemRelationCandidates = ({
flatFieldMetadataMaps,
holderFlatObjectMetadataByNameSingular,
existingColumnNamesByHolderNameSingular,
+ existingTableNames,
twentyStandardApplicationUniversalIdentifier,
}: BuildMissingObjectSystemRelationCandidatesArgs): MissingObjectSystemRelationCandidates => {
const holderContexts = DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS.map(
@@ -109,6 +112,7 @@ export const buildMissingObjectSystemRelationCandidates = ({
sourceFlatFieldMetadatas.map(({ name }) => name),
);
const missingHolderNameSingulars: DefaultRelationHolderNameSingular[] = [];
+ const sourceTableName = computeObjectTargetTable(sourceFlatObjectMetadata);
for (const holderContext of holderContexts) {
const { holderNameSingular, holderFlatObjectMetadata } = holderContext;
@@ -206,6 +210,15 @@ export const buildMissingObjectSystemRelationCandidates = ({
continue;
}
+ // Legacy standard objects demoted to the custom application (e.g. a
+ // pre-1.10 viewField) resolve to a prefixed table that was never created.
+ if (!existingTableNames.has(sourceTableName)) {
+ pushUnprovisionable(
+ `table "${sourceTableName}" does not exist in the workspace schema`,
+ );
+ continue;
+ }
+
missingHolderNameSingulars.push(holderNameSingular);
}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/read-existing-column-names-by-table-name.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/read-existing-column-names-by-table-name.util.ts
new file mode 100644
index 00000000000..d327a3fbecf
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/read-existing-column-names-by-table-name.util.ts
@@ -0,0 +1,52 @@
+import { IDENTIFIER_MAX_CHAR_LENGTH } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+import { type DataSource } from 'typeorm';
+
+// Filtering on relname lets Postgres use both columns of the pg_class name
+// index; a schema-only filter scans it across every workspace schema.
+export const readExistingColumnNamesByTableName = async ({
+ dataSource,
+ schemaName,
+ tableNames,
+}: {
+ dataSource: DataSource;
+ schemaName: string;
+ tableNames: string[];
+}): Promise<Map<string, Set<string>>> => {
+ const rows = await dataSource.query<
+ { tableName: string; columnName: string }[]
+ >(
+ `SELECT c.relname AS "tableName", a.attname AS "columnName"
+ FROM pg_class c
+ JOIN pg_namespace n ON n.oid = c.relnamespace
+ JOIN pg_attribute a ON a.attrelid = c.oid
+ WHERE n.nspname = $1
+ AND c.relname = ANY($2)
+ AND c.relkind IN ('r', 'p')
+ AND a.attnum > 0
+ AND NOT a.attisdropped`,
+ [schemaName, tableNames],
+ );
+
+ const columnNamesByStoredTableName = new Map<string, Set<string>>();
+
+ for (const { tableName, columnName } of rows) {
+ const columnNames =
+ columnNamesByStoredTableName.get(tableName) ?? new Set();
+
+ columnNames.add(columnName);
+ columnNamesByStoredTableName.set(tableName, columnNames);
+ }
+
+ // Postgres truncates identifiers to 63 bytes, so the table of a 63-character
+ // custom object is stored under a shorter name than the one requested.
+ return new Map(
+ tableNames.flatMap((tableName) => {
+ const columnNames = columnNamesByStoredTableName.get(
+ tableName.slice(0, IDENTIFIER_MAX_CHAR_LENGTH),
+ );
+
+ return isDefined(columnNames) ? [[tableName, columnNames] as const] : [];
+ }),
+ );
+};
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.ts
index d4549929fb1..d797a5769ff 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.ts
@@ -6,6 +6,7 @@ import { type DataSource } from 'typeorm';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { readExistingColumnNamesByTableName } from 'src/database/commands/upgrade-version-command/2-38/utils/read-existing-column-names-by-table-name.util';
import { findObjectsMissingAgentChatThreadTargetRelation } from 'src/database/commands/upgrade-version-command/2-43/utils/find-objects-missing-agent-chat-thread-target-relation.util';
import { getAgentChatThreadTargetSchemaAdditions } from 'src/database/commands/upgrade-version-command/2-43/utils/get-agent-chat-thread-target-schema-additions.util';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
@@ -15,6 +16,7 @@ import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-module
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { buildSystemRelationFlatFieldMetadatasForObject } from 'src/engine/metadata-modules/object-metadata/utils/build-system-relation-flat-field-metadatas-for-object.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
@@ -244,19 +246,24 @@ export class ProvisionAgentChatThreadTargetCommand extends ProvisionedWorkspaceC
objectMetadata: targetFlatObjectMetadata,
});
- const columnRows = await dataSource.query<{ column_name: string }[]>(
- `SELECT column_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2`,
- [schemaName, tableName],
- );
+ const columnNamesByTableName = await readExistingColumnNamesByTableName({
+ dataSource,
+ schemaName,
+ tableNames: Object.values(flatObjectMetadataMaps.byUniversalIdentifier)
+ .filter(isDefined)
+ .map((flatObjectMetadata) =>
+ computeObjectTargetTable(flatObjectMetadata),
+ ),
+ });
const { flatObjectMetadatas, unprovisionableRelations } =
findObjectsMissingAgentChatThreadTargetRelation({
flatObjectMetadataMaps,
flatFieldMetadataMaps,
targetFlatObjectMetadata,
- existingTargetColumnNames: new Set(
- columnRows.map(({ column_name }) => column_name),
- ),
+ existingTargetColumnNames:
+ columnNamesByTableName.get(tableName) ?? new Set(),
+ existingTableNames: new Set(columnNamesByTableName.keys()),
twentyStandardApplicationUniversalIdentifier,
});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/find-objects-missing-agent-chat-thread-target-relation.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/find-objects-missing-agent-chat-thread-target-relation.util.spec.ts
index 3107adff1cc..eac9c880abc 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/find-objects-missing-agent-chat-thread-target-relation.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/__tests__/find-objects-missing-agent-chat-thread-target-relation.util.spec.ts
@@ -11,6 +11,7 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
const STANDARD_APP_UID = '20202020-0000-4000-8000-000000000001';
const CUSTOM_APP_UID = '20202020-0000-4000-8000-000000000002';
@@ -32,6 +33,7 @@ type SourceSpecification = {
nameSingular: string;
isActive?: boolean;
applicationUniversalIdentifier?: string;
+ hasTable?: boolean;
hasReverseField?: boolean;
forwardField?: { name?: string; universalIdentifier?: string };
extraFields?: {
@@ -55,6 +57,7 @@ const buildArgs = ({
const flatObjectMetadatas: FlatObjectMetadata[] = [];
const flatFieldMetadatas: FlatFieldMetadata[] = [];
const targetFieldIds: string[] = [];
+ const existingTableNames = new Set<string>();
const registerField = ({
id,
@@ -127,18 +130,24 @@ const buildArgs = ({
);
}
- flatObjectMetadatas.push(
- getFlatObjectMetadataMock({
- id: `object-${source.key}`,
- universalIdentifier: `object-uid-${source.key}`,
- applicationUniversalIdentifier:
- source.applicationUniversalIdentifier ?? CUSTOM_APP_UID,
- nameSingular: source.nameSingular,
- namePlural: `${source.nameSingular}s`,
- isActive: source.isActive ?? true,
- fieldIds: sourceFieldIds,
- }),
- );
+ const sourceFlatObjectMetadata = getFlatObjectMetadataMock({
+ id: `object-${source.key}`,
+ universalIdentifier: `object-uid-${source.key}`,
+ applicationUniversalIdentifier:
+ source.applicationUniversalIdentifier ?? CUSTOM_APP_UID,
+ nameSingular: source.nameSingular,
+ namePlural: `${source.nameSingular}s`,
+ isActive: source.isActive ?? true,
+ fieldIds: sourceFieldIds,
+ });
+
+ flatObjectMetadatas.push(sourceFlatObjectMetadata);
+
+ if (source.hasTable ?? true) {
+ existingTableNames.add(
+ computeObjectTargetTable(sourceFlatObjectMetadata),
+ );
+ }
}
const targetFlatObjectMetadata = getFlatObjectMetadataMock({
@@ -170,6 +179,7 @@ const buildArgs = ({
),
targetFlatObjectMetadata,
existingTargetColumnNames: new Set(targetColumnNames),
+ existingTableNames,
twentyStandardApplicationUniversalIdentifier: STANDARD_APP_UID,
};
};
@@ -372,4 +382,23 @@ describe('findObjectsMissingAgentChatThreadTargetRelation', () => {
},
]);
});
+
+ it('reports an object whose table does not exist', () => {
+ const result = findObjectsMissingAgentChatThreadTargetRelation(
+ buildArgs({
+ sources: [
+ { key: 'viewField', nameSingular: 'viewField', hasTable: false },
+ { key: 'pet', nameSingular: 'pet' },
+ ],
+ }),
+ );
+
+ expect(getMissingObjectNames(result)).toEqual(['pet']);
+ expect(result.unprovisionableRelations).toEqual([
+ {
+ objectNameSingular: 'viewField',
+ reason: 'table "_viewField" does not exist in the workspace schema',
+ },
+ ]);
+ });
});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/find-objects-missing-agent-chat-thread-target-relation.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/find-objects-missing-agent-chat-thread-target-relation.util.ts
index deca6c28361..b4d480fc10b 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/find-objects-missing-agent-chat-thread-target-relation.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/find-objects-missing-agent-chat-thread-target-relation.util.ts
@@ -7,6 +7,7 @@ import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/work
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
export type UnprovisionableAgentChatThreadTargetRelation = {
objectNameSingular: string;
@@ -24,6 +25,7 @@ type FindObjectsMissingAgentChatThreadTargetRelationArgs = Pick<
> & {
targetFlatObjectMetadata: FlatObjectMetadata;
existingTargetColumnNames: Set<string>;
+ existingTableNames: Set<string>;
twentyStandardApplicationUniversalIdentifier: string;
};
@@ -36,6 +38,7 @@ export const findObjectsMissingAgentChatThreadTargetRelation = ({
flatFieldMetadataMaps,
targetFlatObjectMetadata,
existingTargetColumnNames,
+ existingTableNames,
twentyStandardApplicationUniversalIdentifier,
}: FindObjectsMissingAgentChatThreadTargetRelationArgs): ObjectsMissingAgentChatThreadTargetRelation => {
const targetFlatFieldMetadatas = getFlatFieldsFromFlatObjectMetadata(
@@ -163,6 +166,15 @@ export const findObjectsMissingAgentChatThreadTargetRelation = ({
continue;
}
+ const sourceTableName = computeObjectTargetTable(sourceFlatObjectMetadata);
+
+ if (!existingTableNames.has(sourceTableName)) {
+ pushUnprovisionable(
+ `table "${sourceTableName}" does not exist in the workspace schema`,
+ );
+ continue;
+ }
+
flatObjectMetadatas.push(sourceFlatObjectMetadata);
}