Skip to content

The open alternative to Salesforce, designed for AI.

Enrich access group storage per object and skip permission objects (#29348)

Charles Bochetfbaaaae4aab2
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793391296027-add-access-group-storage-columns.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793391296027-add-access-group-storage-columns.command.ts
index 4befb9de450..bace69c42d0 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793391296027-add-access-group-storage-columns.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793391296027-add-access-group-storage-columns.command.ts
@@ -6,7 +6,8 @@ import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
-import { buildAccessGroupSchemaDefinitions } from 'src/engine/metadata-modules/access-group/utils/build-access-group-schema-definitions.util';
+import { enrichAccessGroupTableSchema } from 'src/engine/metadata-modules/access-group/utils/enrich-access-group-table-schema.util';
+import { enrichRecordTableSchemaWithAccessGroupIds } from 'src/engine/metadata-modules/access-group/utils/enrich-record-table-schema-with-access-group-ids.util';
import { type WorkspaceSchemaColumnDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-column-definition.type';
import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -17,7 +18,7 @@ import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/ge
@Command({
name: 'upgrade:2-55:add-access-group-storage-columns',
description:
- 'Add the access group ids column to every object table and the compact id to accessGroup. Indexes are created with CONCURRENTLY so writes are not blocked.',
+ 'Add the access group ids column to every object table except recordShare and accessGroup and the compact id to accessGroup. Indexes are created with CONCURRENTLY so writes are not blocked.',
})
export class AddAccessGroupStorageColumnsCommand extends ProvisionedWorkspaceCommandRunner {
constructor(
@@ -75,8 +76,12 @@ export class AddAccessGroupStorageColumnsCommand extends ProvisionedWorkspaceCom
}
const { columnDefinitions, indexDefinitions } =
- buildAccessGroupSchemaDefinitions({
+ enrichRecordTableSchemaWithAccessGroupIds({
objectMetadata: flatObjectMetadata,
+ tableSchema: enrichAccessGroupTableSchema({
+ objectMetadata: flatObjectMetadata,
+ tableSchema: { columnDefinitions: [], indexDefinitions: [] },
+ }),
});
const conflictingColumnNames = columnDefinitions
.filter(
@@ -101,7 +106,7 @@ export class AddAccessGroupStorageColumnsCommand extends ProvisionedWorkspaceCom
if (options.dryRun) {
dryRunColumnCount += missingColumnDefinitions.length;
- dryRunTableCount++;
+ dryRunTableCount += indexDefinitions.length > 0 ? 1 : 0;
continue;
}
@@ -121,12 +126,12 @@ export class AddAccessGroupStorageColumnsCommand extends ProvisionedWorkspaceCom
indexNames: indexDefinitions.map((index) => index.name),
});
- for (const index of indexDefinitions) {
+ for (const indexDefinition of indexDefinitions) {
await this.workspaceSchemaManagerService.indexManager.createIndex({
queryRunner,
schemaName,
tableName,
- index,
+ index: indexDefinition,
concurrently: true,
});
}
@@ -216,6 +221,10 @@ export class AddAccessGroupStorageColumnsCommand extends ProvisionedWorkspaceCom
schemaName: string;
indexNames: string[];
}): Promise<void> {
+ if (indexNames.length === 0) {
+ return;
+ }
+
const invalidIndexes: { name: string }[] = await queryRunner.query(
`SELECT c.relname AS name
FROM pg_index i
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-compact-id-column-definition.constant.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-compact-id-column-definition.constant.ts
new file mode 100644
index 00000000000..a7af71734cb
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-compact-id-column-definition.constant.ts
@@ -0,0 +1,11 @@
+import { ACCESS_GROUP_COMPACT_ID_COLUMN_NAME } from 'src/engine/metadata-modules/access-group/constants/access-group-column-names.constant';
+import { type WorkspaceSchemaColumnDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-column-definition.type';
+
+// Outside field metadata because only an identity column guarantees an id is never reused
+export const ACCESS_GROUP_COMPACT_ID_COLUMN_DEFINITION: WorkspaceSchemaColumnDefinition =
+ {
+ name: ACCESS_GROUP_COMPACT_ID_COLUMN_NAME,
+ type: 'integer',
+ isNullable: false,
+ isGeneratedAlwaysAsIdentity: true,
+ };
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-compact-id-index-definition.constant.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-compact-id-index-definition.constant.ts
new file mode 100644
index 00000000000..2d3fd6ff446
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-compact-id-index-definition.constant.ts
@@ -0,0 +1,9 @@
+import { ACCESS_GROUP_COMPACT_ID_COLUMN_NAME } from 'src/engine/metadata-modules/access-group/constants/access-group-column-names.constant';
+import { type WorkspaceSchemaIndexDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-index-definition.type';
+
+export const ACCESS_GROUP_COMPACT_ID_INDEX_DEFINITION: WorkspaceSchemaIndexDefinition =
+ {
+ name: 'IDX_ACCESS_GROUP_COMPACT_ID_UNIQUE',
+ columns: [ACCESS_GROUP_COMPACT_ID_COLUMN_NAME],
+ isUnique: true,
+ };
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-ids-column-definition.constant.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-ids-column-definition.constant.ts
new file mode 100644
index 00000000000..c48f7601f25
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/constants/access-group-ids-column-definition.constant.ts
@@ -0,0 +1,10 @@
+import { ACCESS_GROUP_IDS_COLUMN_NAME } from 'src/engine/metadata-modules/access-group/constants/access-group-column-names.constant';
+import { type WorkspaceSchemaColumnDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-column-definition.type';
+
+// Outside field metadata to stay out of APIs, UI and manifests; serves every action; null = not computed
+export const ACCESS_GROUP_IDS_COLUMN_DEFINITION: WorkspaceSchemaColumnDefinition =
+ {
+ name: ACCESS_GROUP_IDS_COLUMN_NAME,
+ type: 'integer',
+ isArray: true,
+ };
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/types/workspace-table-schema-definitions.type.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/types/workspace-table-schema-definitions.type.ts
new file mode 100644
index 00000000000..7e2814b7555
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/types/workspace-table-schema-definitions.type.ts
@@ -0,0 +1,7 @@
+import { type WorkspaceSchemaColumnDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-column-definition.type';
+import { type WorkspaceSchemaIndexDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-index-definition.type';
+
+export type WorkspaceTableSchemaDefinitions = {
+ columnDefinitions: WorkspaceSchemaColumnDefinition[];
+ indexDefinitions: WorkspaceSchemaIndexDefinition[];
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/utils/build-access-group-ids-index-definition.util.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/build-access-group-ids-index-definition.util.ts
new file mode 100644
index 00000000000..15bed555906
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/build-access-group-ids-index-definition.util.ts
@@ -0,0 +1,13 @@
+import { ACCESS_GROUP_IDS_COLUMN_NAME } from 'src/engine/metadata-modules/access-group/constants/access-group-column-names.constant';
+import { type WorkspaceSchemaIndexDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-index-definition.type';
+
+// Named after the object id, not the table, so a renamed object's index cannot collide with a new object's
+export const buildAccessGroupIdsIndexDefinition = ({
+ objectMetadataId,
+}: {
+ objectMetadataId: string;
+}): WorkspaceSchemaIndexDefinition => ({
+ name: `IDX_ACCESS_GROUP_IDS_${objectMetadataId.replace(/-/g, '')}`,
+ columns: [ACCESS_GROUP_IDS_COLUMN_NAME],
+ type: 'GIN',
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/utils/build-access-group-schema-definitions.util.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/build-access-group-schema-definitions.util.ts
deleted file mode 100644
index ca4a1c43b38..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/access-group/utils/build-access-group-schema-definitions.util.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { createHash } from 'crypto';
-
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-
-import {
- ACCESS_GROUP_COMPACT_ID_COLUMN_NAME,
- ACCESS_GROUP_IDS_COLUMN_NAME,
-} from 'src/engine/metadata-modules/access-group/constants/access-group-column-names.constant';
-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type WorkspaceSchemaColumnDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-column-definition.type';
-import { type WorkspaceSchemaIndexDefinition } from 'src/engine/twenty-orm/workspace-schema-manager/types/workspace-schema-index-definition.type';
-
-type AccessGroupSchemaDefinitions = {
- columnDefinitions: WorkspaceSchemaColumnDefinition[];
- indexDefinitions: WorkspaceSchemaIndexDefinition[];
-};
-
-// Keyed on the object id so a renamed object's index cannot collide with a new object's
-const computeAccessGroupIndexName = ({
- objectMetadataId,
- columnName,
-}: {
- objectMetadataId: string;
- columnName: string;
-}): string =>
- `IDX_ACCESS_GROUP_${createHash('sha256')
- .update(objectMetadataId)
- .update(columnName)
- .digest('hex')
- .slice(0, 27)}`;
-
-// No field metadata on purpose: keeps them out of the record APIs, the UI and app manifests.
-// Actions live on each group's grant, so one array serves every action; null means not computed yet.
-export const buildAccessGroupSchemaDefinitions = ({
- objectMetadata,
-}: {
- objectMetadata: Pick<FlatObjectMetadata, 'id' | 'universalIdentifier'>;
-}): AccessGroupSchemaDefinitions => {
- if (
- objectMetadata.universalIdentifier ===
- STANDARD_OBJECTS.accessGroup.universalIdentifier
- ) {
- return {
- columnDefinitions: [
- {
- name: ACCESS_GROUP_COMPACT_ID_COLUMN_NAME,
- type: 'integer',
- isNullable: false,
- isGeneratedAlwaysAsIdentity: true,
- },
- ],
- indexDefinitions: [
- {
- name: computeAccessGroupIndexName({
- objectMetadataId: objectMetadata.id,
- columnName: ACCESS_GROUP_COMPACT_ID_COLUMN_NAME,
- }),
- columns: [ACCESS_GROUP_COMPACT_ID_COLUMN_NAME],
- isUnique: true,
- },
- ],
- };
- }
-
- return {
- columnDefinitions: [
- { name: ACCESS_GROUP_IDS_COLUMN_NAME, type: 'integer', isArray: true },
- ],
- indexDefinitions: [
- {
- name: computeAccessGroupIndexName({
- objectMetadataId: objectMetadata.id,
- columnName: ACCESS_GROUP_IDS_COLUMN_NAME,
- }),
- columns: [ACCESS_GROUP_IDS_COLUMN_NAME],
- type: 'GIN',
- },
- ],
- };
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/utils/enrich-access-group-table-schema.util.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/enrich-access-group-table-schema.util.ts
new file mode 100644
index 00000000000..f5fcf44533b
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/enrich-access-group-table-schema.util.ts
@@ -0,0 +1,28 @@
+import { ACCESS_GROUP_COMPACT_ID_COLUMN_DEFINITION } from 'src/engine/metadata-modules/access-group/constants/access-group-compact-id-column-definition.constant';
+import { ACCESS_GROUP_COMPACT_ID_INDEX_DEFINITION } from 'src/engine/metadata-modules/access-group/constants/access-group-compact-id-index-definition.constant';
+import { type WorkspaceTableSchemaDefinitions } from 'src/engine/metadata-modules/access-group/types/workspace-table-schema-definitions.type';
+import { isAccessGroupObject } from 'src/engine/metadata-modules/access-group/utils/is-access-group-object.util';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+
+export const enrichAccessGroupTableSchema = ({
+ objectMetadata,
+ tableSchema,
+}: {
+ objectMetadata: Pick<FlatObjectMetadata, 'universalIdentifier'>;
+ tableSchema: WorkspaceTableSchemaDefinitions;
+}): WorkspaceTableSchemaDefinitions => {
+ if (!isAccessGroupObject(objectMetadata)) {
+ return tableSchema;
+ }
+
+ return {
+ columnDefinitions: [
+ ...tableSchema.columnDefinitions,
+ ACCESS_GROUP_COMPACT_ID_COLUMN_DEFINITION,
+ ],
+ indexDefinitions: [
+ ...tableSchema.indexDefinitions,
+ ACCESS_GROUP_COMPACT_ID_INDEX_DEFINITION,
+ ],
+ };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/utils/enrich-record-table-schema-with-access-group-ids.util.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/enrich-record-table-schema-with-access-group-ids.util.ts
new file mode 100644
index 00000000000..70faa7e2879
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/enrich-record-table-schema-with-access-group-ids.util.ts
@@ -0,0 +1,30 @@
+import { ACCESS_GROUP_IDS_COLUMN_DEFINITION } from 'src/engine/metadata-modules/access-group/constants/access-group-ids-column-definition.constant';
+import { type WorkspaceTableSchemaDefinitions } from 'src/engine/metadata-modules/access-group/types/workspace-table-schema-definitions.type';
+import { buildAccessGroupIdsIndexDefinition } from 'src/engine/metadata-modules/access-group/utils/build-access-group-ids-index-definition.util';
+import { hasAccessGroupIds } from 'src/engine/metadata-modules/access-group/utils/has-access-group-ids.util';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+
+export const enrichRecordTableSchemaWithAccessGroupIds = ({
+ objectMetadata,
+ tableSchema,
+}: {
+ objectMetadata: Pick<FlatObjectMetadata, 'id' | 'universalIdentifier'>;
+ tableSchema: WorkspaceTableSchemaDefinitions;
+}): WorkspaceTableSchemaDefinitions => {
+ if (!hasAccessGroupIds(objectMetadata)) {
+ return tableSchema;
+ }
+
+ return {
+ columnDefinitions: [
+ ...tableSchema.columnDefinitions,
+ ACCESS_GROUP_IDS_COLUMN_DEFINITION,
+ ],
+ indexDefinitions: [
+ ...tableSchema.indexDefinitions,
+ buildAccessGroupIdsIndexDefinition({
+ objectMetadataId: objectMetadata.id,
+ }),
+ ],
+ };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/utils/has-access-group-ids.util.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/has-access-group-ids.util.ts
new file mode 100644
index 00000000000..5b1a7356d38
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/has-access-group-ids.util.ts
@@ -0,0 +1,16 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+
+// These objects store the permissions themselves, so access groups never apply to their records
+const OBJECT_UNIVERSAL_IDENTIFIERS_WITHOUT_ACCESS_GROUP_IDS: string[] = [
+ STANDARD_OBJECTS.accessGroup.universalIdentifier,
+ STANDARD_OBJECTS.recordShare.universalIdentifier,
+];
+
+export const hasAccessGroupIds = (
+ objectMetadata: Pick<FlatObjectMetadata, 'universalIdentifier'>,
+): boolean =>
+ !OBJECT_UNIVERSAL_IDENTIFIERS_WITHOUT_ACCESS_GROUP_IDS.includes(
+ objectMetadata.universalIdentifier,
+ );
diff --git a/packages/twenty-server/src/engine/metadata-modules/access-group/utils/is-access-group-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/is-access-group-object.util.ts
new file mode 100644
index 00000000000..5da5e427970
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/access-group/utils/is-access-group-object.util.ts
@@ -0,0 +1,9 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+
+export const isAccessGroupObject = (
+ objectMetadata: Pick<FlatObjectMetadata, 'universalIdentifier'>,
+): boolean =>
+ objectMetadata.universalIdentifier ===
+ STANDARD_OBJECTS.accessGroup.universalIdentifier;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
index cb9c998476a..70d71771b5d 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
@@ -5,7 +5,8 @@ import { v4 } from 'uuid';
import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
-import { buildAccessGroupSchemaDefinitions } from 'src/engine/metadata-modules/access-group/utils/build-access-group-schema-definitions.util';
+import { enrichAccessGroupTableSchema } from 'src/engine/metadata-modules/access-group/utils/enrich-access-group-table-schema.util';
+import { enrichRecordTableSchemaWithAccessGroupIds } from 'src/engine/metadata-modules/access-group/utils/enrich-record-table-schema-with-access-group-ids.util';
import { ALL_METADATA_ENTITY_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-entity-by-metadata-name.constant';
import { isCompositeFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-composite-flat-field-metadata.util';
import { isEnumFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-enum-flat-field-metadata.util';
@@ -174,21 +175,22 @@ export class CreateObjectActionHandlerService extends WorkspaceMigrationRunnerAc
workspaceSchemaManagerService: this.workspaceSchemaManagerService,
});
- const accessGroupSchemaDefinitions = buildAccessGroupSchemaDefinitions({
+ const tableSchema = enrichRecordTableSchemaWithAccessGroupIds({
objectMetadata: flatObjectMetadata,
+ tableSchema: enrichAccessGroupTableSchema({
+ objectMetadata: flatObjectMetadata,
+ tableSchema: { columnDefinitions, indexDefinitions: [] },
+ }),
});
await this.workspaceSchemaManagerService.tableManager.createTable({
queryRunner,
schemaName,
tableName,
- columnDefinitions: [
- ...columnDefinitions,
- ...accessGroupSchemaDefinitions.columnDefinitions,
- ],
+ columnDefinitions: tableSchema.columnDefinitions,
});
- for (const index of accessGroupSchemaDefinitions.indexDefinitions) {
+ for (const index of tableSchema.indexDefinitions) {
await this.workspaceSchemaManagerService.indexManager.createIndex({
queryRunner,
schemaName,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata-search-vector-side-effect.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata-search-vector-side-effect.integration-spec.ts
index 44d45a77886..15aae9dc60d 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata-search-vector-side-effect.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata-search-vector-side-effect.integration-spec.ts
@@ -22,7 +22,7 @@ const findSearchVectorGinIndexDefinitions = async (
`SELECT indexdef FROM pg_indexes
WHERE schemaname = $1 AND tablename = $2
AND indexdef ILIKE '%using gin%'
- AND indexdef ILIKE '%searchVector%'`,
+ AND indexdef ILIKE '%("searchVector")%'`,
[TEST_SCHEMA_NAME, tableName],
);
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts
index 5b5d55ff35d..ef9c016953f 100644
--- a/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts
+++ b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts
@@ -57,6 +57,7 @@ const describeAgentMessageSenders = (dataSource: DataSource) =>
WHERE "senderWorkspaceMemberId" IS NOT NULL ORDER BY id`,
);
+// accessGroupIds comes from a later upgrade, so the 2.42 tables never have it
const describeAgentHistoryColumns = ({
dataSource,
objectNames,
@@ -68,6 +69,7 @@ const describeAgentHistoryColumns = ({
`SELECT table_name AS "objectName", column_name AS "columnName"
FROM information_schema.columns
WHERE table_schema = $1 AND table_name = ANY($2)
+ AND column_name <> 'accessGroupIds'
ORDER BY 1, 2`,
[SCHEMA, objectNames],
);
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793391296027-add-access-group-storage-columns.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793391296027-add-access-group-storage-columns.integration-spec.ts
index 349900321d3..764b454b3c9 100644
--- a/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793391296027-add-access-group-storage-columns.integration-spec.ts
+++ b/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793391296027-add-access-group-storage-columns.integration-spec.ts
@@ -81,7 +81,7 @@ describe('2-55 workspace command - add access group storage columns (integration
await runOnWorkspace();
});
- it('creates the columns and indexes with standard and custom objects', async () => {
+ it('creates the columns and indexes with standard and custom objects, not system ones', async () => {
const columns = await findColumns();
for (const tableName of RECORD_TABLE_NAMES) {
@@ -99,6 +99,9 @@ describe('2-55 workspace command - add access group storage columns (integration
]);
}
+ expect(
+ columns.filter((column) => column.tableName === 'recordShare'),
+ ).toEqual([]);
expect(
columns.filter((column) => column.tableName === 'accessGroup'),
).toEqual([
@@ -152,6 +155,9 @@ describe('2-55 workspace command - add access group storage columns (integration
expect(
columns.find((column) => column.tableName === 'accessGroup'),
).toMatchObject({ columnName: 'compactId', isIdentity: 'YES' });
+ expect(columns.some((column) => column.tableName === 'recordShare')).toBe(
+ false,
+ );
expect((await findIndexDefinitions()).length).toBeGreaterThan(
indexDefinitionsAfterDrop.length,
);