From 249b7f8556ed8011bda7076b1e77f18e351d803b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Wed, 14 May 2025 11:46:48 +0200 Subject: [PATCH] refactor(core): Move migrations to `@n8n/db` (#15362) --- packages/@n8n/constants/src/index.ts | 48 +++++++++++++++++++ packages/@n8n/db/package.json | 3 ++ packages/@n8n/db/src/index.ts | 7 +++ .../__tests__/migration-helpers.ts | 4 +- .../1620821879465-UniqueWorkflowNames.ts | 5 +- ...1630330987096-UpdateWorkflowCredentials.ts | 5 +- .../common/1658930531669-AddNodeIds.ts | 4 +- .../common/1659888469333-AddJsonKeyPinData.ts | 2 +- ...669739707124-AddWorkflowVersionIdColumn.ts | 2 +- ...1726148419-RemoveWorkflowDataLoadedFlag.ts | 5 +- .../1674509946020-CreateLdapEntities.ts | 5 +- ...0580449-PurgeInvalidWorkflowConnections.ts | 4 +- ...690000000030-RemoveResetPasswordColumns.ts | 2 +- .../common/1690000000040-AddMfaColumns.ts | 2 +- .../1691088862123-CreateWorkflowNameIndex.ts | 2 +- ...692967111175-CreateWorkflowHistoryTable.ts | 2 +- .../1693491613982-ExecutionSoftDelete.ts | 2 +- .../1693554410387-DisallowOrphanExecutions.ts | 2 +- .../1695128658538-AddWorkflowMetadata.ts | 2 +- ...odifyWorkflowHistoryNodesAndConnections.ts | 2 +- .../1700571993961-AddGlobalAdminRole.ts | 2 +- .../common/1705429061930-DropRoleMapping.ts | 2 +- ...11018413374-RemoveFailedExecutionStatus.ts | 2 +- .../1711390882123-MoveSshKeysToDatabase.ts | 3 +- .../common/1712044305787-RemoveNodesAccess.ts | 2 +- .../common/1714133768519-CreateProject.ts | 6 +-- ...33768521-MakeExecutionStatusNonNullable.ts | 2 +- ...653148-AddConstraintToExecutionMetadata.ts | 2 +- ...23627610222-CreateInvalidAuthTokenTable.ts | 2 +- .../1723796243146-RefactorExecutionIndices.ts | 2 +- ...3530828-CreateExecutionAnnotationTables.ts | 2 +- .../common/1724951148974-AddApiKeysTable.ts | 9 ++-- .../1726606152711-CreateProcessedDataTable.ts | 2 +- ...0136-SeparateExecutionCreationFromStart.ts | 2 +- ...MissingPrimaryKeyOnAnnotationTagMapping.ts | 2 +- ...64-UpdateProcessedDataValueColumnToText.ts | 2 +- .../common/1729607673469-AddProjectIcons.ts | 2 +- ...1730386903556-CreateTestDefinitionTable.ts | 2 +- ...04028106-AddDescriptionToTestDefinition.ts | 2 +- .../1732271325258-CreateTestMetricTable.ts | 2 +- .../1732549866705-CreateTestRunTable.ts | 2 +- ...40-AddMockedNodesColumnToTestDefinition.ts | 2 +- ...5324-AddManagedColumnToCredentialsTable.ts | 2 +- .../1736172058779-AddStatsColumnsToTestRun.ts | 2 +- ...6947513045-CreateTestCaseExecutionTable.ts | 2 +- ...1737715421462-AddErrorColumnsToTestRuns.ts | 2 +- .../common/1738709609940-CreateFolderTable.ts | 2 +- .../1739549398681-CreateAnalyticsTables.ts | 2 +- ...1741167584277-RenameAnalyticsToInsights.ts | 2 +- .../1742918400000-AddScopesColumnToApiKeys.ts | 6 +-- ...87087521-AddWorkflowStatisticsRootCount.ts | 2 +- ...1745934666076-AddWorkflowArchivedColumn.ts | 2 +- .../common/1745934666077-DropRoleTable.ts | 2 +- .../db/src/migrations}/dsl/column.ts | 0 .../db/src/migrations}/dsl/index.ts | 0 .../db/src/migrations}/dsl/indices.ts | 0 .../db/src/migrations}/dsl/table.ts | 0 .../db/src/migrations}/migration-helpers.ts | 11 ++--- .../db/src/migrations/migration-types.ts} | 2 + .../mysqldb/1588157391238-InitialMigration.ts | 2 +- .../mysqldb/1592447867632-WebhookModel.ts | 2 +- .../1594902918301-CreateIndexStoppedAt.ts | 2 +- .../1607431743767-MakeStoppedAtNullable.ts | 2 +- .../mysqldb/1611149998770-AddWebhookId.ts | 2 +- .../mysqldb/1615306975123-ChangeDataSize.ts | 2 +- .../mysqldb/1617268711084-CreateTagEntity.ts | 2 +- .../1620729500000-ChangeCredentialDataSize.ts | 2 +- .../1620826335440-UniqueWorkflowNames.ts | 0 .../1623936588000-CertifyCorrectCollation.ts | 2 +- .../mysqldb/1626183952959-AddWaitColumn.ts | 2 +- ...1630451444017-UpdateWorkflowCredentials.ts | 0 ...1644424784709-AddExecutionEntityIndexes.ts | 2 +- .../1646992772331-CreateUserManagement.ts | 2 +- .../1648740597343-LowerCaseUserEmail.ts | 2 +- .../mysqldb/1652254514003-CommunityNodes.ts | 2 +- .../mysqldb/1652367743993-AddUserSettings.ts | 2 +- .../mysqldb/1652905585850-AddAPIKeyColumn.ts | 2 +- .../mysqldb/1654090101303-IntroducePinData.ts | 2 +- .../mysqldb/1658932910559-AddNodeIds.ts | 0 .../1659895550980-AddJsonKeyPinData.ts | 0 ...1660062385367-CreateCredentialsUserRole.ts | 2 +- ...1663755770894-CreateWorkflowsEditorRole.ts | 2 +- .../1664196174002-WorkflowStatistics.ts | 2 +- ...665484192213-CreateCredentialUsageTable.ts | 2 +- ...665754637026-RemoveCredentialUsageTable.ts | 2 +- ...669739707125-AddWorkflowVersionIdColumn.ts | 0 .../1669823906994-AddTriggerCountColumn.ts | 2 +- ...71535397530-MessageEventBusDestinations.ts | 2 +- ...1726148420-RemoveWorkflowDataLoadedFlag.ts | 0 ...268682475-DeleteExecutionsWithWorkflows.ts | 2 +- .../1674138566000-AddStatusToExecutions.ts | 2 +- .../1676996103000-MigrateExecutionStatus.ts | 2 +- ...7236788851-UpdateRunningExecutionStatus.ts | 2 +- .../mysqldb/1677501636753-CreateVariables.ts | 2 +- ...9416281779-CreateExecutionMetadataTable.ts | 2 +- .../1681134145996-AddUserActivatedProperty.ts | 5 +- .../1681134145997-RemoveSkipOwnerSetup.ts | 2 +- ...690000000001-MigrateIntegerKeysToString.ts | 2 +- .../1690000000030-SeparateExecutionData.ts | 2 +- .../1690000000031-FixExecutionDataType.ts | 2 +- ...1717498465931-AddActivatedAtUserSetting.ts | 2 +- ...748663-MigrateTestDefinitionKeyToString.ts | 2 +- .../1732271325258-CreateTestMetricTable.ts | 2 +- .../1736172058779-AddStatsColumnsToTestRun.ts | 2 +- ...39873751194-FixTestDefinitionPrimaryKey.ts | 2 +- ...740445074052-UpdateParentFolderIdColumn.ts | 2 +- .../db/src}/migrations/mysqldb/index.ts | 3 +- .../1587669153312-InitialMigration.ts | 2 +- .../postgresdb/1589476000887-WebhookModel.ts | 2 +- .../1594828256133-CreateIndexStoppedAt.ts | 2 +- .../1607431743768-MakeStoppedAtNullable.ts | 2 +- .../postgresdb/1611144599516-AddWebhookId.ts | 2 +- .../1617270242566-CreateTagEntity.ts | 2 +- .../1620824779533-UniqueWorkflowNames.ts | 0 .../postgresdb/1626176912946-AddwaitTill.ts | 2 +- ...1630419189837-UpdateWorkflowCredentials.ts | 0 ...1644422880309-AddExecutionEntityIndexes.ts | 2 +- .../1646834195327-IncreaseTypeVarcharLimit.ts | 2 +- .../1646992772331-CreateUserManagement.ts | 2 +- .../1648740597343-LowerCaseUserEmail.ts | 2 +- .../1652254514002-CommunityNodes.ts | 2 +- .../1652367743993-AddUserSettings.ts | 2 +- .../1652905585850-AddAPIKeyColumn.ts | 2 +- .../1654090467022-IntroducePinData.ts | 2 +- .../postgresdb/1658932090381-AddNodeIds.ts | 0 .../1659902242948-AddJsonKeyPinData.ts | 0 ...1660062385367-CreateCredentialsUserRole.ts | 2 +- ...1663755770893-CreateWorkflowsEditorRole.ts | 2 +- .../1664196174001-WorkflowStatistics.ts | 2 +- ...665484192212-CreateCredentialUsageTable.ts | 2 +- ...665754637025-RemoveCredentialUsageTable.ts | 2 +- ...669739707126-AddWorkflowVersionIdColumn.ts | 0 .../1669823906995-AddTriggerCountColumn.ts | 2 +- ...71535397530-MessageEventBusDestinations.ts | 2 +- ...1726148421-RemoveWorkflowDataLoadedFlag.ts | 0 ...268682475-DeleteExecutionsWithWorkflows.ts | 2 +- .../1674138566000-AddStatusToExecutions.ts | 2 +- .../1676996103000-MigrateExecutionStatus.ts | 2 +- ...7236854063-UpdateRunningExecutionStatus.ts | 2 +- .../1677501636754-CreateVariables.ts | 2 +- ...9416281778-CreateExecutionMetadataTable.ts | 2 +- .../1681134145996-AddUserActivatedProperty.ts | 5 +- .../1681134145997-RemoveSkipOwnerSetup.ts | 2 +- ...690000000000-MigrateIntegerKeysToString.ts | 2 +- .../1690000000020-SeparateExecutionData.ts | 2 +- ...731-AddMissingPrimaryKeyOnExecutionData.ts | 2 +- .../1694091729095-MigrateToTimestampTz.ts | 2 +- ...1717498465931-AddActivatedAtUserSetting.ts | 2 +- ...1377157740-FixExecutionMetadataSequence.ts | 2 +- ...748663-MigrateTestDefinitionKeyToString.ts | 2 +- ...740445074052-UpdateParentFolderIdColumn.ts | 2 +- .../db/src}/migrations/postgresdb/index.ts | 3 +- .../sqlite/1588102412422-InitialMigration.ts | 2 +- .../sqlite/1592445003908-WebhookModel.ts | 2 +- .../1594825041918-CreateIndexStoppedAt.ts | 2 +- .../1607431743769-MakeStoppedAtNullable.ts | 2 +- .../sqlite/1611071044839-AddWebhookId.ts | 2 +- .../sqlite/1617213344594-CreateTagEntity.ts | 2 +- .../sqlite/1621707690587-AddWaitColumn.ts | 2 +- ...1644421939510-AddExecutionEntityIndexes.ts | 2 +- .../1646992772331-CreateUserManagement.ts | 2 +- .../1648740597343-LowerCaseUserEmail.ts | 2 +- .../sqlite/1652254514001-CommunityNodes.ts | 2 +- .../sqlite/1652367743993-AddUserSettings.ts | 2 +- .../sqlite/1652905585850-AddAPIKeyColumn.ts | 2 +- .../sqlite/1654089251344-IntroducePinData.ts | 2 +- ...1660062385367-CreateCredentialsUserRole.ts | 2 +- .../1663755770892-CreateWorkflowsUserRole.ts | 2 +- .../1664196174000-WorkflowStatistics.ts | 2 +- ...665484192211-CreateCredentialUsageTable.ts | 2 +- ...665754637024-RemoveCredentialUsageTable.ts | 2 +- .../1669823906993-AddTriggerCountColumn.ts | 2 +- ...71535397530-MessageEventBusDestinations.ts | 2 +- ...268682475-DeleteExecutionsWithWorkflows.ts | 2 +- .../1674138566000-AddStatusToExecutions.ts | 2 +- .../1676996103000-MigrateExecutionStatus.ts | 2 +- ...7237073720-UpdateRunningExecutionStatus.ts | 2 +- .../sqlite/1677501636752-CreateVariables.ts | 2 +- ...9416281777-CreateExecutionMetadataTable.ts | 2 +- .../1681134145996-AddUserActivatedProperty.ts | 5 +- .../1681134145997-RemoveSkipOwnerSetup.ts | 2 +- ...690000000002-MigrateIntegerKeysToString.ts | 2 +- .../1690000000010-SeparateExecutionData.ts | 2 +- ...-FixMissingIndicesFromStringIdMigration.ts | 2 +- ...690000000030-RemoveResetPasswordColumns.ts | 0 .../sqlite/1690000000040-AddMfaColumns.ts | 0 .../1693491613982-ExecutionSoftDelete.ts | 0 .../1695128658538-AddWorkflowMetadata.ts | 0 .../sqlite/1705429061930-DropRoleMapping.ts | 0 ...1717498465931-AddActivatedAtUserSetting.ts | 2 +- .../sqlite/1724951148974-AddApiKeysTable.ts | 9 ++-- ...MissingPrimaryKeyOnAnnotationTagMapping.ts | 2 +- .../sqlite/1729607673469-AddProjectIcons.ts | 0 ...04028106-AddDescriptionToTestDefinition.ts | 0 ...748663-MigrateTestDefinitionKeyToString.ts | 2 +- .../sqlite/1738709609940-CreateFolderTable.ts | 0 ...740445074052-UpdateParentFolderIdColumn.ts | 3 +- .../1742918400000-AddScopesColumnToApiKeys.ts | 0 .../db/src}/migrations/sqlite/index.ts | 3 +- packages/@n8n/permissions/src/index.ts | 1 + .../src/public-api-permissions.ee.ts} | 19 +++++++- .../src/commands/db/__tests__/revert.test.ts | 2 +- packages/cli/src/commands/db/revert.ts | 4 +- packages/cli/src/commands/ldap/reset.ts | 2 +- .../src/controllers/api-keys.controller.ts | 2 +- .../__tests__/db-connection-options.test.ts | 6 +-- .../databases/__tests__/db-connection.test.ts | 4 +- .../src/databases/db-connection-options.ts | 12 +++-- packages/cli/src/databases/db-connection.ts | 4 +- .../ldap.ee/__tests__/ldap.service.test.ts | 9 +--- packages/cli/src/ldap.ee/constants.ts | 26 +--------- packages/cli/src/ldap.ee/helpers.ee.ts | 2 +- packages/cli/src/ldap.ee/ldap.service.ee.ts | 10 ++-- packages/cli/src/ldap.ee/types.ts | 25 +--------- .../src/public-api/permissions.ee/index.ts | 24 ---------- .../__tests__/public-api-key.service.test.ts | 3 +- .../src/services/public-api-key.service.ts | 2 +- .../cli/test/integration/api-keys.api.test.ts | 7 ++- .../test/integration/ldap/ldap.api.test.ts | 2 +- .../endpoints-with-scopes-enabled.test.ts | 2 +- .../cli/test/integration/shared/db/users.ts | 2 +- packages/cli/test/integration/shared/ldap.ts | 5 +- pnpm-lock.yaml | 45 ++++++++++------- 223 files changed, 344 insertions(+), 339 deletions(-) rename packages/{cli/src/databases/utils => @n8n/db/src/migrations}/__tests__/migration-helpers.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1620821879465-UniqueWorkflowNames.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1630330987096-UpdateWorkflowCredentials.ts (97%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1658930531669-AddNodeIds.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1659888469333-AddJsonKeyPinData.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1674509946020-CreateLdapEntities.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts (77%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1690000000030-RemoveResetPasswordColumns.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1690000000040-AddMfaColumns.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1691088862123-CreateWorkflowNameIndex.ts (79%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1693491613982-ExecutionSoftDelete.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1693554410387-DisallowOrphanExecutions.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1695128658538-AddWorkflowMetadata.ts (80%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1700571993961-AddGlobalAdminRole.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1705429061930-DropRoleMapping.ts (98%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts (78%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1711390882123-MoveSshKeysToDatabase.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1712044305787-RemoveNodesAccess.ts (71%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1714133768519-CreateProject.ts (98%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1714133768521-MakeExecutionStatusNonNullable.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts (98%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1723796243146-RefactorExecutionIndices.ts (98%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1724753530828-CreateExecutionAnnotationTables.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1724951148974-AddApiKeysTable.ts (92%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1726606152711-CreateProcessedDataTable.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1729607673469-AddProjectIcons.ts (79%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1730386903556-CreateTestDefinitionTable.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts (81%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1732271325258-CreateTestMetricTable.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1732549866705-CreateTestRunTable.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1737715421462-AddErrorColumnsToTestRuns.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1738709609940-CreateFolderTable.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1739549398681-CreateAnalyticsTables.ts (97%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1741167584277-RenameAnalyticsToInsights.ts (97%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1745587087521-AddWorkflowStatisticsRootCount.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1745934666076-AddWorkflowArchivedColumn.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/common/1745934666077-DropRoleTable.ts (83%) rename packages/{cli/src/databases => @n8n/db/src/migrations}/dsl/column.ts (100%) rename packages/{cli/src/databases => @n8n/db/src/migrations}/dsl/index.ts (100%) rename packages/{cli/src/databases => @n8n/db/src/migrations}/dsl/indices.ts (100%) rename packages/{cli/src/databases => @n8n/db/src/migrations}/dsl/table.ts (100%) rename packages/{cli/src/databases/utils => @n8n/db/src/migrations}/migration-helpers.ts (96%) rename packages/{cli/src/databases/types.ts => @n8n/db/src/migrations/migration-types.ts} (92%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1588157391238-InitialMigration.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1592447867632-WebhookModel.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts (87%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1611149998770-AddWebhookId.ts (92%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1615306975123-ChangeDataSize.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1617268711084-CreateTagEntity.ts (98%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts (85%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1626183952959-AddWaitColumn.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1646992772331-CreateUserManagement.ts (99%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts (74%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1652254514003-CommunityNodes.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1652367743993-AddUserSettings.ts (87%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1654090101303-IntroducePinData.ts (83%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1658932910559-AddNodeIds.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1664196174002-WorkflowStatistics.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts (85%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1677501636753-CreateVariables.ts (87%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts (92%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts (77%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts (99%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1690000000030-SeparateExecutionData.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1690000000031-FixExecutionDataType.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1732271325258-CreateTestMetricTable.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1736172058779-AddStatsColumnsToTestRun.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1739873751194-FixTestDefinitionPrimaryKey.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/mysqldb/index.ts (99%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1587669153312-InitialMigration.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1589476000887-WebhookModel.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts (76%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1611144599516-AddWebhookId.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1617270242566-CreateTagEntity.ts (98%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1626176912946-AddwaitTill.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts (76%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1646992772331-CreateUserManagement.ts (99%) rename packages/{cli/src/databases/migrations/sqlite => @n8n/db/src/migrations/postgresdb}/1648740597343-LowerCaseUserEmail.ts (74%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1652254514002-CommunityNodes.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1652367743993-AddUserSettings.ts (87%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1654090467022-IntroducePinData.ts (82%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1658932090381-AddNodeIds.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts (85%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts (85%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1664196174001-WorkflowStatistics.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts (87%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts (83%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1677501636754-CreateVariables.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts (92%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts (76%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts (99%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1690000000020-SeparateExecutionData.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts (76%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts (82%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/postgresdb/index.ts (99%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1588102412422-InitialMigration.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1592445003908-WebhookModel.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts (84%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts (92%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1611071044839-AddWebhookId.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1617213344594-CreateTagEntity.ts (98%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1621707690587-AddWaitColumn.ts (97%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1646992772331-CreateUserManagement.ts (99%) rename packages/{cli/src/databases/migrations/postgresdb => @n8n/db/src/migrations/sqlite}/1648740597343-LowerCaseUserEmail.ts (74%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1652254514001-CommunityNodes.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1652367743993-AddUserSettings.ts (97%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts (97%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1654089251344-IntroducePinData.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts (85%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts (85%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1664196174000-WorkflowStatistics.ts (91%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts (93%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts (89%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts (97%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1674138566000-AddStatusToExecutions.ts (83%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts (90%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts (85%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1677501636752-CreateVariables.ts (86%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts (92%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts (76%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts (99%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1690000000010-SeparateExecutionData.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1690000000040-AddMfaColumns.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1705429061930-DropRoleMapping.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1717498465931-AddActivatedAtUserSetting.ts (88%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1724951148974-AddApiKeysTable.ts (94%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1729607673469-AddProjectIcons.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts (95%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1738709609940-CreateFolderTable.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts (96%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.ts (100%) rename packages/{cli/src/databases => @n8n/db/src}/migrations/sqlite/index.ts (99%) rename packages/{cli/src/public-api/permissions.ee/global-roles-scopes.ts => @n8n/permissions/src/public-api-permissions.ee.ts} (65%) delete mode 100644 packages/cli/src/public-api/permissions.ee/index.ts diff --git a/packages/@n8n/constants/src/index.ts b/packages/@n8n/constants/src/index.ts index 8c50ea2791e..0fad17020f4 100644 --- a/packages/@n8n/constants/src/index.ts +++ b/packages/@n8n/constants/src/index.ts @@ -45,3 +45,51 @@ export const UNLIMITED_LICENSE_QUOTA = -1; export type BooleanLicenseFeature = (typeof LICENSE_FEATURES)[keyof typeof LICENSE_FEATURES]; export type NumericLicenseFeature = (typeof LICENSE_QUOTAS)[keyof typeof LICENSE_QUOTAS]; + +export const LDAP_FEATURE_NAME = 'features.ldap'; + +export type ConnectionSecurity = 'none' | 'tls' | 'startTls'; + +export interface LdapConfig { + loginEnabled: boolean; + loginLabel: string; + connectionUrl: string; + allowUnauthorizedCerts: boolean; + connectionSecurity: ConnectionSecurity; + connectionPort: number; + baseDn: string; + bindingAdminDn: string; + bindingAdminPassword: string; + firstNameAttribute: string; + lastNameAttribute: string; + emailAttribute: string; + loginIdAttribute: string; + ldapIdAttribute: string; + userFilter: string; + synchronizationEnabled: boolean; + synchronizationInterval: number; // minutes + searchPageSize: number; + searchTimeout: number; +} + +export const LDAP_DEFAULT_CONFIGURATION: LdapConfig = { + loginEnabled: false, + loginLabel: '', + connectionUrl: '', + allowUnauthorizedCerts: false, + connectionSecurity: 'none', + connectionPort: 389, + baseDn: '', + bindingAdminDn: '', + bindingAdminPassword: '', + firstNameAttribute: '', + lastNameAttribute: '', + emailAttribute: '', + loginIdAttribute: '', + ldapIdAttribute: '', + userFilter: '', + synchronizationEnabled: false, + synchronizationInterval: 60, + searchPageSize: 0, + searchTimeout: 60, +}; diff --git a/packages/@n8n/db/package.json b/packages/@n8n/db/package.json index 1742782fbee..7033390f655 100644 --- a/packages/@n8n/db/package.json +++ b/packages/@n8n/db/package.json @@ -22,6 +22,7 @@ ], "dependencies": { "@n8n/config": "workspace:^", + "@n8n/constants": "workspace:^", "@n8n/di": "workspace:^", "@n8n/permissions": "workspace:^", "@n8n/typeorm": "catalog:", @@ -31,7 +32,9 @@ "n8n-core": "workspace:^", "n8n-workflow": "workspace:^", "nanoid": "catalog:", + "p-lazy": "3.1.0", "reflect-metadata": "catalog:", + "uuid": "catalog:", "xss": "catalog:" }, "devDependencies": { diff --git a/packages/@n8n/db/src/index.ts b/packages/@n8n/db/src/index.ts index 7402d4b3ed6..4a8abca2236 100644 --- a/packages/@n8n/db/src/index.ts +++ b/packages/@n8n/db/src/index.ts @@ -21,3 +21,10 @@ export { NoUrl } from './utils/validators/no-url.validator'; export * from './repositories'; export * from './subscribers'; + +export { sqliteMigrations } from './migrations/sqlite'; +export { mysqlMigrations } from './migrations/mysqldb'; +export { postgresMigrations } from './migrations/postgresdb'; + +export { wrapMigration } from './migrations/migration-helpers'; +export * from './migrations/migration-types'; diff --git a/packages/cli/src/databases/utils/__tests__/migration-helpers.ts b/packages/@n8n/db/src/migrations/__tests__/migration-helpers.ts similarity index 93% rename from packages/cli/src/databases/utils/__tests__/migration-helpers.ts rename to packages/@n8n/db/src/migrations/__tests__/migration-helpers.ts index 0b555185118..5109fa3cf3c 100644 --- a/packages/cli/src/databases/utils/__tests__/migration-helpers.ts +++ b/packages/@n8n/db/src/migrations/__tests__/migration-helpers.ts @@ -1,5 +1,5 @@ -import type { IrreversibleMigration, ReversibleMigration } from '@/databases/types'; -import { wrapMigration } from '@/databases/utils/migration-helpers'; +import { wrapMigration } from '../migration-helpers'; +import type { IrreversibleMigration, ReversibleMigration } from '../migration-types'; describe('migrationHelpers.wrapMigration', () => { test('throws if passed a migration without up method', async () => { diff --git a/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts b/packages/@n8n/db/src/migrations/common/1620821879465-UniqueWorkflowNames.ts similarity index 91% rename from packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts rename to packages/@n8n/db/src/migrations/common/1620821879465-UniqueWorkflowNames.ts index 1847a674e36..714d2f28e28 100644 --- a/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts +++ b/packages/@n8n/db/src/migrations/common/1620821879465-UniqueWorkflowNames.ts @@ -1,6 +1,5 @@ -import type { WorkflowEntity } from '@n8n/db'; - -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { WorkflowEntity } from '../../entities'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class UniqueWorkflowNames1620821879465 implements ReversibleMigration { protected indexSuffix = '943d8f922be094eb507cb9a7f9'; diff --git a/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts b/packages/@n8n/db/src/migrations/common/1630330987096-UpdateWorkflowCredentials.ts similarity index 97% rename from packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts rename to packages/@n8n/db/src/migrations/common/1630330987096-UpdateWorkflowCredentials.ts index 230cdc38215..d55eff44d6b 100644 --- a/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts +++ b/packages/@n8n/db/src/migrations/common/1630330987096-UpdateWorkflowCredentials.ts @@ -1,7 +1,8 @@ -import type { CredentialsEntity, WorkflowEntity } from '@n8n/db'; +/* eslint-disable @typescript-eslint/ban-ts-comment */ import type { IWorkflowBase } from 'n8n-workflow'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { CredentialsEntity, WorkflowEntity } from '../../entities'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; type Credential = Pick; type ExecutionWithData = { id: string; workflowData: string | IWorkflowBase }; diff --git a/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts b/packages/@n8n/db/src/migrations/common/1658930531669-AddNodeIds.ts similarity index 91% rename from packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts rename to packages/@n8n/db/src/migrations/common/1658930531669-AddNodeIds.ts index b96bfd99fad..8a7b3667e56 100644 --- a/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts +++ b/packages/@n8n/db/src/migrations/common/1658930531669-AddNodeIds.ts @@ -1,8 +1,8 @@ -import type { WorkflowEntity } from '@n8n/db'; import type { INode } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { WorkflowEntity } from '../../entities'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; type Workflow = Pick & { nodes: string | INode[] }; diff --git a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts b/packages/@n8n/db/src/migrations/common/1659888469333-AddJsonKeyPinData.ts similarity index 96% rename from packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts rename to packages/@n8n/db/src/migrations/common/1659888469333-AddJsonKeyPinData.ts index 75ce65ad6bf..4363a1d4ab5 100644 --- a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts +++ b/packages/@n8n/db/src/migrations/common/1659888469333-AddJsonKeyPinData.ts @@ -1,7 +1,7 @@ import { isObjectLiteral } from 'n8n-core'; import type { IDataObject, INodeExecutionData } from 'n8n-workflow'; -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; type OldPinnedData = { [nodeName: string]: IDataObject[] }; type NewPinnedData = { [nodeName: string]: INodeExecutionData[] }; diff --git a/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts b/packages/@n8n/db/src/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts similarity index 91% rename from packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts rename to packages/@n8n/db/src/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts index 8013ee299eb..138788ebda6 100644 --- a/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts +++ b/packages/@n8n/db/src/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts @@ -1,6 +1,6 @@ import { v4 as uuidv4 } from 'uuid'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; type Workflow = { id: number }; diff --git a/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts b/packages/@n8n/db/src/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts similarity index 93% rename from packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts rename to packages/@n8n/db/src/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts index 053705b9a20..9fae1b1bbea 100644 --- a/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts +++ b/packages/@n8n/db/src/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts @@ -1,6 +1,5 @@ -import { StatisticsNames } from '@n8n/db'; - -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import { StatisticsNames } from '../../entities/types-db'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class RemoveWorkflowDataLoadedFlag1671726148419 implements ReversibleMigration { async up({ escape, dbType, runQuery }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts b/packages/@n8n/db/src/migrations/common/1674509946020-CreateLdapEntities.ts similarity index 94% rename from packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts rename to packages/@n8n/db/src/migrations/common/1674509946020-CreateLdapEntities.ts index 95a2c11a51f..8846da118e8 100644 --- a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts +++ b/packages/@n8n/db/src/migrations/common/1674509946020-CreateLdapEntities.ts @@ -1,5 +1,6 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; -import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants'; +import { LDAP_FEATURE_NAME, LDAP_DEFAULT_CONFIGURATION } from '@n8n/constants'; + +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateLdapEntities1674509946020 implements ReversibleMigration { async up({ escape, dbType, isMysql, runQuery }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/@n8n/db/src/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts similarity index 77% rename from packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts rename to packages/@n8n/db/src/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts index cd9bfde848b..baf2605b0cc 100644 --- a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts +++ b/packages/@n8n/db/src/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts @@ -1,7 +1,7 @@ -import { WorkflowEntity } from '@n8n/db'; import { UserError } from 'n8n-workflow'; -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import { WorkflowEntity } from '../../entities'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class PurgeInvalidWorkflowConnections1675940580449 implements IrreversibleMigration { async up({ queryRunner }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts b/packages/@n8n/db/src/migrations/common/1690000000030-RemoveResetPasswordColumns.ts similarity index 84% rename from packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts rename to packages/@n8n/db/src/migrations/common/1690000000030-RemoveResetPasswordColumns.ts index ef514285b25..01843b46aea 100644 --- a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts +++ b/packages/@n8n/db/src/migrations/common/1690000000030-RemoveResetPasswordColumns.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class RemoveResetPasswordColumns1690000000030 implements ReversibleMigration { async up({ schemaBuilder: { dropColumns } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1690000000040-AddMfaColumns.ts b/packages/@n8n/db/src/migrations/common/1690000000040-AddMfaColumns.ts similarity index 84% rename from packages/cli/src/databases/migrations/common/1690000000040-AddMfaColumns.ts rename to packages/@n8n/db/src/migrations/common/1690000000040-AddMfaColumns.ts index 12f1000ffe6..eb1e2b609b5 100644 --- a/packages/cli/src/databases/migrations/common/1690000000040-AddMfaColumns.ts +++ b/packages/@n8n/db/src/migrations/common/1690000000040-AddMfaColumns.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddMfaColumns1690000000030 implements ReversibleMigration { async up({ schemaBuilder: { addColumns, column } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts b/packages/@n8n/db/src/migrations/common/1691088862123-CreateWorkflowNameIndex.ts similarity index 79% rename from packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts rename to packages/@n8n/db/src/migrations/common/1691088862123-CreateWorkflowNameIndex.ts index a29feda0098..9f96c821243 100644 --- a/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts +++ b/packages/@n8n/db/src/migrations/common/1691088862123-CreateWorkflowNameIndex.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateWorkflowNameIndex1691088862123 implements ReversibleMigration { async up({ schemaBuilder: { createIndex } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts b/packages/@n8n/db/src/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts similarity index 90% rename from packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts rename to packages/@n8n/db/src/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts index 8538dba59e5..1f3554b4771 100644 --- a/packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts +++ b/packages/@n8n/db/src/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const tableName = 'workflow_history'; diff --git a/packages/cli/src/databases/migrations/common/1693491613982-ExecutionSoftDelete.ts b/packages/@n8n/db/src/migrations/common/1693491613982-ExecutionSoftDelete.ts similarity index 90% rename from packages/cli/src/databases/migrations/common/1693491613982-ExecutionSoftDelete.ts rename to packages/@n8n/db/src/migrations/common/1693491613982-ExecutionSoftDelete.ts index 50e31e809b5..bf6af3c20c7 100644 --- a/packages/cli/src/databases/migrations/common/1693491613982-ExecutionSoftDelete.ts +++ b/packages/@n8n/db/src/migrations/common/1693491613982-ExecutionSoftDelete.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; /** * Add an indexed column `deletedAt` to track soft-deleted executions. diff --git a/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts b/packages/@n8n/db/src/migrations/common/1693554410387-DisallowOrphanExecutions.ts similarity index 89% rename from packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts rename to packages/@n8n/db/src/migrations/common/1693554410387-DisallowOrphanExecutions.ts index b38e8fd4c3e..86bd272a10b 100644 --- a/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts +++ b/packages/@n8n/db/src/migrations/common/1693554410387-DisallowOrphanExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class DisallowOrphanExecutions1693554410387 implements ReversibleMigration { /** diff --git a/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts b/packages/@n8n/db/src/migrations/common/1695128658538-AddWorkflowMetadata.ts similarity index 80% rename from packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts rename to packages/@n8n/db/src/migrations/common/1695128658538-AddWorkflowMetadata.ts index 40374417af2..c742fad8408 100644 --- a/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts +++ b/packages/@n8n/db/src/migrations/common/1695128658538-AddWorkflowMetadata.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddWorkflowMetadata1695128658538 implements ReversibleMigration { async up({ schemaBuilder: { addColumns, column } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts b/packages/@n8n/db/src/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts similarity index 88% rename from packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts rename to packages/@n8n/db/src/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts index afed132cafe..d224e42785e 100644 --- a/packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts +++ b/packages/@n8n/db/src/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const tableName = 'workflow_history'; diff --git a/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts b/packages/@n8n/db/src/migrations/common/1700571993961-AddGlobalAdminRole.ts similarity index 95% rename from packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts rename to packages/@n8n/db/src/migrations/common/1700571993961-AddGlobalAdminRole.ts index 29469a3738c..f8f8db1b55b 100644 --- a/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts +++ b/packages/@n8n/db/src/migrations/common/1700571993961-AddGlobalAdminRole.ts @@ -1,6 +1,6 @@ import { UnexpectedError } from 'n8n-workflow'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddGlobalAdminRole1700571993961 implements ReversibleMigration { async up({ escape, runQuery }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts b/packages/@n8n/db/src/migrations/common/1705429061930-DropRoleMapping.ts similarity index 98% rename from packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts rename to packages/@n8n/db/src/migrations/common/1705429061930-DropRoleMapping.ts index d62bd648a14..71ff6dd1d86 100644 --- a/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts +++ b/packages/@n8n/db/src/migrations/common/1705429061930-DropRoleMapping.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; type Table = 'user' | 'shared_workflow' | 'shared_credentials'; diff --git a/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts b/packages/@n8n/db/src/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts similarity index 78% rename from packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts rename to packages/@n8n/db/src/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts index 59b4218974d..dad192a4252 100644 --- a/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts +++ b/packages/@n8n/db/src/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class RemoveFailedExecutionStatus1711018413374 implements IrreversibleMigration { async up({ escape, runQuery }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts b/packages/@n8n/db/src/migrations/common/1711390882123-MoveSshKeysToDatabase.ts similarity index 95% rename from packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts rename to packages/@n8n/db/src/migrations/common/1711390882123-MoveSshKeysToDatabase.ts index 2db009da071..33fbf8d8a1b 100644 --- a/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts +++ b/packages/@n8n/db/src/migrations/common/1711390882123-MoveSshKeysToDatabase.ts @@ -4,7 +4,7 @@ import { jsonParse } from 'n8n-workflow'; import { readFile, writeFile, rm } from 'node:fs/promises'; import path from 'node:path'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; /** * Move SSH key pair from file system to database, to enable SSH connections @@ -71,6 +71,7 @@ export class MoveSshKeysToDatabase1711390882123 implements ReversibleMigration { try { await Promise.all([rm(this.privateKeyPath), rm(this.publicKeyPath)]); } catch (e) { + // eslint-disable-next-line @typescript-eslint/restrict-template-expressions const error = e instanceof Error ? e : new Error(`${e}`); logger.error( `[${migrationName}] Failed to remove SSH keys from filesystem: ${error.message}`, diff --git a/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts b/packages/@n8n/db/src/migrations/common/1712044305787-RemoveNodesAccess.ts similarity index 71% rename from packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts rename to packages/@n8n/db/src/migrations/common/1712044305787-RemoveNodesAccess.ts index 8b206551c89..1ffe4fbff2b 100644 --- a/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts +++ b/packages/@n8n/db/src/migrations/common/1712044305787-RemoveNodesAccess.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class RemoveNodesAccess1712044305787 implements IrreversibleMigration { async up({ schemaBuilder: { dropColumns } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts b/packages/@n8n/db/src/migrations/common/1714133768519-CreateProject.ts similarity index 98% rename from packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts rename to packages/@n8n/db/src/migrations/common/1714133768519-CreateProject.ts index b9a9f1a5816..64c6ee904db 100644 --- a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts +++ b/packages/@n8n/db/src/migrations/common/1714133768519-CreateProject.ts @@ -1,10 +1,10 @@ -import { generateNanoId } from '@n8n/db'; -import type { User } from '@n8n/db'; import type { ProjectRole } from '@n8n/permissions'; import { UserError } from 'n8n-workflow'; import { nanoid } from 'nanoid'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { User } from '../../entities'; +import { generateNanoId } from '../../utils/generators'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const projectAdminRole: ProjectRole = 'project:personalOwner'; diff --git a/packages/cli/src/databases/migrations/common/1714133768521-MakeExecutionStatusNonNullable.ts b/packages/@n8n/db/src/migrations/common/1714133768521-MakeExecutionStatusNonNullable.ts similarity index 88% rename from packages/cli/src/databases/migrations/common/1714133768521-MakeExecutionStatusNonNullable.ts rename to packages/@n8n/db/src/migrations/common/1714133768521-MakeExecutionStatusNonNullable.ts index c3ccfed43d7..08e27e27b53 100644 --- a/packages/cli/src/databases/migrations/common/1714133768521-MakeExecutionStatusNonNullable.ts +++ b/packages/@n8n/db/src/migrations/common/1714133768521-MakeExecutionStatusNonNullable.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class MakeExecutionStatusNonNullable1714133768521 implements IrreversibleMigration { async up({ escape, runQuery, schemaBuilder }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts b/packages/@n8n/db/src/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts similarity index 98% rename from packages/cli/src/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts rename to packages/@n8n/db/src/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts index 392b84aa17b..8c958855ae6 100644 --- a/packages/cli/src/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts +++ b/packages/@n8n/db/src/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts @@ -1,6 +1,6 @@ import { nanoid } from 'nanoid'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddConstraintToExecutionMetadata1720101653148 implements ReversibleMigration { async up(context: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts b/packages/@n8n/db/src/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts similarity index 84% rename from packages/cli/src/databases/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts rename to packages/@n8n/db/src/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts index 30ec1b8ad8c..71938d4717c 100644 --- a/packages/cli/src/databases/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts +++ b/packages/@n8n/db/src/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const tableName = 'invalid_auth_token'; diff --git a/packages/cli/src/databases/migrations/common/1723796243146-RefactorExecutionIndices.ts b/packages/@n8n/db/src/migrations/common/1723796243146-RefactorExecutionIndices.ts similarity index 98% rename from packages/cli/src/databases/migrations/common/1723796243146-RefactorExecutionIndices.ts rename to packages/@n8n/db/src/migrations/common/1723796243146-RefactorExecutionIndices.ts index dcf558f2022..32d45946980 100644 --- a/packages/cli/src/databases/migrations/common/1723796243146-RefactorExecutionIndices.ts +++ b/packages/@n8n/db/src/migrations/common/1723796243146-RefactorExecutionIndices.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; /** * Add new indices: diff --git a/packages/cli/src/databases/migrations/common/1724753530828-CreateExecutionAnnotationTables.ts b/packages/@n8n/db/src/migrations/common/1724753530828-CreateExecutionAnnotationTables.ts similarity index 95% rename from packages/cli/src/databases/migrations/common/1724753530828-CreateExecutionAnnotationTables.ts rename to packages/@n8n/db/src/migrations/common/1724753530828-CreateExecutionAnnotationTables.ts index 58cd3cc3f1c..ca75c6a5f85 100644 --- a/packages/cli/src/databases/migrations/common/1724753530828-CreateExecutionAnnotationTables.ts +++ b/packages/@n8n/db/src/migrations/common/1724753530828-CreateExecutionAnnotationTables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const annotationsTableName = 'execution_annotations'; const annotationTagsTableName = 'annotation_tag_entity'; diff --git a/packages/cli/src/databases/migrations/common/1724951148974-AddApiKeysTable.ts b/packages/@n8n/db/src/migrations/common/1724951148974-AddApiKeysTable.ts similarity index 92% rename from packages/cli/src/databases/migrations/common/1724951148974-AddApiKeysTable.ts rename to packages/@n8n/db/src/migrations/common/1724951148974-AddApiKeysTable.ts index a7fc0a85fbc..feeeee2c0ee 100644 --- a/packages/cli/src/databases/migrations/common/1724951148974-AddApiKeysTable.ts +++ b/packages/@n8n/db/src/migrations/common/1724951148974-AddApiKeysTable.ts @@ -1,7 +1,6 @@ -import { generateNanoId } from '@n8n/db'; -import type { ApiKey } from '@n8n/db'; - -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { ApiKey } from '../../entities'; +import { generateNanoId } from '../../utils/generators'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddApiKeysTable1724951148974 implements ReversibleMigration { async up({ @@ -40,6 +39,7 @@ export class AddApiKeysTable1724951148974 implements ReversibleMigration { // Move the apiKey from the users table to the new table await Promise.all( usersWithApiKeys.map( + // @ts-expect-error Tech debt async (user: { id: string; apiKey: string }) => await runQuery( `INSERT INTO ${userApiKeysTable} (${idColumn}, ${userIdColumn}, ${apiKeyColumn}, ${labelColumn}) VALUES (:id, :userId, :apiKey, :label)`, @@ -97,6 +97,7 @@ export class AddApiKeysTable1724951148974 implements ReversibleMigration { await Promise.all( oldestApiKeysPerUser.map( + // @ts-expect-error Tech debt async (user: { userId: string; apiKey: string }) => await runQuery( `UPDATE ${userTable} SET ${apiKeyColumn} = :apiKey WHERE ${idColumn} = :userId`, diff --git a/packages/cli/src/databases/migrations/common/1726606152711-CreateProcessedDataTable.ts b/packages/@n8n/db/src/migrations/common/1726606152711-CreateProcessedDataTable.ts similarity index 89% rename from packages/cli/src/databases/migrations/common/1726606152711-CreateProcessedDataTable.ts rename to packages/@n8n/db/src/migrations/common/1726606152711-CreateProcessedDataTable.ts index 86992a0580b..5c4ea9edbeb 100644 --- a/packages/cli/src/databases/migrations/common/1726606152711-CreateProcessedDataTable.ts +++ b/packages/@n8n/db/src/migrations/common/1726606152711-CreateProcessedDataTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const processedDataTableName = 'processed_data'; diff --git a/packages/cli/src/databases/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts b/packages/@n8n/db/src/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts similarity index 91% rename from packages/cli/src/databases/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts rename to packages/@n8n/db/src/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts index a44450fa2fb..568b4b58d83 100644 --- a/packages/cli/src/databases/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts +++ b/packages/@n8n/db/src/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class SeparateExecutionCreationFromStart1727427440136 implements ReversibleMigration { async up({ diff --git a/packages/cli/src/databases/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts b/packages/@n8n/db/src/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts similarity index 88% rename from packages/cli/src/databases/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts rename to packages/@n8n/db/src/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts index 51735d660a3..96fecc316a7 100644 --- a/packages/cli/src/databases/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts +++ b/packages/@n8n/db/src/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts @@ -1,6 +1,6 @@ import assert from 'node:assert'; -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644 implements IrreversibleMigration diff --git a/packages/cli/src/databases/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.ts b/packages/@n8n/db/src/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.ts similarity index 94% rename from packages/cli/src/databases/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.ts rename to packages/@n8n/db/src/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.ts index 074b710fa18..028178dff0d 100644 --- a/packages/cli/src/databases/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.ts +++ b/packages/@n8n/db/src/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const processedDataTableName = 'processed_data'; export class UpdateProcessedDataValueColumnToText1729607673464 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/common/1729607673469-AddProjectIcons.ts b/packages/@n8n/db/src/migrations/common/1729607673469-AddProjectIcons.ts similarity index 79% rename from packages/cli/src/databases/migrations/common/1729607673469-AddProjectIcons.ts rename to packages/@n8n/db/src/migrations/common/1729607673469-AddProjectIcons.ts index e2c710428a5..41ee3283775 100644 --- a/packages/cli/src/databases/migrations/common/1729607673469-AddProjectIcons.ts +++ b/packages/@n8n/db/src/migrations/common/1729607673469-AddProjectIcons.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddProjectIcons1729607673469 implements ReversibleMigration { async up({ schemaBuilder: { addColumns, column } }: MigrationContext) { await addColumns('project', [column('icon').json]); diff --git a/packages/cli/src/databases/migrations/common/1730386903556-CreateTestDefinitionTable.ts b/packages/@n8n/db/src/migrations/common/1730386903556-CreateTestDefinitionTable.ts similarity index 93% rename from packages/cli/src/databases/migrations/common/1730386903556-CreateTestDefinitionTable.ts rename to packages/@n8n/db/src/migrations/common/1730386903556-CreateTestDefinitionTable.ts index d71353ee73c..f363eb14ef2 100644 --- a/packages/cli/src/databases/migrations/common/1730386903556-CreateTestDefinitionTable.ts +++ b/packages/@n8n/db/src/migrations/common/1730386903556-CreateTestDefinitionTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const testEntityTableName = 'test_definition'; diff --git a/packages/cli/src/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts b/packages/@n8n/db/src/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts similarity index 81% rename from packages/cli/src/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts rename to packages/@n8n/db/src/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts index 5063bdf2326..6165b1ba520 100644 --- a/packages/cli/src/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts +++ b/packages/@n8n/db/src/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddDescriptionToTestDefinition1731404028106 implements ReversibleMigration { async up({ schemaBuilder: { addColumns, column } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1732271325258-CreateTestMetricTable.ts b/packages/@n8n/db/src/migrations/common/1732271325258-CreateTestMetricTable.ts similarity index 89% rename from packages/cli/src/databases/migrations/common/1732271325258-CreateTestMetricTable.ts rename to packages/@n8n/db/src/migrations/common/1732271325258-CreateTestMetricTable.ts index 33460d8fb1d..c1584cb6e65 100644 --- a/packages/cli/src/databases/migrations/common/1732271325258-CreateTestMetricTable.ts +++ b/packages/@n8n/db/src/migrations/common/1732271325258-CreateTestMetricTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const testMetricEntityTableName = 'test_metric'; diff --git a/packages/cli/src/databases/migrations/common/1732549866705-CreateTestRunTable.ts b/packages/@n8n/db/src/migrations/common/1732549866705-CreateTestRunTable.ts similarity index 90% rename from packages/cli/src/databases/migrations/common/1732549866705-CreateTestRunTable.ts rename to packages/@n8n/db/src/migrations/common/1732549866705-CreateTestRunTable.ts index e9dc0ba823c..2f77262c3ab 100644 --- a/packages/cli/src/databases/migrations/common/1732549866705-CreateTestRunTable.ts +++ b/packages/@n8n/db/src/migrations/common/1732549866705-CreateTestRunTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const testRunTableName = 'test_run'; diff --git a/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts b/packages/@n8n/db/src/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts similarity index 91% rename from packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts rename to packages/@n8n/db/src/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts index 53f650ebcf9..8d9efd680f1 100644 --- a/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts +++ b/packages/@n8n/db/src/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; // We have to use raw query migration instead of schemaBuilder helpers, // because the typeorm schema builder implements addColumns by a table recreate for sqlite diff --git a/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts b/packages/@n8n/db/src/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts similarity index 89% rename from packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts rename to packages/@n8n/db/src/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts index 00fc2d16e7e..887b9052e99 100644 --- a/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts +++ b/packages/@n8n/db/src/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddManagedColumnToCredentialsTable1734479635324 implements ReversibleMigration { async up({ escape, runQuery, isSqlite }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts b/packages/@n8n/db/src/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts similarity index 93% rename from packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts rename to packages/@n8n/db/src/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts index 8d6a5cdc205..799a6c986ed 100644 --- a/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts +++ b/packages/@n8n/db/src/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const columns = ['totalCases', 'passedCases', 'failedCases'] as const; diff --git a/packages/cli/src/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts b/packages/@n8n/db/src/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts similarity index 95% rename from packages/cli/src/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts rename to packages/@n8n/db/src/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts index f7e840cb497..ddcb84e3b08 100644 --- a/packages/cli/src/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts +++ b/packages/@n8n/db/src/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const testCaseExecutionTableName = 'test_case_execution'; diff --git a/packages/cli/src/databases/migrations/common/1737715421462-AddErrorColumnsToTestRuns.ts b/packages/@n8n/db/src/migrations/common/1737715421462-AddErrorColumnsToTestRuns.ts similarity index 93% rename from packages/cli/src/databases/migrations/common/1737715421462-AddErrorColumnsToTestRuns.ts rename to packages/@n8n/db/src/migrations/common/1737715421462-AddErrorColumnsToTestRuns.ts index b3affe9ac45..de1d335ccbe 100644 --- a/packages/cli/src/databases/migrations/common/1737715421462-AddErrorColumnsToTestRuns.ts +++ b/packages/@n8n/db/src/migrations/common/1737715421462-AddErrorColumnsToTestRuns.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; // We have to use raw query migration instead of schemaBuilder helpers, // because the typeorm schema builder implements addColumns by a table recreate for sqlite diff --git a/packages/cli/src/databases/migrations/common/1738709609940-CreateFolderTable.ts b/packages/@n8n/db/src/migrations/common/1738709609940-CreateFolderTable.ts similarity index 95% rename from packages/cli/src/databases/migrations/common/1738709609940-CreateFolderTable.ts rename to packages/@n8n/db/src/migrations/common/1738709609940-CreateFolderTable.ts index 72955a45f1f..60b92800d3f 100644 --- a/packages/cli/src/databases/migrations/common/1738709609940-CreateFolderTable.ts +++ b/packages/@n8n/db/src/migrations/common/1738709609940-CreateFolderTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateFolderTable1738709609940 implements ReversibleMigration { async up({ runQuery, escape, schemaBuilder: { createTable, column } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1739549398681-CreateAnalyticsTables.ts b/packages/@n8n/db/src/migrations/common/1739549398681-CreateAnalyticsTables.ts similarity index 97% rename from packages/cli/src/databases/migrations/common/1739549398681-CreateAnalyticsTables.ts rename to packages/@n8n/db/src/migrations/common/1739549398681-CreateAnalyticsTables.ts index 02ae64ce4f2..93db3910c9e 100644 --- a/packages/cli/src/databases/migrations/common/1739549398681-CreateAnalyticsTables.ts +++ b/packages/@n8n/db/src/migrations/common/1739549398681-CreateAnalyticsTables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const names = { // table names diff --git a/packages/cli/src/databases/migrations/common/1741167584277-RenameAnalyticsToInsights.ts b/packages/@n8n/db/src/migrations/common/1741167584277-RenameAnalyticsToInsights.ts similarity index 97% rename from packages/cli/src/databases/migrations/common/1741167584277-RenameAnalyticsToInsights.ts rename to packages/@n8n/db/src/migrations/common/1741167584277-RenameAnalyticsToInsights.ts index 7cda87fef10..64c45fd3d53 100644 --- a/packages/cli/src/databases/migrations/common/1741167584277-RenameAnalyticsToInsights.ts +++ b/packages/@n8n/db/src/migrations/common/1741167584277-RenameAnalyticsToInsights.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; const names = { // table names diff --git a/packages/cli/src/databases/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts b/packages/@n8n/db/src/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts similarity index 86% rename from packages/cli/src/databases/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts rename to packages/@n8n/db/src/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts index a54d30d562d..94ed1597105 100644 --- a/packages/cli/src/databases/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts +++ b/packages/@n8n/db/src/migrations/common/1742918400000-AddScopesColumnToApiKeys.ts @@ -1,8 +1,8 @@ -import { ApiKey } from '@n8n/db'; import type { GlobalRole } from '@n8n/permissions'; +import { getApiKeyScopesForRole } from '@n8n/permissions'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; -import { getApiKeyScopesForRole } from '@/public-api/permissions.ee'; +import { ApiKey } from '../../entities'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; type ApiKeyWithRole = { id: string; role: GlobalRole }; diff --git a/packages/cli/src/databases/migrations/common/1745587087521-AddWorkflowStatisticsRootCount.ts b/packages/@n8n/db/src/migrations/common/1745587087521-AddWorkflowStatisticsRootCount.ts similarity index 89% rename from packages/cli/src/databases/migrations/common/1745587087521-AddWorkflowStatisticsRootCount.ts rename to packages/@n8n/db/src/migrations/common/1745587087521-AddWorkflowStatisticsRootCount.ts index fe2f829efc5..f244d601d5c 100644 --- a/packages/cli/src/databases/migrations/common/1745587087521-AddWorkflowStatisticsRootCount.ts +++ b/packages/@n8n/db/src/migrations/common/1745587087521-AddWorkflowStatisticsRootCount.ts @@ -1,4 +1,4 @@ -import type { ReversibleMigration, MigrationContext } from '@/databases/types'; +import type { ReversibleMigration, MigrationContext } from '../migration-types'; const columnName = 'rootCount'; const tableName = 'workflow_statistics'; diff --git a/packages/cli/src/databases/migrations/common/1745934666076-AddWorkflowArchivedColumn.ts b/packages/@n8n/db/src/migrations/common/1745934666076-AddWorkflowArchivedColumn.ts similarity index 89% rename from packages/cli/src/databases/migrations/common/1745934666076-AddWorkflowArchivedColumn.ts rename to packages/@n8n/db/src/migrations/common/1745934666076-AddWorkflowArchivedColumn.ts index 2ab9e2e6005..841dbd4899c 100644 --- a/packages/cli/src/databases/migrations/common/1745934666076-AddWorkflowArchivedColumn.ts +++ b/packages/@n8n/db/src/migrations/common/1745934666076-AddWorkflowArchivedColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const columnName = 'isArchived'; const tableName = 'workflow_entity'; diff --git a/packages/cli/src/databases/migrations/common/1745934666077-DropRoleTable.ts b/packages/@n8n/db/src/migrations/common/1745934666077-DropRoleTable.ts similarity index 83% rename from packages/cli/src/databases/migrations/common/1745934666077-DropRoleTable.ts rename to packages/@n8n/db/src/migrations/common/1745934666077-DropRoleTable.ts index e14066645f2..0fb963316e6 100644 --- a/packages/cli/src/databases/migrations/common/1745934666077-DropRoleTable.ts +++ b/packages/@n8n/db/src/migrations/common/1745934666077-DropRoleTable.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; /** * Drop the `role` table introduced by `CreateUserManagement1646992772331` and later diff --git a/packages/cli/src/databases/dsl/column.ts b/packages/@n8n/db/src/migrations/dsl/column.ts similarity index 100% rename from packages/cli/src/databases/dsl/column.ts rename to packages/@n8n/db/src/migrations/dsl/column.ts diff --git a/packages/cli/src/databases/dsl/index.ts b/packages/@n8n/db/src/migrations/dsl/index.ts similarity index 100% rename from packages/cli/src/databases/dsl/index.ts rename to packages/@n8n/db/src/migrations/dsl/index.ts diff --git a/packages/cli/src/databases/dsl/indices.ts b/packages/@n8n/db/src/migrations/dsl/indices.ts similarity index 100% rename from packages/cli/src/databases/dsl/indices.ts rename to packages/@n8n/db/src/migrations/dsl/indices.ts diff --git a/packages/cli/src/databases/dsl/table.ts b/packages/@n8n/db/src/migrations/dsl/table.ts similarity index 100% rename from packages/cli/src/databases/dsl/table.ts rename to packages/@n8n/db/src/migrations/dsl/table.ts diff --git a/packages/cli/src/databases/utils/migration-helpers.ts b/packages/@n8n/db/src/migrations/migration-helpers.ts similarity index 96% rename from packages/cli/src/databases/utils/migration-helpers.ts rename to packages/@n8n/db/src/migrations/migration-helpers.ts index a3cb7a19d3d..f7a8e6e28bd 100644 --- a/packages/cli/src/databases/utils/migration-helpers.ts +++ b/packages/@n8n/db/src/migrations/migration-helpers.ts @@ -1,4 +1,3 @@ -import { inTest } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Container } from '@n8n/di'; import type { ObjectLiteral } from '@n8n/typeorm'; @@ -7,8 +6,8 @@ import { readFileSync, rmSync } from 'fs'; import { InstanceSettings, Logger } from 'n8n-core'; import { jsonParse, UnexpectedError } from 'n8n-workflow'; -import { createSchemaBuilder } from '@/databases/dsl'; -import type { BaseMigration, Migration, MigrationContext, MigrationFn } from '@/databases/types'; +import { createSchemaBuilder } from './dsl'; +import type { BaseMigration, Migration, MigrationContext, MigrationFn } from './migration-types'; const PERSONALIZATION_SURVEY_FILENAME = 'personalizationSurvey.json'; @@ -35,7 +34,7 @@ function loadSurveyFromDisk(): string | null { } } return surveyFile; - } catch (error) { + } catch { return null; } } @@ -43,7 +42,7 @@ function loadSurveyFromDisk(): string | null { let runningMigrations = false; function logMigrationStart(migrationName: string): void { - if (inTest) return; + if (process.env.NODE_ENV === 'test') return; const logger = Container.get(Logger); if (!runningMigrations) { @@ -55,7 +54,7 @@ function logMigrationStart(migrationName: string): void { } function logMigrationEnd(migrationName: string): void { - if (inTest) return; + if (process.env.NODE_ENV === 'test') return; const logger = Container.get(Logger); logger.info(`Finished migration ${migrationName}`); diff --git a/packages/cli/src/databases/types.ts b/packages/@n8n/db/src/migrations/migration-types.ts similarity index 92% rename from packages/cli/src/databases/types.ts rename to packages/@n8n/db/src/migrations/migration-types.ts index fa2a409ebad..9eed747492c 100644 --- a/packages/cli/src/databases/types.ts +++ b/packages/@n8n/db/src/migrations/migration-types.ts @@ -43,6 +43,7 @@ export type MigrationFn = (ctx: MigrationContext) => Promise; export interface BaseMigration { up: MigrationFn; + // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents down?: MigrationFn | never; transaction?: false; } @@ -55,6 +56,7 @@ export interface IrreversibleMigration extends BaseMigration { down?: never; } +// eslint-disable-next-line @typescript-eslint/ban-types export interface Migration extends Function { prototype: ReversibleMigration | IrreversibleMigration; } diff --git a/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts b/packages/@n8n/db/src/migrations/mysqldb/1588157391238-InitialMigration.ts similarity index 96% rename from packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts rename to packages/@n8n/db/src/migrations/mysqldb/1588157391238-InitialMigration.ts index c38f1b2a433..80d589916bc 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1588157391238-InitialMigration.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class InitialMigration1588157391238 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts b/packages/@n8n/db/src/migrations/mysqldb/1592447867632-WebhookModel.ts similarity index 86% rename from packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts rename to packages/@n8n/db/src/migrations/mysqldb/1592447867632-WebhookModel.ts index 5de2e233cf8..34d8ca33d8d 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1592447867632-WebhookModel.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class WebhookModel1592447867632 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts b/packages/@n8n/db/src/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts similarity index 87% rename from packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts rename to packages/@n8n/db/src/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts index a0e69b94097..afecd45ce03 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateIndexStoppedAt1594902918301 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts b/packages/@n8n/db/src/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts similarity index 84% rename from packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts rename to packages/@n8n/db/src/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts index 71f9a86ffdf..80f8a92275d 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class MakeStoppedAtNullable1607431743767 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts b/packages/@n8n/db/src/migrations/mysqldb/1611149998770-AddWebhookId.ts similarity index 92% rename from packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts rename to packages/@n8n/db/src/migrations/mysqldb/1611149998770-AddWebhookId.ts index 85c7efada2e..f1d40b76fb0 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1611149998770-AddWebhookId.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddWebhookId1611149998770 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts b/packages/@n8n/db/src/migrations/mysqldb/1615306975123-ChangeDataSize.ts similarity index 84% rename from packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts rename to packages/@n8n/db/src/migrations/mysqldb/1615306975123-ChangeDataSize.ts index 122e271aa95..3d96058701d 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1615306975123-ChangeDataSize.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class ChangeDataSize1615306975123 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts b/packages/@n8n/db/src/migrations/mysqldb/1617268711084-CreateTagEntity.ts similarity index 98% rename from packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts rename to packages/@n8n/db/src/migrations/mysqldb/1617268711084-CreateTagEntity.ts index 7e96027cb59..ff70956976a 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1617268711084-CreateTagEntity.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateTagEntity1617268711084 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts b/packages/@n8n/db/src/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts similarity index 85% rename from packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts rename to packages/@n8n/db/src/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts index c27f0b5daca..b79096769c5 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class ChangeCredentialDataSize1620729500000 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts b/packages/@n8n/db/src/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts similarity index 100% rename from packages/cli/src/databases/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts rename to packages/@n8n/db/src/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts diff --git a/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts b/packages/@n8n/db/src/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts similarity index 93% rename from packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts rename to packages/@n8n/db/src/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts index 1bf71c229f4..3f77b1dfe1f 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class CertifyCorrectCollation1623936588000 implements IrreversibleMigration { async up({ queryRunner, tablePrefix, dbType, dbName }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts b/packages/@n8n/db/src/migrations/mysqldb/1626183952959-AddWaitColumn.ts similarity index 90% rename from packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts rename to packages/@n8n/db/src/migrations/mysqldb/1626183952959-AddWaitColumn.ts index f52a6c385b4..57ee6d81f3d 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1626183952959-AddWaitColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddWaitColumnId1626183952959 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts b/packages/@n8n/db/src/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts similarity index 100% rename from packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts rename to packages/@n8n/db/src/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts diff --git a/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts b/packages/@n8n/db/src/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts similarity index 96% rename from packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts rename to packages/@n8n/db/src/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts index e6532c82b04..949fef61a35 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddExecutionEntityIndexes1644424784709 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts b/packages/@n8n/db/src/migrations/mysqldb/1646992772331-CreateUserManagement.ts similarity index 99% rename from packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts rename to packages/@n8n/db/src/migrations/mysqldb/1646992772331-CreateUserManagement.ts index 9f054c3d232..817c2722d95 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1646992772331-CreateUserManagement.ts @@ -1,6 +1,6 @@ import { v4 as uuid } from 'uuid'; -import type { InsertResult, MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { InsertResult, MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateUserManagement1646992772331 implements ReversibleMigration { async up({ queryRunner, tablePrefix, loadSurveyFromDisk }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts b/packages/@n8n/db/src/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts similarity index 74% rename from packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts rename to packages/@n8n/db/src/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts index b0768640330..a9c9d454039 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class LowerCaseUserEmail1648740597343 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts b/packages/@n8n/db/src/migrations/mysqldb/1652254514003-CommunityNodes.ts similarity index 95% rename from packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts rename to packages/@n8n/db/src/migrations/mysqldb/1652254514003-CommunityNodes.ts index 298bc4ef21c..52a3b294c04 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1652254514003-CommunityNodes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CommunityNodes1652254514003 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts b/packages/@n8n/db/src/migrations/mysqldb/1652367743993-AddUserSettings.ts similarity index 87% rename from packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts rename to packages/@n8n/db/src/migrations/mysqldb/1652367743993-AddUserSettings.ts index 77e8968ff4b..40838da2456 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1652367743993-AddUserSettings.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddUserSettings1652367743993 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts b/packages/@n8n/db/src/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts similarity index 89% rename from packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts rename to packages/@n8n/db/src/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts index 9a31d543f93..58216e727e0 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddAPIKeyColumn1652905585850 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts b/packages/@n8n/db/src/migrations/mysqldb/1654090101303-IntroducePinData.ts similarity index 83% rename from packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts rename to packages/@n8n/db/src/migrations/mysqldb/1654090101303-IntroducePinData.ts index 049b4135338..1dd46f9b05f 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1654090101303-IntroducePinData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class IntroducePinData1654090101303 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts b/packages/@n8n/db/src/migrations/mysqldb/1658932910559-AddNodeIds.ts similarity index 100% rename from packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts rename to packages/@n8n/db/src/migrations/mysqldb/1658932910559-AddNodeIds.ts diff --git a/packages/cli/src/databases/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts b/packages/@n8n/db/src/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts similarity index 100% rename from packages/cli/src/databases/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts rename to packages/@n8n/db/src/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts diff --git a/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts b/packages/@n8n/db/src/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts similarity index 84% rename from packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts rename to packages/@n8n/db/src/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts index 3d442fac7bc..eceff11e8b9 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateCredentialsUserRole1660062385367 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts b/packages/@n8n/db/src/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts similarity index 84% rename from packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts rename to packages/@n8n/db/src/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts index 8b47297f21a..29d76af39db 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateWorkflowsEditorRole1663755770894 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts b/packages/@n8n/db/src/migrations/mysqldb/1664196174002-WorkflowStatistics.ts similarity index 91% rename from packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts rename to packages/@n8n/db/src/migrations/mysqldb/1664196174002-WorkflowStatistics.ts index 83743e21659..3fa4ba440ab 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1664196174002-WorkflowStatistics.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class WorkflowStatistics1664196174002 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts b/packages/@n8n/db/src/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts similarity index 94% rename from packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts rename to packages/@n8n/db/src/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts index 4d2df6e1c28..13128a6bae5 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateCredentialUsageTable1665484192213 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts b/packages/@n8n/db/src/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts similarity index 94% rename from packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts rename to packages/@n8n/db/src/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts index 57512b741ed..509c89caae2 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class RemoveCredentialUsageTable1665754637026 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts b/packages/@n8n/db/src/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts similarity index 100% rename from packages/cli/src/databases/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts rename to packages/@n8n/db/src/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts diff --git a/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts b/packages/@n8n/db/src/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts similarity index 86% rename from packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts rename to packages/@n8n/db/src/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts index 00e7dd17736..36effd442d8 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddTriggerCountColumn1669823906994 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts b/packages/@n8n/db/src/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts similarity index 88% rename from packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts rename to packages/@n8n/db/src/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts index 0f251975e96..4edae4f656b 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class MessageEventBusDestinations1671535397530 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts b/packages/@n8n/db/src/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts similarity index 100% rename from packages/cli/src/databases/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts rename to packages/@n8n/db/src/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts diff --git a/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/@n8n/db/src/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts similarity index 93% rename from packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts rename to packages/@n8n/db/src/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts index 6e2e7c6809d..a205282dc66 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class DeleteExecutionsWithWorkflows1673268682475 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts b/packages/@n8n/db/src/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts similarity index 84% rename from packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts rename to packages/@n8n/db/src/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts index b8d86c63ca8..0ce72f37959 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddStatusToExecutions1674138566000 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts b/packages/@n8n/db/src/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts similarity index 90% rename from packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts rename to packages/@n8n/db/src/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts index aa675e5671c..d8f354b0258 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateExecutionStatus1676996103000 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts b/packages/@n8n/db/src/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts similarity index 85% rename from packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts rename to packages/@n8n/db/src/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts index c99143a74ff..f67b524213a 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class UpdateRunningExecutionStatus1677236788851 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts b/packages/@n8n/db/src/migrations/mysqldb/1677501636753-CreateVariables.ts similarity index 87% rename from packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts rename to packages/@n8n/db/src/migrations/mysqldb/1677501636753-CreateVariables.ts index 19fe0bc5b9c..28a6b0ac4d6 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1677501636753-CreateVariables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateVariables1677501636753 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts b/packages/@n8n/db/src/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts similarity index 96% rename from packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts rename to packages/@n8n/db/src/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts index 9a65b594233..2d506de5c7f 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateExecutionMetadataTable1679416281779 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts b/packages/@n8n/db/src/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts similarity index 92% rename from packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts rename to packages/@n8n/db/src/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts index a76c7850508..10af6e1f609 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts @@ -1,6 +1,5 @@ -import type { UserSettings } from '@n8n/db'; - -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { UserSettings } from '../../entities/types-db'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts b/packages/@n8n/db/src/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts similarity index 77% rename from packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts rename to packages/@n8n/db/src/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts index 189c4bbe3ea..50fd22dd52a 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class RemoveSkipOwnerSetup1681134145997 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts b/packages/@n8n/db/src/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts similarity index 99% rename from packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts rename to packages/@n8n/db/src/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts index ec4389e4164..1115a920e9d 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; const COLLATION_57 = 'utf8mb4_general_ci'; const COLLATION_80 = 'utf8mb4_0900_ai_ci'; diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts b/packages/@n8n/db/src/migrations/mysqldb/1690000000030-SeparateExecutionData.ts similarity index 94% rename from packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts rename to packages/@n8n/db/src/migrations/mysqldb/1690000000030-SeparateExecutionData.ts index 116874947e2..6a71bc6713f 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1690000000030-SeparateExecutionData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class SeparateExecutionData1690000000030 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts b/packages/@n8n/db/src/migrations/mysqldb/1690000000031-FixExecutionDataType.ts similarity index 90% rename from packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts rename to packages/@n8n/db/src/migrations/mysqldb/1690000000031-FixExecutionDataType.ts index 591f22237f0..811f0037d17 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1690000000031-FixExecutionDataType.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class FixExecutionDataType1690000000031 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts b/packages/@n8n/db/src/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts similarity index 88% rename from packages/cli/src/databases/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts rename to packages/@n8n/db/src/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts index 8d1f580d288..f179c8522dc 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddActivatedAtUserSetting1717498465931 implements ReversibleMigration { async up({ queryRunner, escape }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts b/packages/@n8n/db/src/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts similarity index 94% rename from packages/cli/src/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts rename to packages/@n8n/db/src/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts index 44e03ddbccc..f39fcc93fb8 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateTestDefinitionKeyToString1731582748663 implements IrreversibleMigration { async up(context: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1732271325258-CreateTestMetricTable.ts b/packages/@n8n/db/src/migrations/mysqldb/1732271325258-CreateTestMetricTable.ts similarity index 95% rename from packages/cli/src/databases/migrations/mysqldb/1732271325258-CreateTestMetricTable.ts rename to packages/@n8n/db/src/migrations/mysqldb/1732271325258-CreateTestMetricTable.ts index 329822f886d..4298a96c9e3 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1732271325258-CreateTestMetricTable.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1732271325258-CreateTestMetricTable.ts @@ -1,6 +1,6 @@ import assert from 'node:assert'; -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const testMetricEntityTableName = 'test_metric'; diff --git a/packages/cli/src/databases/migrations/mysqldb/1736172058779-AddStatsColumnsToTestRun.ts b/packages/@n8n/db/src/migrations/mysqldb/1736172058779-AddStatsColumnsToTestRun.ts similarity index 93% rename from packages/cli/src/databases/migrations/mysqldb/1736172058779-AddStatsColumnsToTestRun.ts rename to packages/@n8n/db/src/migrations/mysqldb/1736172058779-AddStatsColumnsToTestRun.ts index 9f0b6ef3f54..8ab60dfe0d4 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1736172058779-AddStatsColumnsToTestRun.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1736172058779-AddStatsColumnsToTestRun.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; const columns = ['totalCases', 'passedCases', 'failedCases'] as const; diff --git a/packages/cli/src/databases/migrations/mysqldb/1739873751194-FixTestDefinitionPrimaryKey.ts b/packages/@n8n/db/src/migrations/mysqldb/1739873751194-FixTestDefinitionPrimaryKey.ts similarity index 95% rename from packages/cli/src/databases/migrations/mysqldb/1739873751194-FixTestDefinitionPrimaryKey.ts rename to packages/@n8n/db/src/migrations/mysqldb/1739873751194-FixTestDefinitionPrimaryKey.ts index ee70fcc26e9..1158c29b0b9 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1739873751194-FixTestDefinitionPrimaryKey.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1739873751194-FixTestDefinitionPrimaryKey.ts @@ -1,6 +1,6 @@ import assert from 'node:assert'; -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class FixTestDefinitionPrimaryKey1739873751194 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts b/packages/@n8n/db/src/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts similarity index 88% rename from packages/cli/src/databases/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts rename to packages/@n8n/db/src/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts index 31c5cf86f3c..61414922557 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts @@ -1,4 +1,4 @@ -import type { BaseMigration, MigrationContext } from '@/databases/types'; +import type { BaseMigration, MigrationContext } from '../migration-types'; export class UpdateParentFolderIdColumn1740445074052 implements BaseMigration { async up({ escape, queryRunner }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/@n8n/db/src/migrations/mysqldb/index.ts similarity index 99% rename from packages/cli/src/databases/migrations/mysqldb/index.ts rename to packages/@n8n/db/src/migrations/mysqldb/index.ts index db933348fb5..d98de746446 100644 --- a/packages/cli/src/databases/migrations/mysqldb/index.ts +++ b/packages/@n8n/db/src/migrations/mysqldb/index.ts @@ -1,5 +1,3 @@ -import type { Migration } from '@/databases/types'; - import { AddMfaColumns1690000000030 } from './../common/1690000000040-AddMfaColumns'; import { InitialMigration1588157391238 } from './1588157391238-InitialMigration'; import { WebhookModel1592447867632 } from './1592447867632-WebhookModel'; @@ -87,6 +85,7 @@ import { AddScopesColumnToApiKeys1742918400000 } from '../common/1742918400000-A import { AddWorkflowStatisticsRootCount1745587087521 } from '../common/1745587087521-AddWorkflowStatisticsRootCount'; import { AddWorkflowArchivedColumn1745934666076 } from '../common/1745934666076-AddWorkflowArchivedColumn'; import { DropRoleTable1745934666077 } from '../common/1745934666077-DropRoleTable'; +import type { Migration } from '../migration-types'; import { UpdateParentFolderIdColumn1740445074052 } from '../mysqldb/1740445074052-UpdateParentFolderIdColumn'; export const mysqlMigrations: Migration[] = [ diff --git a/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts b/packages/@n8n/db/src/migrations/postgresdb/1587669153312-InitialMigration.ts similarity index 96% rename from packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts rename to packages/@n8n/db/src/migrations/postgresdb/1587669153312-InitialMigration.ts index cfac3b4afea..613f60ddc94 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1587669153312-InitialMigration.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class InitialMigration1587669153312 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts b/packages/@n8n/db/src/migrations/postgresdb/1589476000887-WebhookModel.ts similarity index 88% rename from packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts rename to packages/@n8n/db/src/migrations/postgresdb/1589476000887-WebhookModel.ts index 71fb4a1bc2c..0a42bbcb01d 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1589476000887-WebhookModel.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class WebhookModel1589476000887 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts b/packages/@n8n/db/src/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts similarity index 84% rename from packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts rename to packages/@n8n/db/src/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts index 1d9cf473a67..d2865a1e7ff 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateIndexStoppedAt1594828256133 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts b/packages/@n8n/db/src/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts similarity index 76% rename from packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts rename to packages/@n8n/db/src/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts index e9d01b7a4e1..a08f15872fd 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MakeStoppedAtNullable1607431743768 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts b/packages/@n8n/db/src/migrations/postgresdb/1611144599516-AddWebhookId.ts similarity index 91% rename from packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts rename to packages/@n8n/db/src/migrations/postgresdb/1611144599516-AddWebhookId.ts index 30b39b42fa7..61274171797 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1611144599516-AddWebhookId.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddWebhookId1611144599516 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts b/packages/@n8n/db/src/migrations/postgresdb/1617270242566-CreateTagEntity.ts similarity index 98% rename from packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts rename to packages/@n8n/db/src/migrations/postgresdb/1617270242566-CreateTagEntity.ts index 7f7ce4e02b1..b938ba895b4 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1617270242566-CreateTagEntity.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateTagEntity1617270242566 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts b/packages/@n8n/db/src/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts similarity index 100% rename from packages/cli/src/databases/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts rename to packages/@n8n/db/src/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts diff --git a/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts b/packages/@n8n/db/src/migrations/postgresdb/1626176912946-AddwaitTill.ts similarity index 88% rename from packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts rename to packages/@n8n/db/src/migrations/postgresdb/1626176912946-AddwaitTill.ts index c9f69e6b5e2..9d8c8e583f7 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1626176912946-AddwaitTill.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddwaitTill1626176912946 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts b/packages/@n8n/db/src/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts similarity index 100% rename from packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts rename to packages/@n8n/db/src/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts diff --git a/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts b/packages/@n8n/db/src/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts similarity index 96% rename from packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts rename to packages/@n8n/db/src/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts index f6506725065..c12b21b0ec6 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddExecutionEntityIndexes1644422880309 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts b/packages/@n8n/db/src/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts similarity index 76% rename from packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts rename to packages/@n8n/db/src/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts index 8252c787e95..df18cfd2288 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class IncreaseTypeVarcharLimit1646834195327 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts b/packages/@n8n/db/src/migrations/postgresdb/1646992772331-CreateUserManagement.ts similarity index 99% rename from packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts rename to packages/@n8n/db/src/migrations/postgresdb/1646992772331-CreateUserManagement.ts index 1777820e34a..38c3e4adc2b 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1646992772331-CreateUserManagement.ts @@ -1,6 +1,6 @@ import { v4 as uuid } from 'uuid'; -import type { InsertResult, MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { InsertResult, MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateUserManagement1646992772331 implements ReversibleMigration { async up({ queryRunner, tablePrefix, loadSurveyFromDisk }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts b/packages/@n8n/db/src/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts similarity index 74% rename from packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts rename to packages/@n8n/db/src/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts index 6ed635a9138..185876d6490 100644 --- a/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class LowerCaseUserEmail1648740597343 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts b/packages/@n8n/db/src/migrations/postgresdb/1652254514002-CommunityNodes.ts similarity index 94% rename from packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts rename to packages/@n8n/db/src/migrations/postgresdb/1652254514002-CommunityNodes.ts index 9d4b5316ad5..e5a60128365 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1652254514002-CommunityNodes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CommunityNodes1652254514002 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts b/packages/@n8n/db/src/migrations/postgresdb/1652367743993-AddUserSettings.ts similarity index 87% rename from packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts rename to packages/@n8n/db/src/migrations/postgresdb/1652367743993-AddUserSettings.ts index 41c497cb7af..c84e670cb85 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1652367743993-AddUserSettings.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddUserSettings1652367743993 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts b/packages/@n8n/db/src/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts similarity index 88% rename from packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts rename to packages/@n8n/db/src/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts index 902f7cbc626..b741cba67bc 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddAPIKeyColumn1652905585850 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts b/packages/@n8n/db/src/migrations/postgresdb/1654090467022-IntroducePinData.ts similarity index 82% rename from packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts rename to packages/@n8n/db/src/migrations/postgresdb/1654090467022-IntroducePinData.ts index e78ac95abeb..82be64a5d7a 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1654090467022-IntroducePinData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class IntroducePinData1654090467022 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts b/packages/@n8n/db/src/migrations/postgresdb/1658932090381-AddNodeIds.ts similarity index 100% rename from packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts rename to packages/@n8n/db/src/migrations/postgresdb/1658932090381-AddNodeIds.ts diff --git a/packages/cli/src/databases/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts b/packages/@n8n/db/src/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts similarity index 100% rename from packages/cli/src/databases/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts rename to packages/@n8n/db/src/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts diff --git a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts b/packages/@n8n/db/src/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts similarity index 85% rename from packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts rename to packages/@n8n/db/src/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts index 1e4b157a0c2..ee4ff0f967e 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateCredentialsUserRole1660062385367 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts b/packages/@n8n/db/src/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts similarity index 85% rename from packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts rename to packages/@n8n/db/src/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts index 11c521c3d22..bba5a8f5144 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateWorkflowsEditorRole1663755770893 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts b/packages/@n8n/db/src/migrations/postgresdb/1664196174001-WorkflowStatistics.ts similarity index 91% rename from packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts rename to packages/@n8n/db/src/migrations/postgresdb/1664196174001-WorkflowStatistics.ts index 3f7265d57c0..9ba492e4f2f 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1664196174001-WorkflowStatistics.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class WorkflowStatistics1664196174001 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts b/packages/@n8n/db/src/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts similarity index 93% rename from packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts rename to packages/@n8n/db/src/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts index 012c5922e4c..8bc564be54a 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateCredentialUsageTable1665484192212 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts b/packages/@n8n/db/src/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts similarity index 93% rename from packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts rename to packages/@n8n/db/src/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts index ba4259c8cce..9886e25473b 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class RemoveCredentialUsageTable1665754637025 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts b/packages/@n8n/db/src/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts similarity index 100% rename from packages/cli/src/databases/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts rename to packages/@n8n/db/src/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts diff --git a/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts b/packages/@n8n/db/src/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts similarity index 86% rename from packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts rename to packages/@n8n/db/src/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts index f8ae1854dfe..f0fd9794afc 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddTriggerCountColumn1669823906995 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts b/packages/@n8n/db/src/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts similarity index 87% rename from packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts rename to packages/@n8n/db/src/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts index 3f1de8cf756..a46e0e7fce5 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class MessageEventBusDestinations1671535397530 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts b/packages/@n8n/db/src/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts similarity index 100% rename from packages/cli/src/databases/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts rename to packages/@n8n/db/src/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts diff --git a/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/@n8n/db/src/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts similarity index 93% rename from packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts rename to packages/@n8n/db/src/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts index 93e6d627d80..57f4fa2d9bc 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class DeleteExecutionsWithWorkflows1673268682475 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts b/packages/@n8n/db/src/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts similarity index 83% rename from packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts rename to packages/@n8n/db/src/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts index b2055cf63cc..ce4613ff0fb 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddStatusToExecutions1674138566000 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts b/packages/@n8n/db/src/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts similarity index 90% rename from packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts rename to packages/@n8n/db/src/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts index d0e5ceafc07..d4aa8ceb633 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateExecutionStatus1676996103000 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts b/packages/@n8n/db/src/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts similarity index 86% rename from packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts rename to packages/@n8n/db/src/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts index 078e29bde95..887a21a6e3c 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class UpdateRunningExecutionStatus1677236854063 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts b/packages/@n8n/db/src/migrations/postgresdb/1677501636754-CreateVariables.ts similarity index 86% rename from packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts rename to packages/@n8n/db/src/migrations/postgresdb/1677501636754-CreateVariables.ts index 6c0a03991d3..280e91c4e27 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1677501636754-CreateVariables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateVariables1677501636754 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts b/packages/@n8n/db/src/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts similarity index 96% rename from packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts rename to packages/@n8n/db/src/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts index 4726d636aab..21af1dd0ade 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateExecutionMetadataTable1679416281778 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts b/packages/@n8n/db/src/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts similarity index 92% rename from packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts rename to packages/@n8n/db/src/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts index 58a098c9394..019d51f132f 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts @@ -1,6 +1,5 @@ -import type { UserSettings } from '@n8n/db'; - -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { UserSettings } from '../../entities/types-db'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts b/packages/@n8n/db/src/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts similarity index 76% rename from packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts rename to packages/@n8n/db/src/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts index ae4b98433ae..39332c87def 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class RemoveSkipOwnerSetup1681134145997 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts b/packages/@n8n/db/src/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts similarity index 99% rename from packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts rename to packages/@n8n/db/src/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts index e8a64a79e77..81445e02fc3 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateIntegerKeysToString1690000000000 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts b/packages/@n8n/db/src/migrations/postgresdb/1690000000020-SeparateExecutionData.ts similarity index 94% rename from packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts rename to packages/@n8n/db/src/migrations/postgresdb/1690000000020-SeparateExecutionData.ts index 250c3b44a9d..94068934529 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1690000000020-SeparateExecutionData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class SeparateExecutionData1690000000020 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts b/packages/@n8n/db/src/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts similarity index 76% rename from packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts rename to packages/@n8n/db/src/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts index dbf0d1346fa..9a24400be66 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class AddMissingPrimaryKeyOnExecutionData1690787606731 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts b/packages/@n8n/db/src/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts similarity index 94% rename from packages/cli/src/databases/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts rename to packages/@n8n/db/src/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts index 34f12bd457c..6ea71c3c610 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; const defaultTimestampColumns = ['createdAt', 'updatedAt']; const tablesWithDefaultTimestamps = [ diff --git a/packages/cli/src/databases/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts b/packages/@n8n/db/src/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts similarity index 88% rename from packages/cli/src/databases/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts rename to packages/@n8n/db/src/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts index 76096ca5029..9ce6bd161e1 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddActivatedAtUserSetting1717498465931 implements ReversibleMigration { async up({ queryRunner, escape }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts b/packages/@n8n/db/src/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts similarity index 82% rename from packages/cli/src/databases/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts rename to packages/@n8n/db/src/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts index 911602cd30e..6f7567cb4e9 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class FixExecutionMetadataSequence1721377157740 implements IrreversibleMigration { async up({ queryRunner, escape }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts b/packages/@n8n/db/src/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts similarity index 93% rename from packages/cli/src/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts rename to packages/@n8n/db/src/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts index 9afc1c3ae38..c21158bb0a7 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateTestDefinitionKeyToString1731582748663 implements IrreversibleMigration { async up(context: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts b/packages/@n8n/db/src/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts similarity index 94% rename from packages/cli/src/databases/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts rename to packages/@n8n/db/src/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts index 30088a3229c..6c8cee4dcee 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts @@ -1,6 +1,6 @@ import { UnexpectedError } from 'n8n-workflow'; -import type { BaseMigration, MigrationContext } from '@/databases/types'; +import type { BaseMigration, MigrationContext } from '../migration-types'; export class UpdateParentFolderIdColumn1740445074052 implements BaseMigration { async up({ diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/@n8n/db/src/migrations/postgresdb/index.ts similarity index 99% rename from packages/cli/src/databases/migrations/postgresdb/index.ts rename to packages/@n8n/db/src/migrations/postgresdb/index.ts index 026da1dfc15..f0c4bbc8f6a 100644 --- a/packages/cli/src/databases/migrations/postgresdb/index.ts +++ b/packages/@n8n/db/src/migrations/postgresdb/index.ts @@ -1,5 +1,3 @@ -import type { Migration } from '@/databases/types'; - import { AddMfaColumns1690000000030 } from './../common/1690000000040-AddMfaColumns'; import { InitialMigration1587669153312 } from './1587669153312-InitialMigration'; import { WebhookModel1589476000887 } from './1589476000887-WebhookModel'; @@ -87,6 +85,7 @@ import { AddScopesColumnToApiKeys1742918400000 } from '../common/1742918400000-A import { AddWorkflowStatisticsRootCount1745587087521 } from '../common/1745587087521-AddWorkflowStatisticsRootCount'; import { AddWorkflowArchivedColumn1745934666076 } from '../common/1745934666076-AddWorkflowArchivedColumn'; import { DropRoleTable1745934666077 } from '../common/1745934666077-DropRoleTable'; +import type { Migration } from '../migration-types'; export const postgresMigrations: Migration[] = [ InitialMigration1587669153312, diff --git a/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts b/packages/@n8n/db/src/migrations/sqlite/1588102412422-InitialMigration.ts similarity index 96% rename from packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts rename to packages/@n8n/db/src/migrations/sqlite/1588102412422-InitialMigration.ts index 7d960dd9163..828f6c632f7 100644 --- a/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1588102412422-InitialMigration.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class InitialMigration1588102412422 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts b/packages/@n8n/db/src/migrations/sqlite/1592445003908-WebhookModel.ts similarity index 86% rename from packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts rename to packages/@n8n/db/src/migrations/sqlite/1592445003908-WebhookModel.ts index 0cd223110ef..68a465274dc 100644 --- a/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1592445003908-WebhookModel.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class WebhookModel1592445003908 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts b/packages/@n8n/db/src/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts similarity index 84% rename from packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts rename to packages/@n8n/db/src/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts index 70cf3ec44f5..d5e014d4b0f 100644 --- a/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateIndexStoppedAt1594825041918 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts b/packages/@n8n/db/src/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts similarity index 92% rename from packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts rename to packages/@n8n/db/src/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts index 3bdf9149c1e..d344c29b19f 100644 --- a/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MakeStoppedAtNullable1607431743769 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts b/packages/@n8n/db/src/migrations/sqlite/1611071044839-AddWebhookId.ts similarity index 95% rename from packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts rename to packages/@n8n/db/src/migrations/sqlite/1611071044839-AddWebhookId.ts index 4c942daaf31..ba846c3a730 100644 --- a/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1611071044839-AddWebhookId.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddWebhookId1611071044839 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts b/packages/@n8n/db/src/migrations/sqlite/1617213344594-CreateTagEntity.ts similarity index 98% rename from packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts rename to packages/@n8n/db/src/migrations/sqlite/1617213344594-CreateTagEntity.ts index ae30f9c7f50..65aa93c1f8a 100644 --- a/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1617213344594-CreateTagEntity.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateTagEntity1617213344594 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts b/packages/@n8n/db/src/migrations/sqlite/1621707690587-AddWaitColumn.ts similarity index 97% rename from packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts rename to packages/@n8n/db/src/migrations/sqlite/1621707690587-AddWaitColumn.ts index 22a83231b7e..5caa193b118 100644 --- a/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1621707690587-AddWaitColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddWaitColumn1621707690587 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts b/packages/@n8n/db/src/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts similarity index 96% rename from packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts rename to packages/@n8n/db/src/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts index 6a5e7dcbc65..dcd1f560a02 100644 --- a/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddExecutionEntityIndexes1644421939510 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts b/packages/@n8n/db/src/migrations/sqlite/1646992772331-CreateUserManagement.ts similarity index 99% rename from packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts rename to packages/@n8n/db/src/migrations/sqlite/1646992772331-CreateUserManagement.ts index 12f9e50ba85..591f16b1cd5 100644 --- a/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1646992772331-CreateUserManagement.ts @@ -1,6 +1,6 @@ import { v4 as uuid } from 'uuid'; -import type { InsertResult, MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { InsertResult, MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateUserManagement1646992772331 implements ReversibleMigration { async up({ queryRunner, tablePrefix, loadSurveyFromDisk }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts b/packages/@n8n/db/src/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts similarity index 74% rename from packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts rename to packages/@n8n/db/src/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts index 6ed635a9138..185876d6490 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class LowerCaseUserEmail1648740597343 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts b/packages/@n8n/db/src/migrations/sqlite/1652254514001-CommunityNodes.ts similarity index 93% rename from packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts rename to packages/@n8n/db/src/migrations/sqlite/1652254514001-CommunityNodes.ts index fa07e620764..185e719709e 100644 --- a/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1652254514001-CommunityNodes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CommunityNodes1652254514001 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts b/packages/@n8n/db/src/migrations/sqlite/1652367743993-AddUserSettings.ts similarity index 97% rename from packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts rename to packages/@n8n/db/src/migrations/sqlite/1652367743993-AddUserSettings.ts index dadea4bdc20..e7da1177ffa 100644 --- a/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1652367743993-AddUserSettings.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddUserSettings1652367743993 implements ReversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts b/packages/@n8n/db/src/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts similarity index 97% rename from packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts rename to packages/@n8n/db/src/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts index bfb7d3e21c2..019f7c554d0 100644 --- a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddAPIKeyColumn1652905585850 implements ReversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts b/packages/@n8n/db/src/migrations/sqlite/1654089251344-IntroducePinData.ts similarity index 93% rename from packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts rename to packages/@n8n/db/src/migrations/sqlite/1654089251344-IntroducePinData.ts index 29718616cd4..76ee765d506 100644 --- a/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1654089251344-IntroducePinData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class IntroducePinData1654089251344 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts b/packages/@n8n/db/src/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts similarity index 85% rename from packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts rename to packages/@n8n/db/src/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts index 117455578fd..c71fa6b3dbc 100644 --- a/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateCredentialsUserRole1660062385367 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts b/packages/@n8n/db/src/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts similarity index 85% rename from packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts rename to packages/@n8n/db/src/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts index 84a5f1bd5e2..7d4b1148d5c 100644 --- a/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateWorkflowsEditorRole1663755770892 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts b/packages/@n8n/db/src/migrations/sqlite/1664196174000-WorkflowStatistics.ts similarity index 91% rename from packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts rename to packages/@n8n/db/src/migrations/sqlite/1664196174000-WorkflowStatistics.ts index c53e3a6c7ca..54eee57e2fc 100644 --- a/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1664196174000-WorkflowStatistics.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class WorkflowStatistics1664196174000 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts b/packages/@n8n/db/src/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts similarity index 93% rename from packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts rename to packages/@n8n/db/src/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts index c238432684e..67eb9e6a750 100644 --- a/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateCredentialUsageTable1665484192211 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts b/packages/@n8n/db/src/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts similarity index 93% rename from packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts rename to packages/@n8n/db/src/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts index 1da61600afb..19d69da498a 100644 --- a/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class RemoveCredentialUsageTable1665754637024 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts b/packages/@n8n/db/src/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts similarity index 86% rename from packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts rename to packages/@n8n/db/src/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts index 36395ee0a34..3cefac3acab 100644 --- a/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddTriggerCountColumn1669823906993 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts b/packages/@n8n/db/src/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts similarity index 89% rename from packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts rename to packages/@n8n/db/src/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts index 4f1811319bb..973d497c4c8 100644 --- a/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class MessageEventBusDestinations1671535397530 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/@n8n/db/src/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts similarity index 97% rename from packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts rename to packages/@n8n/db/src/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts index 1c2b2cd8ae3..8a5e9fb2942 100644 --- a/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class DeleteExecutionsWithWorkflows1673268682475 implements ReversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts b/packages/@n8n/db/src/migrations/sqlite/1674138566000-AddStatusToExecutions.ts similarity index 83% rename from packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts rename to packages/@n8n/db/src/migrations/sqlite/1674138566000-AddStatusToExecutions.ts index 8c9595b2f66..d8e281778c2 100644 --- a/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1674138566000-AddStatusToExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddStatusToExecutions1674138566000 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts b/packages/@n8n/db/src/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts similarity index 90% rename from packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts rename to packages/@n8n/db/src/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts index f93fa1dd86a..3c4d541c80c 100644 --- a/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateExecutionStatus1676996103000 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts b/packages/@n8n/db/src/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts similarity index 85% rename from packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts rename to packages/@n8n/db/src/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts index 1ef2a8dae8d..8ccf91c00cb 100644 --- a/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class UpdateRunningExecutionStatus1677237073720 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts b/packages/@n8n/db/src/migrations/sqlite/1677501636752-CreateVariables.ts similarity index 86% rename from packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts rename to packages/@n8n/db/src/migrations/sqlite/1677501636752-CreateVariables.ts index c73867da650..7ce221a9822 100644 --- a/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1677501636752-CreateVariables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateVariables1677501636752 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts b/packages/@n8n/db/src/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts similarity index 96% rename from packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts rename to packages/@n8n/db/src/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts index 158d2a040bd..3da5cbe7308 100644 --- a/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class CreateExecutionMetadataTable1679416281777 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts b/packages/@n8n/db/src/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts similarity index 92% rename from packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts rename to packages/@n8n/db/src/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts index 0698426bd09..60707c523f3 100644 --- a/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts @@ -1,6 +1,5 @@ -import type { UserSettings } from '@n8n/db'; - -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { UserSettings } from '../../entities/types-db'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts b/packages/@n8n/db/src/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts similarity index 76% rename from packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts rename to packages/@n8n/db/src/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts index f69f7c0d88d..ce0f5e48d3b 100644 --- a/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class RemoveSkipOwnerSetup1681134145997 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts b/packages/@n8n/db/src/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts similarity index 99% rename from packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts rename to packages/@n8n/db/src/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts index 1c72db35edd..cfe56491ded 100644 --- a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts @@ -4,7 +4,7 @@ import { statSync } from 'fs'; import { InstanceSettings } from 'n8n-core'; import path from 'path'; -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateIntegerKeysToString1690000000002 implements IrreversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts b/packages/@n8n/db/src/migrations/sqlite/1690000000010-SeparateExecutionData.ts similarity index 95% rename from packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts rename to packages/@n8n/db/src/migrations/sqlite/1690000000010-SeparateExecutionData.ts index 1678ac3747e..43bddb2c759 100644 --- a/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1690000000010-SeparateExecutionData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class SeparateExecutionData1690000000010 implements ReversibleMigration { async up(context: MigrationContext): Promise { diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts b/packages/@n8n/db/src/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts similarity index 94% rename from packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts rename to packages/@n8n/db/src/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts index a604a46fca2..a69a51b09ae 100644 --- a/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; export class FixMissingIndicesFromStringIdMigration1690000000020 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext): Promise { diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts b/packages/@n8n/db/src/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts rename to packages/@n8n/db/src/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts b/packages/@n8n/db/src/migrations/sqlite/1690000000040-AddMfaColumns.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts rename to packages/@n8n/db/src/migrations/sqlite/1690000000040-AddMfaColumns.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts b/packages/@n8n/db/src/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts rename to packages/@n8n/db/src/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts b/packages/@n8n/db/src/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts rename to packages/@n8n/db/src/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1705429061930-DropRoleMapping.ts b/packages/@n8n/db/src/migrations/sqlite/1705429061930-DropRoleMapping.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1705429061930-DropRoleMapping.ts rename to packages/@n8n/db/src/migrations/sqlite/1705429061930-DropRoleMapping.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1717498465931-AddActivatedAtUserSetting.ts b/packages/@n8n/db/src/migrations/sqlite/1717498465931-AddActivatedAtUserSetting.ts similarity index 88% rename from packages/cli/src/databases/migrations/sqlite/1717498465931-AddActivatedAtUserSetting.ts rename to packages/@n8n/db/src/migrations/sqlite/1717498465931-AddActivatedAtUserSetting.ts index 552f5db725b..df2e876777a 100644 --- a/packages/cli/src/databases/migrations/sqlite/1717498465931-AddActivatedAtUserSetting.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1717498465931-AddActivatedAtUserSetting.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddActivatedAtUserSetting1717498465931 implements ReversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts b/packages/@n8n/db/src/migrations/sqlite/1724951148974-AddApiKeysTable.ts similarity index 94% rename from packages/cli/src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts rename to packages/@n8n/db/src/migrations/sqlite/1724951148974-AddApiKeysTable.ts index 4cf3cc89ee0..1603faa31cb 100644 --- a/packages/cli/src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1724951148974-AddApiKeysTable.ts @@ -1,7 +1,6 @@ -import { generateNanoId } from '@n8n/db'; -import type { ApiKey } from '@n8n/db'; - -import type { MigrationContext, ReversibleMigration } from '@/databases/types'; +import type { ApiKey } from '../../entities'; +import { generateNanoId } from '../../utils/generators'; +import type { MigrationContext, ReversibleMigration } from '../migration-types'; export class AddApiKeysTable1724951148974 implements ReversibleMigration { transaction = false as const; @@ -31,6 +30,7 @@ export class AddApiKeysTable1724951148974 implements ReversibleMigration { // Move the apiKey from the users table to the new table await Promise.all( usersWithApiKeys.map( + // @ts-expect-error Tech debt async (user: { id: string; apiKey: string }) => await runQuery( `INSERT INTO ${tableName} ("id", "userId", "apiKey", "label") VALUES (:id, :userId, :apiKey, :label)`, @@ -115,6 +115,7 @@ export class AddApiKeysTable1724951148974 implements ReversibleMigration { await Promise.all( oldestApiKeysPerUser.map( + // @ts-expect-error Tech debt async (user: { userId: string; apiKey: string }) => await runQuery( `UPDATE ${tablePrefix}user SET ${apiKeyColumn} = :apiKey WHERE ${idColumn} = :userId`, diff --git a/packages/cli/src/databases/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts b/packages/@n8n/db/src/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts similarity index 96% rename from packages/cli/src/databases/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts rename to packages/@n8n/db/src/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts index 1a2900b7a66..7a770a4dc90 100644 --- a/packages/cli/src/databases/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.ts @@ -1,6 +1,6 @@ import assert from 'node:assert'; -import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; +import type { IrreversibleMigration, MigrationContext } from '../migration-types'; const annotationsTableName = 'execution_annotations'; const annotationTagsTableName = 'annotation_tag_entity'; diff --git a/packages/cli/src/databases/migrations/sqlite/1729607673469-AddProjectIcons.ts b/packages/@n8n/db/src/migrations/sqlite/1729607673469-AddProjectIcons.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1729607673469-AddProjectIcons.ts rename to packages/@n8n/db/src/migrations/sqlite/1729607673469-AddProjectIcons.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts b/packages/@n8n/db/src/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts rename to packages/@n8n/db/src/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts b/packages/@n8n/db/src/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts similarity index 95% rename from packages/cli/src/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts rename to packages/@n8n/db/src/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts index 4ffa3da9833..744154c3770 100644 --- a/packages/cli/src/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; +import type { MigrationContext, IrreversibleMigration } from '../migration-types'; export class MigrateTestDefinitionKeyToString1731582748663 implements IrreversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1738709609940-CreateFolderTable.ts b/packages/@n8n/db/src/migrations/sqlite/1738709609940-CreateFolderTable.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1738709609940-CreateFolderTable.ts rename to packages/@n8n/db/src/migrations/sqlite/1738709609940-CreateFolderTable.ts diff --git a/packages/cli/src/databases/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts b/packages/@n8n/db/src/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts similarity index 96% rename from packages/cli/src/databases/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts rename to packages/@n8n/db/src/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts index 634e6cac8a2..b7af16ce474 100644 --- a/packages/cli/src/databases/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts +++ b/packages/@n8n/db/src/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts @@ -1,6 +1,5 @@ -import type { MigrationContext } from '@/databases/types'; - import type { UpdateParentFolderIdColumn1740445074052 as BaseMigration } from './1740445074052-UpdateParentFolderIdColumn'; +import type { MigrationContext } from '../migration-types'; export class UpdateParentFolderIdColumn1740445074052 implements BaseMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.ts b/packages/@n8n/db/src/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.ts similarity index 100% rename from packages/cli/src/databases/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.ts rename to packages/@n8n/db/src/migrations/sqlite/1742918400000-AddScopesColumnToApiKeys.ts diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/@n8n/db/src/migrations/sqlite/index.ts similarity index 99% rename from packages/cli/src/databases/migrations/sqlite/index.ts rename to packages/@n8n/db/src/migrations/sqlite/index.ts index a931c6fd2be..53d5d851455 100644 --- a/packages/cli/src/databases/migrations/sqlite/index.ts +++ b/packages/@n8n/db/src/migrations/sqlite/index.ts @@ -1,5 +1,3 @@ -import type { Migration } from '@/databases/types'; - import { InitialMigration1588102412422 } from './1588102412422-InitialMigration'; import { WebhookModel1592445003908 } from './1592445003908-WebhookModel'; import { CreateIndexStoppedAt1594825041918 } from './1594825041918-CreateIndexStoppedAt'; @@ -84,6 +82,7 @@ import { RenameAnalyticsToInsights1741167584277 } from '../common/1741167584277- import { AddWorkflowStatisticsRootCount1745587087521 } from '../common/1745587087521-AddWorkflowStatisticsRootCount'; import { AddWorkflowArchivedColumn1745934666076 } from '../common/1745934666076-AddWorkflowArchivedColumn'; import { DropRoleTable1745934666077 } from '../common/1745934666077-DropRoleTable'; +import type { Migration } from '../migration-types'; const sqliteMigrations: Migration[] = [ InitialMigration1588102412422, diff --git a/packages/@n8n/permissions/src/index.ts b/packages/@n8n/permissions/src/index.ts index 6b74cfcfe01..9a2eb8902cf 100644 --- a/packages/@n8n/permissions/src/index.ts +++ b/packages/@n8n/permissions/src/index.ts @@ -13,3 +13,4 @@ export { combineScopes } from './utilities/combineScopes.ee'; export { rolesWithScope } from './utilities/rolesWithScope.ee'; export { getGlobalScopes } from './utilities/getGlobalScopes.ee'; export { getRoleScopes } from './utilities/getRoleScopes.ee'; +export * from './public-api-permissions.ee'; diff --git a/packages/cli/src/public-api/permissions.ee/global-roles-scopes.ts b/packages/@n8n/permissions/src/public-api-permissions.ee.ts similarity index 65% rename from packages/cli/src/public-api/permissions.ee/global-roles-scopes.ts rename to packages/@n8n/permissions/src/public-api-permissions.ee.ts index dbe55de250f..92bf4e3d4fe 100644 --- a/packages/cli/src/public-api/permissions.ee/global-roles-scopes.ts +++ b/packages/@n8n/permissions/src/public-api-permissions.ee.ts @@ -1,4 +1,4 @@ -import type { ApiKeyScope } from '@n8n/permissions'; +import type { ApiKeyScope, GlobalRole } from './types.ee'; export const OWNER_API_KEY_SCOPES: ApiKeyScope[] = [ 'user:read', @@ -62,3 +62,20 @@ export const MEMBER_API_KEY_SCOPES: ApiKeyScope[] = [ 'credential:move', 'credential:delete', ]; + +const MAP_ROLE_SCOPES: Record = { + 'global:owner': OWNER_API_KEY_SCOPES, + 'global:admin': ADMIN_API_KEY_SCOPES, + 'global:member': MEMBER_API_KEY_SCOPES, +}; + +export const getApiKeyScopesForRole = (role: GlobalRole) => { + return MAP_ROLE_SCOPES[role]; +}; + +export const getOwnerOnlyApiKeyScopes = () => { + const ownerScopes = new Set(MAP_ROLE_SCOPES['global:owner']); + const memberScopes = new Set(MAP_ROLE_SCOPES['global:member']); + memberScopes.forEach((item) => ownerScopes.delete(item)); + return Array.from(ownerScopes); +}; diff --git a/packages/cli/src/commands/db/__tests__/revert.test.ts b/packages/cli/src/commands/db/__tests__/revert.test.ts index 8fdabafbec4..314fb08038f 100644 --- a/packages/cli/src/commands/db/__tests__/revert.test.ts +++ b/packages/cli/src/commands/db/__tests__/revert.test.ts @@ -1,10 +1,10 @@ +import type { IrreversibleMigration, ReversibleMigration } from '@n8n/db'; import type { Migration, MigrationExecutor } from '@n8n/typeorm'; import { type DataSource } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; import { Logger } from 'n8n-core'; import { main } from '@/commands/db/revert'; -import type { IrreversibleMigration, ReversibleMigration } from '@/databases/types'; import { mockInstance } from '@test/mocking'; const logger = mockInstance(Logger); diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts index 71b2353b59e..6f6365f9368 100644 --- a/packages/cli/src/commands/db/revert.ts +++ b/packages/cli/src/commands/db/revert.ts @@ -1,3 +1,5 @@ +import type { Migration } from '@n8n/db'; +import { wrapMigration } from '@n8n/db'; import { Container } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm'; @@ -7,8 +9,6 @@ import { Command, Flags } from '@oclif/core'; import { Logger } from 'n8n-core'; import { DbConnectionOptions } from '@/databases/db-connection-options'; -import type { Migration } from '@/databases/types'; -import { wrapMigration } from '@/databases/utils/migration-helpers'; // This function is extracted to make it easier to unit test it. // Mocking turned into a mess due to this command using typeorm and the db diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts index 1d730eb1ebb..33cd3d4e852 100644 --- a/packages/cli/src/commands/ldap/reset.ts +++ b/packages/cli/src/commands/ldap/reset.ts @@ -1,3 +1,4 @@ +import { LDAP_FEATURE_NAME, LDAP_DEFAULT_CONFIGURATION } from '@n8n/constants'; import { AuthIdentityRepository, AuthProviderSyncHistoryRepository, @@ -16,7 +17,6 @@ import { UserError } from 'n8n-workflow'; import { UM_FIX_INSTRUCTION } from '@/constants'; import { CredentialsService } from '@/credentials/credentials.service'; -import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants'; import { WorkflowService } from '@/workflows/workflow.service'; import { BaseCommand } from '../base-command'; diff --git a/packages/cli/src/controllers/api-keys.controller.ts b/packages/cli/src/controllers/api-keys.controller.ts index 152bd852d2a..9baccfe94a9 100644 --- a/packages/cli/src/controllers/api-keys.controller.ts +++ b/packages/cli/src/controllers/api-keys.controller.ts @@ -1,11 +1,11 @@ import { CreateApiKeyRequestDto, UpdateApiKeyRequestDto } from '@n8n/api-types'; import { Body, Delete, Get, Param, Patch, Post, RestController } from '@n8n/decorators'; +import { getApiKeyScopesForRole } from '@n8n/permissions'; import type { RequestHandler } from 'express'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { EventService } from '@/events/event.service'; import { isApiEnabled } from '@/public-api'; -import { getApiKeyScopesForRole } from '@/public-api/permissions.ee'; import { AuthenticatedRequest } from '@/requests'; import { PublicApiKeyService } from '@/services/public-api-key.service'; diff --git a/packages/cli/src/databases/__tests__/db-connection-options.test.ts b/packages/cli/src/databases/__tests__/db-connection-options.test.ts index a6d0564991a..791729b1b38 100644 --- a/packages/cli/src/databases/__tests__/db-connection-options.test.ts +++ b/packages/cli/src/databases/__tests__/db-connection-options.test.ts @@ -1,11 +1,11 @@ import type { GlobalConfig, InstanceSettingsConfig } from '@n8n/config'; +import { mysqlMigrations } from '@n8n/db'; +import { postgresMigrations } from '@n8n/db'; +import { sqliteMigrations } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import path from 'path'; import { DbConnectionOptions } from '../db-connection-options'; -import { mysqlMigrations } from '../migrations/mysqldb'; -import { postgresMigrations } from '../migrations/postgresdb'; -import { sqliteMigrations } from '../migrations/sqlite'; describe('DbConnectionOptions', () => { const dbConfig = mock({ diff --git a/packages/cli/src/databases/__tests__/db-connection.test.ts b/packages/cli/src/databases/__tests__/db-connection.test.ts index 20bc894a9a3..73a0fb36481 100644 --- a/packages/cli/src/databases/__tests__/db-connection.test.ts +++ b/packages/cli/src/databases/__tests__/db-connection.test.ts @@ -1,3 +1,5 @@ +import type { Migration } from '@n8n/db'; +import * as migrationHelper from '@n8n/db'; import { DataSource, type DataSourceOptions } from '@n8n/typeorm'; import { mock, mockDeep } from 'jest-mock-extended'; import type { ErrorReporter } from 'n8n-core'; @@ -5,8 +7,6 @@ import { DbConnectionTimeoutError } from 'n8n-workflow'; import { DbConnection } from '@/databases/db-connection'; import type { DbConnectionOptions } from '@/databases/db-connection-options'; -import type { Migration } from '@/databases/types'; -import * as migrationHelper from '@/databases/utils/migration-helpers'; jest.mock('@n8n/typeorm', () => ({ DataSource: jest.fn(), diff --git a/packages/cli/src/databases/db-connection-options.ts b/packages/cli/src/databases/db-connection-options.ts index ea8eb55bbe5..52ea8516f16 100644 --- a/packages/cli/src/databases/db-connection-options.ts +++ b/packages/cli/src/databases/db-connection-options.ts @@ -1,5 +1,11 @@ import { DatabaseConfig, InstanceSettingsConfig } from '@n8n/config'; -import { entities, subscribers } from '@n8n/db'; +import { + entities, + subscribers, + mysqlMigrations, + postgresMigrations, + sqliteMigrations, +} from '@n8n/db'; import { Service } from '@n8n/di'; import type { DataSourceOptions, LoggerOptions } from '@n8n/typeorm'; import type { MysqlConnectionOptions } from '@n8n/typeorm/driver/mysql/MysqlConnectionOptions'; @@ -14,10 +20,6 @@ import { InsightsByPeriod } from '@/modules/insights/database/entities/insights- import { InsightsMetadata } from '@/modules/insights/database/entities/insights-metadata'; import { InsightsRaw } from '@/modules/insights/database/entities/insights-raw'; -import { mysqlMigrations } from './migrations/mysqldb'; -import { postgresMigrations } from './migrations/postgresdb'; -import { sqliteMigrations } from './migrations/sqlite'; - @Service() export class DbConnectionOptions { constructor( diff --git a/packages/cli/src/databases/db-connection.ts b/packages/cli/src/databases/db-connection.ts index e6f70c82761..7d6a20a6d75 100644 --- a/packages/cli/src/databases/db-connection.ts +++ b/packages/cli/src/databases/db-connection.ts @@ -1,4 +1,6 @@ import { inTest } from '@n8n/backend-common'; +import type { Migration } from '@n8n/db'; +import { wrapMigration } from '@n8n/db'; import { Memoized } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; import { DataSource } from '@n8n/typeorm'; @@ -6,8 +8,6 @@ import { ErrorReporter } from 'n8n-core'; import { DbConnectionTimeoutError, ensureError } from 'n8n-workflow'; import { DbConnectionOptions } from './db-connection-options'; -import type { Migration } from './types'; -import { wrapMigration } from './utils/migration-helpers'; type ConnectionState = { connected: boolean; diff --git a/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts b/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts index 6ebfeb21e80..f28ac8c44cc 100644 --- a/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts +++ b/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts @@ -1,3 +1,4 @@ +import { LDAP_FEATURE_NAME, type LdapConfig } from '@n8n/constants'; import type { Settings } from '@n8n/db'; import { AuthIdentityRepository, SettingsRepository } from '@n8n/db'; import { QueryFailedError } from '@n8n/typeorm'; @@ -10,12 +11,7 @@ import config from '@/config'; import type { EventService } from '@/events/event.service'; import { mockInstance, mockLogger } from '@test/mocking'; -import { - BINARY_AD_ATTRIBUTES, - LDAP_LOGIN_ENABLED, - LDAP_LOGIN_LABEL, - LDAP_FEATURE_NAME, -} from '../constants'; +import { BINARY_AD_ATTRIBUTES, LDAP_LOGIN_ENABLED, LDAP_LOGIN_LABEL } from '../constants'; import { getLdapIds, createFilter, @@ -27,7 +23,6 @@ import { resolveEntryBinaryAttributes, } from '../helpers.ee'; import { LdapService } from '../ldap.service.ee'; -import type { LdapConfig } from '../types'; // Mock ldapts client jest.mock('ldapts', () => { diff --git a/packages/cli/src/ldap.ee/constants.ts b/packages/cli/src/ldap.ee/constants.ts index c70159e4e07..63a1353394d 100644 --- a/packages/cli/src/ldap.ee/constants.ts +++ b/packages/cli/src/ldap.ee/constants.ts @@ -1,6 +1,4 @@ -import type { LdapConfig } from './types'; - -export const LDAP_FEATURE_NAME = 'features.ldap'; +import type { LdapConfig } from '@n8n/constants'; export const LDAP_LOGIN_LABEL = 'sso.ldap.loginLabel'; @@ -8,28 +6,6 @@ export const LDAP_LOGIN_ENABLED = 'sso.ldap.loginEnabled'; export const BINARY_AD_ATTRIBUTES = ['objectGUID', 'objectSid']; -export const LDAP_DEFAULT_CONFIGURATION: LdapConfig = { - loginEnabled: false, - loginLabel: '', - connectionUrl: '', - allowUnauthorizedCerts: false, - connectionSecurity: 'none', - connectionPort: 389, - baseDn: '', - bindingAdminDn: '', - bindingAdminPassword: '', - firstNameAttribute: '', - lastNameAttribute: '', - emailAttribute: '', - loginIdAttribute: '', - ldapIdAttribute: '', - userFilter: '', - synchronizationEnabled: false, - synchronizationInterval: 60, - searchPageSize: 0, - searchTimeout: 60, -}; - export const LDAP_CONFIG_SCHEMA = { $schema: 'https://json-schema.org/draft/2019-09/schema', type: 'object', diff --git a/packages/cli/src/ldap.ee/helpers.ee.ts b/packages/cli/src/ldap.ee/helpers.ee.ts index 52b39871f55..0416535eee0 100644 --- a/packages/cli/src/ldap.ee/helpers.ee.ts +++ b/packages/cli/src/ldap.ee/helpers.ee.ts @@ -1,3 +1,4 @@ +import type { LdapConfig, ConnectionSecurity } from '@n8n/constants'; import type { AuthProviderSyncHistory } from '@n8n/db'; import { AuthIdentity, @@ -21,7 +22,6 @@ import { LDAP_LOGIN_ENABLED, LDAP_LOGIN_LABEL, } from './constants'; -import type { ConnectionSecurity, LdapConfig } from './types'; /** * Check whether the LDAP feature is disabled in the instance diff --git a/packages/cli/src/ldap.ee/ldap.service.ee.ts b/packages/cli/src/ldap.ee/ldap.service.ee.ts index f85dc7c5a92..8754f7592f0 100644 --- a/packages/cli/src/ldap.ee/ldap.service.ee.ts +++ b/packages/cli/src/ldap.ee/ldap.service.ee.ts @@ -1,3 +1,5 @@ +import type { LdapConfig } from '@n8n/constants'; +import { LDAP_FEATURE_NAME } from '@n8n/constants'; import { SettingsRepository } from '@n8n/db'; import type { User, RunningMode, SyncStatus } from '@n8n/db'; import { Service } from '@n8n/di'; @@ -20,12 +22,7 @@ import { setCurrentAuthenticationMethod, } from '@/sso.ee/sso-helpers'; -import { - BINARY_AD_ATTRIBUTES, - LDAP_FEATURE_NAME, - LDAP_LOGIN_ENABLED, - LDAP_LOGIN_LABEL, -} from './constants'; +import { BINARY_AD_ATTRIBUTES, LDAP_LOGIN_ENABLED, LDAP_LOGIN_LABEL } from './constants'; import { createFilter, deleteAllLdapIdentities, @@ -41,7 +38,6 @@ import { saveLdapSynchronization, validateLdapConfigurationSchema, } from './helpers.ee'; -import type { LdapConfig } from './types'; @Service() export class LdapService { diff --git a/packages/cli/src/ldap.ee/types.ts b/packages/cli/src/ldap.ee/types.ts index 6c92852bb6c..c1169ef9627 100644 --- a/packages/cli/src/ldap.ee/types.ts +++ b/packages/cli/src/ldap.ee/types.ts @@ -1,31 +1,8 @@ +import type { LdapConfig } from '@n8n/constants'; import type { RunningMode } from '@n8n/db'; import type { AuthenticatedRequest } from '@/requests'; -export type ConnectionSecurity = 'none' | 'tls' | 'startTls'; - -export interface LdapConfig { - loginEnabled: boolean; - loginLabel: string; - connectionUrl: string; - allowUnauthorizedCerts: boolean; - connectionSecurity: ConnectionSecurity; - connectionPort: number; - baseDn: string; - bindingAdminDn: string; - bindingAdminPassword: string; - firstNameAttribute: string; - lastNameAttribute: string; - emailAttribute: string; - loginIdAttribute: string; - ldapIdAttribute: string; - userFilter: string; - synchronizationEnabled: boolean; - synchronizationInterval: number; // minutes - searchPageSize: number; - searchTimeout: number; -} - export declare namespace LdapConfiguration { type Update = AuthenticatedRequest<{}, {}, LdapConfig, {}>; type Sync = AuthenticatedRequest<{}, {}, { type: RunningMode }, {}>; diff --git a/packages/cli/src/public-api/permissions.ee/index.ts b/packages/cli/src/public-api/permissions.ee/index.ts deleted file mode 100644 index 5f6beef5558..00000000000 --- a/packages/cli/src/public-api/permissions.ee/index.ts +++ /dev/null @@ -1,24 +0,0 @@ -import type { ApiKeyScope, GlobalRole } from '@n8n/permissions'; - -import { - ADMIN_API_KEY_SCOPES, - MEMBER_API_KEY_SCOPES, - OWNER_API_KEY_SCOPES, -} from './global-roles-scopes'; - -const MAP_ROLE_SCOPES: Record = { - 'global:owner': OWNER_API_KEY_SCOPES, - 'global:admin': ADMIN_API_KEY_SCOPES, - 'global:member': MEMBER_API_KEY_SCOPES, -}; - -export const getApiKeyScopesForRole = (role: GlobalRole) => { - return MAP_ROLE_SCOPES[role]; -}; - -export const getOwnerOnlyApiKeyScopes = () => { - const ownerScopes = new Set(MAP_ROLE_SCOPES['global:owner']); - const memberScopes = new Set(MAP_ROLE_SCOPES['global:member']); - memberScopes.forEach((item) => ownerScopes.delete(item)); - return Array.from(ownerScopes); -}; diff --git a/packages/cli/src/services/__tests__/public-api-key.service.test.ts b/packages/cli/src/services/__tests__/public-api-key.service.test.ts index 6bb63c76dea..37ea1a58303 100644 --- a/packages/cli/src/services/__tests__/public-api-key.service.test.ts +++ b/packages/cli/src/services/__tests__/public-api-key.service.test.ts @@ -1,7 +1,7 @@ import { ApiKeyRepository } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; -import type { ApiKeyScope } from '@n8n/permissions'; +import { getOwnerOnlyApiKeyScopes, type ApiKeyScope } from '@n8n/permissions'; import type { Response, NextFunction } from 'express'; import { mock, mockDeep } from 'jest-mock-extended'; import { DateTime } from 'luxon'; @@ -10,7 +10,6 @@ import { randomString } from 'n8n-workflow'; import type { OpenAPIV3 } from 'openapi-types'; import type { EventService } from '@/events/event.service'; -import { getOwnerOnlyApiKeyScopes } from '@/public-api/permissions.ee'; import type { AuthenticatedRequest } from '@/requests'; import { createAdminWithApiKey, createOwnerWithApiKey } from '@test-integration/db/users'; import * as testDb from '@test-integration/test-db'; diff --git a/packages/cli/src/services/public-api-key.service.ts b/packages/cli/src/services/public-api-key.service.ts index 1601477cca0..774f7b8f487 100644 --- a/packages/cli/src/services/public-api-key.service.ts +++ b/packages/cli/src/services/public-api-key.service.ts @@ -4,6 +4,7 @@ import type { User } from '@n8n/db'; import { ApiKey, ApiKeyRepository, UserRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import type { GlobalRole, ApiKeyScope } from '@n8n/permissions'; +import { getApiKeyScopesForRole, getOwnerOnlyApiKeyScopes } from '@n8n/permissions'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import type { EntityManager } from '@n8n/typeorm'; import type { NextFunction, Request, Response } from 'express'; @@ -11,7 +12,6 @@ import { TokenExpiredError } from 'jsonwebtoken'; import type { OpenAPIV3 } from 'openapi-types'; import { EventService } from '@/events/event.service'; -import { getApiKeyScopesForRole, getOwnerOnlyApiKeyScopes } from '@/public-api/permissions.ee'; import type { AuthenticatedRequest } from '@/requests'; import { JwtService } from './jwt.service'; diff --git a/packages/cli/test/integration/api-keys.api.test.ts b/packages/cli/test/integration/api-keys.api.test.ts index ea06b0c1ad3..f52fcb10489 100644 --- a/packages/cli/test/integration/api-keys.api.test.ts +++ b/packages/cli/test/integration/api-keys.api.test.ts @@ -3,11 +3,14 @@ import { GlobalConfig } from '@n8n/config'; import type { User } from '@n8n/db'; import { ApiKeyRepository } from '@n8n/db'; import { Container } from '@n8n/di'; -import type { ApiKeyScope } from '@n8n/permissions'; +import { + getApiKeyScopesForRole, + getOwnerOnlyApiKeyScopes, + type ApiKeyScope, +} from '@n8n/permissions'; import { mock } from 'jest-mock-extended'; import type { License } from '@/license'; -import { getApiKeyScopesForRole, getOwnerOnlyApiKeyScopes } from '@/public-api/permissions.ee'; import { PublicApiKeyService } from '@/services/public-api-key.service'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index 14aee4c777b..4d5a1dd4ed9 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -1,3 +1,4 @@ +import { LDAP_DEFAULT_CONFIGURATION } from '@n8n/constants'; import type { User } from '@n8n/db'; import { AuthProviderSyncHistoryRepository } from '@n8n/db'; import { UserRepository } from '@n8n/db'; @@ -7,7 +8,6 @@ import type { Entry as LdapUser } from 'ldapts'; import { Cipher } from 'n8n-core'; import config from '@/config'; -import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap.ee/constants'; import { saveLdapSynchronization } from '@/ldap.ee/helpers.ee'; import { LdapService } from '@/ldap.ee/ldap.service.ee'; import { diff --git a/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts b/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts index f8a48c60813..45db327cf13 100644 --- a/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts +++ b/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts @@ -6,10 +6,10 @@ import { TagRepository } from '@n8n/db'; import { SharedCredentialsRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; +import { getOwnerOnlyApiKeyScopes } from '@n8n/permissions'; import { randomString } from 'n8n-workflow'; import validator from 'validator'; -import { getOwnerOnlyApiKeyScopes } from '@/public-api/permissions.ee'; import { affixRoleToSaveCredential, createCredentials } from '@test-integration/db/credentials'; import { createErrorExecution, createSuccessfulExecution } from '@test-integration/db/executions'; import { createTeamProject, getProjectByNameOrFail } from '@test-integration/db/projects'; diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts index 5b447826c40..c77ce2e7fbc 100644 --- a/packages/cli/test/integration/shared/db/users.ts +++ b/packages/cli/test/integration/shared/db/users.ts @@ -5,11 +5,11 @@ import { AuthUserRepository } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { ApiKeyScope, GlobalRole } from '@n8n/permissions'; +import { getApiKeyScopesForRole } from '@n8n/permissions'; import { hash } from 'bcryptjs'; import { MfaService } from '@/mfa/mfa.service'; import { TOTPService } from '@/mfa/totp.service'; -import { getApiKeyScopesForRole } from '@/public-api/permissions.ee'; import { PublicApiKeyService } from '@/services/public-api-key.service'; import { randomEmail, randomName, randomValidPassword } from '../random'; diff --git a/packages/cli/test/integration/shared/ldap.ts b/packages/cli/test/integration/shared/ldap.ts index e0fd6e1a59a..06e468f4349 100644 --- a/packages/cli/test/integration/shared/ldap.ts +++ b/packages/cli/test/integration/shared/ldap.ts @@ -1,10 +1,9 @@ +import type { LdapConfig } from '@n8n/constants'; +import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@n8n/constants'; import { SettingsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { jsonParse } from 'n8n-workflow'; -import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants'; -import type { LdapConfig } from '@/ldap.ee/types'; - export const defaultLdapConfig = { ...LDAP_DEFAULT_CONFIGURATION, loginEnabled: true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f342ab69d57..400cd9aac8d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -487,6 +487,9 @@ importers: '@n8n/config': specifier: workspace:^ version: link:../config + '@n8n/constants': + specifier: workspace:^ + version: link:../constants '@n8n/di': specifier: workspace:^ version: link:../di @@ -514,9 +517,15 @@ importers: nanoid: specifier: 'catalog:' version: 3.3.8 + p-lazy: + specifier: 3.1.0 + version: 3.1.0 reflect-metadata: specifier: 'catalog:' version: 0.2.2 + uuid: + specifier: 'catalog:' + version: 10.0.0 xss: specifier: 'catalog:' version: 1.0.15 @@ -717,7 +726,7 @@ importers: version: 4.3.0 '@getzep/zep-cloud': specifier: 1.0.12 - version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(7f2a4b9c5436679ca8b0df05212b4905)) + version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(b4eb53fe8b825d6e8edd96cc3d942586)) '@getzep/zep-js': specifier: 0.9.0 version: 0.9.0 @@ -744,7 +753,7 @@ importers: version: 0.3.2(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13) '@langchain/community': specifier: 'catalog:' - version: 0.3.24(0b620065402de60ffbc4ade3af2d8197) + version: 0.3.24(67fb36bad0bcdd2b0df3579415b33a93) '@langchain/core': specifier: 'catalog:' version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) @@ -846,7 +855,7 @@ importers: version: 23.0.1 langchain: specifier: 0.3.11 - version: 0.3.11(7f2a4b9c5436679ca8b0df05212b4905) + version: 0.3.11(b4eb53fe8b825d6e8edd96cc3d942586) lodash: specifier: 'catalog:' version: 4.17.21 @@ -16459,7 +16468,7 @@ snapshots: '@gar/promisify@1.1.3': optional: true - '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(7f2a4b9c5436679ca8b0df05212b4905))': + '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(b4eb53fe8b825d6e8edd96cc3d942586))': dependencies: form-data: 4.0.0 node-fetch: 2.7.0(encoding@0.1.13) @@ -16468,7 +16477,7 @@ snapshots: zod: 3.24.1 optionalDependencies: '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) - langchain: 0.3.11(7f2a4b9c5436679ca8b0df05212b4905) + langchain: 0.3.11(b4eb53fe8b825d6e8edd96cc3d942586) transitivePeerDependencies: - encoding @@ -16980,7 +16989,7 @@ snapshots: - aws-crt - encoding - '@langchain/community@0.3.24(0b620065402de60ffbc4ade3af2d8197)': + '@langchain/community@0.3.24(67fb36bad0bcdd2b0df3579415b33a93)': dependencies: '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))(zod@3.24.1) '@ibm-cloud/watsonx-ai': 1.1.2 @@ -16991,7 +17000,7 @@ snapshots: flat: 5.0.2 ibm-cloud-sdk-core: 5.3.2 js-yaml: 4.1.0 - langchain: 0.3.11(7f2a4b9c5436679ca8b0df05212b4905) + langchain: 0.3.11(b4eb53fe8b825d6e8edd96cc3d942586) langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) openai: 4.78.1(encoding@0.1.13)(zod@3.24.1) uuid: 10.0.0 @@ -17006,7 +17015,7 @@ snapshots: '@aws-sdk/credential-provider-node': 3.808.0 '@azure/storage-blob': 12.26.0 '@browserbasehq/sdk': 2.0.0(encoding@0.1.13) - '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(7f2a4b9c5436679ca8b0df05212b4905)) + '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(b4eb53fe8b825d6e8edd96cc3d942586)) '@getzep/zep-js': 0.9.0 '@google-ai/generativelanguage': 2.6.0(encoding@0.1.13) '@google-cloud/storage': 7.12.1(encoding@0.1.13) @@ -22027,7 +22036,7 @@ snapshots: eslint-import-resolver-node@0.3.9: dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) is-core-module: 2.13.1 resolve: 1.22.8 transitivePeerDependencies: @@ -22052,7 +22061,7 @@ snapshots: eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) optionalDependencies: '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.8.2) eslint: 8.57.0 @@ -22072,7 +22081,7 @@ snapshots: array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 array.prototype.flatmap: 1.3.2 - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -22899,7 +22908,7 @@ snapshots: array-parallel: 0.1.3 array-series: 0.1.5 cross-spawn: 7.0.6 - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -23193,7 +23202,7 @@ snapshots: '@types/debug': 4.1.12 '@types/node': 18.16.16 '@types/tough-cookie': 4.0.2 - axios: 1.8.3 + axios: 1.8.3(debug@4.4.0) camelcase: 6.3.0 debug: 4.4.0(supports-color@8.1.1) dotenv: 16.4.5 @@ -23203,7 +23212,7 @@ snapshots: isstream: 0.1.2 jsonwebtoken: 9.0.2 mime-types: 2.1.35 - retry-axios: 2.6.0(axios@1.8.3(debug@4.4.0)) + retry-axios: 2.6.0(axios@1.8.3) tough-cookie: 4.1.3 transitivePeerDependencies: - supports-color @@ -24197,7 +24206,7 @@ snapshots: kuler@2.0.0: {} - langchain@0.3.11(7f2a4b9c5436679ca8b0df05212b4905): + langchain@0.3.11(b4eb53fe8b825d6e8edd96cc3d942586): dependencies: '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) '@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13) @@ -25762,7 +25771,7 @@ snapshots: pdf-parse@1.1.1: dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) node-ensure: 0.0.0 transitivePeerDependencies: - supports-color @@ -26574,7 +26583,7 @@ snapshots: onetime: 5.1.2 signal-exit: 3.0.7 - retry-axios@2.6.0(axios@1.8.3(debug@4.4.0)): + retry-axios@2.6.0(axios@1.8.3): dependencies: axios: 1.8.3 @@ -26601,7 +26610,7 @@ snapshots: rhea@1.0.24: dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) transitivePeerDependencies: - supports-color