diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts index ccbafd2286afb..e032241426b97 100644 --- a/packages/cli/src/Db.ts +++ b/packages/cli/src/Db.ts @@ -7,8 +7,8 @@ import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; import { inTest } from '@/constants'; import { wrapMigration } from '@/databases/utils/migration-helpers'; -import type { Migration } from '@db/types'; -import { getConnectionOptions } from '@db/config'; +import type { Migration } from '@/databases/types'; +import { getConnectionOptions } from '@/databases/config'; let connection: Connection; diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts index f10ad17601178..e047d4391e7a9 100644 --- a/packages/cli/src/Interfaces.ts +++ b/packages/cli/src/Interfaces.ts @@ -35,10 +35,10 @@ import type { AuthProviderType } from '@/databases/entities/auth-identity'; import type { SharedCredentials } from '@/databases/entities/shared-credentials'; import type { TagEntity } from '@/databases/entities/tag-entity'; import type { AssignableRole, GlobalRole, User } from '@/databases/entities/User'; -import type { CredentialsRepository } from '@db/repositories/credentials.repository'; -import type { SettingsRepository } from '@db/repositories/settings.repository'; -import type { UserRepository } from '@db/repositories/user.repository'; -import type { WorkflowRepository } from '@db/repositories/workflow.repository'; +import type { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import type { SettingsRepository } from '@/databases/repositories/settings.repository'; +import type { UserRepository } from '@/databases/repositories/user.repository'; +import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { ExternalHooks } from './external-hooks'; import type { LICENSE_FEATURES, LICENSE_QUOTAS } from './constants'; import type { WorkflowWithSharingsAndCredentials } from './workflows/workflows.types'; diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/PublicApi/index.ts index 35c6d9862ea97..63efc02e81e0d 100644 --- a/packages/cli/src/PublicApi/index.ts +++ b/packages/cli/src/PublicApi/index.ts @@ -11,7 +11,7 @@ import type { OpenAPIV3 } from 'openapi-types'; import type { JsonObject } from 'swagger-ui-express'; import { License } from '@/license'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { UrlService } from '@/services/url.service'; import type { AuthenticatedRequest } from '@/requests'; import { GlobalConfig } from '@n8n/config'; diff --git a/packages/cli/src/PublicApi/types.ts b/packages/cli/src/PublicApi/types.ts index d25f306b81f98..6eaa567485405 100644 --- a/packages/cli/src/PublicApi/types.ts +++ b/packages/cli/src/PublicApi/types.ts @@ -1,6 +1,6 @@ import type { ExecutionStatus, ICredentialDataDecryptedObject } from 'n8n-workflow'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { TagEntity } from '@/databases/entities/tag-entity'; import type { Risk } from '@/security-audit/types'; import type { AuthlessRequest, AuthenticatedRequest } from '@/requests'; diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts index 48e1adc424249..5f0502aa11061 100644 --- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts +++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts @@ -14,7 +14,7 @@ import { ExternalHooks } from '@/external-hooks'; import type { IDependency, IJsonSchema } from '../../../types'; import type { CredentialRequest } from '@/requests'; import { Container } from 'typedi'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts index beba4606aa7b1..4dc0a9a69bf4d 100644 --- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts +++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts @@ -8,7 +8,7 @@ import type { ExecutionRequest } from '../../../types'; import { getSharedWorkflowIds } from '../workflows/workflows.service'; import { encodeNextCursor } from '../../shared/services/pagination.service'; import { EventService } from '@/events/event.service'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service'; export = { diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts b/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts index ecc3132c090d8..b17dcfc4c9a90 100644 --- a/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts +++ b/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts @@ -8,7 +8,7 @@ import { encodeNextCursor } from '../../shared/services/pagination.service'; import { Container } from 'typedi'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import type { FindManyOptions } from '@n8n/typeorm'; -import { TagRepository } from '@db/repositories/tag.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import { TagService } from '@/services/tag.service'; export = { diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts index 4e432ec17c609..8c3f61c3760ad 100644 --- a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts +++ b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts @@ -1,5 +1,5 @@ import { Container } from 'typedi'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import type { User } from '@/databases/entities/User'; import pick from 'lodash/pick'; import { validate as uuidValidate } from 'uuid'; diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts index 6b363752eaba0..ef582815cea99 100644 --- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts +++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts @@ -9,7 +9,7 @@ import { v4 as uuid } from 'uuid'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import config from '@/config'; -import { WorkflowEntity } from '@db/entities/workflow-entity'; +import { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { ExternalHooks } from '@/external-hooks'; import { addNodeIds, replaceInvalidCredentials } from '@/workflow-helpers'; import type { WorkflowRequest } from '../../../types'; diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts index 54f492c93cfd8..388f9b679710b 100644 --- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts +++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts @@ -1,13 +1,13 @@ import { Container } from 'typedi'; import * as Db from '@/Db'; import type { User } from '@/databases/entities/User'; -import { WorkflowEntity } from '@db/entities/workflow-entity'; +import { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping'; import { SharedWorkflow, type WorkflowSharingRole } from '@/databases/entities/shared-workflow'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import type { Project } from '@/databases/entities/project'; -import { TagRepository } from '@db/repositories/tag.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import { License } from '@/license'; import { WorkflowSharingService } from '@/workflows/workflow-sharing.service'; import type { Scope } from '@n8n/permissions'; diff --git a/packages/cli/src/__tests__/active-executions.test.ts b/packages/cli/src/__tests__/active-executions.test.ts index 539c16070070a..4b9ceaeaa4e45 100644 --- a/packages/cli/src/__tests__/active-executions.test.ts +++ b/packages/cli/src/__tests__/active-executions.test.ts @@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid'; import type { IExecuteResponsePromiseData, IRun } from 'n8n-workflow'; import { createDeferredPromise } from 'n8n-workflow'; import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; -import type { ExecutionRepository } from '@db/repositories/execution.repository'; +import type { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { mock } from 'jest-mock-extended'; import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/__tests__/credentials-helper.test.ts b/packages/cli/src/__tests__/credentials-helper.test.ts index b91c722e36612..1e60e2bf14c04 100644 --- a/packages/cli/src/__tests__/credentials-helper.test.ts +++ b/packages/cli/src/__tests__/credentials-helper.test.ts @@ -12,7 +12,7 @@ import { Workflow } from 'n8n-workflow'; import { CredentialsHelper } from '@/credentials-helper'; import { NodeTypes } from '@/node-types'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/active-executions.ts b/packages/cli/src/active-executions.ts index 32f8aac0a7ed5..0aeb768f070ee 100644 --- a/packages/cli/src/active-executions.ts +++ b/packages/cli/src/active-executions.ts @@ -22,7 +22,7 @@ import type { IWorkflowExecutionDataProcess, } from '@/Interfaces'; import { isWorkflowIdValid } from '@/utils'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { Logger } from '@/logger'; import { ConcurrencyControlService } from './concurrency/concurrency-control.service'; import config from './config'; diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts index 3af6c1c3d05bf..96df40195084a 100644 --- a/packages/cli/src/active-workflow-manager.ts +++ b/packages/cli/src/active-workflow-manager.ts @@ -30,7 +30,7 @@ import type { IWorkflowDb } from '@/Interfaces'; import * as WebhookHelpers from '@/webhooks/webhook-helpers'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { ActiveExecutions } from '@/active-executions'; import { ExecutionService } from './executions/execution.service'; import { @@ -42,7 +42,7 @@ import { NodeTypes } from '@/node-types'; import { ExternalHooks } from '@/external-hooks'; import { WebhookService } from '@/webhooks/webhook.service'; import { Logger } from './logger'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OrchestrationService } from '@/services/orchestration.service'; import { ActivationErrorsService } from '@/activation-errors.service'; import { ActiveWorkflowsService } from '@/services/activeWorkflows.service'; diff --git a/packages/cli/src/auth/__tests__/auth.service.test.ts b/packages/cli/src/auth/__tests__/auth.service.test.ts index dbb44c3974e3b..c34d9eac5a499 100644 --- a/packages/cli/src/auth/__tests__/auth.service.test.ts +++ b/packages/cli/src/auth/__tests__/auth.service.test.ts @@ -7,7 +7,7 @@ import config from '@/config'; import { AUTH_COOKIE_NAME, Time } from '@/constants'; import type { User } from '@/databases/entities/User'; import type { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository'; -import type { UserRepository } from '@db/repositories/user.repository'; +import type { UserRepository } from '@/databases/repositories/user.repository'; import { JwtService } from '@/services/jwt.service'; import type { UrlService } from '@/services/url.service'; import type { AuthenticatedRequest } from '@/requests'; diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts index 2e708fee60e09..1dc32f1b8163c 100644 --- a/packages/cli/src/auth/auth.service.ts +++ b/packages/cli/src/auth/auth.service.ts @@ -7,7 +7,7 @@ import config from '@/config'; import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants'; import type { User } from '@/databases/entities/User'; import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthError } from '@/errors/response-errors/auth.error'; import { ForbiddenError } from '@/errors/response-errors/forbidden.error'; import { License } from '@/license'; diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts index 030e3d6c73ba8..501cf5fd56be5 100644 --- a/packages/cli/src/auth/methods/email.ts +++ b/packages/cli/src/auth/methods/email.ts @@ -2,7 +2,7 @@ import type { User } from '@/databases/entities/User'; import { PasswordUtility } from '@/services/password.utility'; import { Container } from 'typedi'; import { isLdapLoginEnabled } from '@/ldap/helpers.ee'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthError } from '@/errors/response-errors/auth.error'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts index c41fe16d7f72e..e20b39bd69424 100644 --- a/packages/cli/src/commands/base-command.ts +++ b/packages/cli/src/commands/base-command.ts @@ -19,7 +19,7 @@ import { PostHogClient } from '@/posthog'; import { License } from '@/license'; import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; import { initExpressionEvaluator } from '@/expression-evaluator'; -import { generateHostInstanceId } from '@db/utils/generators'; +import { generateHostInstanceId } from '@/databases/utils/generators'; import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee'; import { ShutdownService } from '@/shutdown/shutdown.service'; import { TelemetryEventRelay } from '@/events/telemetry-event-relay'; diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts index ed34d24d46e7e..aa74f1b1564aa 100644 --- a/packages/cli/src/commands/db/revert.ts +++ b/packages/cli/src/commands/db/revert.ts @@ -5,8 +5,8 @@ import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm'; import { MigrationExecutor, DataSource as Connection } from '@n8n/typeorm'; import { Container } from 'typedi'; import { Logger } from '@/logger'; -import { getConnectionOptions } from '@db/config'; -import type { Migration } from '@db/types'; +import { getConnectionOptions } from '@/databases/config'; +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. diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts index 0788f4d1db041..646f1af0fe43f 100644 --- a/packages/cli/src/commands/execute.ts +++ b/packages/cli/src/commands/execute.ts @@ -9,7 +9,7 @@ import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; import { findCliWorkflowStart, isWorkflowIdValid } from '@/utils'; import { BaseCommand } from './base-command'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OwnershipService } from '@/services/ownership.service'; export class Execute extends BaseCommand { diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts index b32811192f076..b9e269575143f 100644 --- a/packages/cli/src/commands/executeBatch.ts +++ b/packages/cli/src/commands/executeBatch.ts @@ -13,7 +13,7 @@ import { ActiveExecutions } from '@/active-executions'; import { WorkflowRunner } from '@/workflow-runner'; import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces'; import type { User } from '@/databases/entities/User'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OwnershipService } from '@/services/ownership.service'; import { findCliWorkflowStart } from '@/utils'; diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts index 4af626c735ed0..cec59f014f4c5 100644 --- a/packages/cli/src/commands/export/credentials.ts +++ b/packages/cli/src/commands/export/credentials.ts @@ -4,7 +4,7 @@ import path from 'path'; import { Credentials } from 'n8n-core'; import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/Interfaces'; import { BaseCommand } from '../base-command'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import Container from 'typedi'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts index b15484c7697ce..a2e03e58820e5 100644 --- a/packages/cli/src/commands/export/workflow.ts +++ b/packages/cli/src/commands/export/workflow.ts @@ -2,7 +2,7 @@ import { Flags } from '@oclif/core'; import fs from 'fs'; import path from 'path'; import { BaseCommand } from '../base-command'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts index defa2f217817b..bc6d646d6a418 100644 --- a/packages/cli/src/commands/import/workflow.ts +++ b/packages/cli/src/commands/import/workflow.ts @@ -5,10 +5,10 @@ import fs from 'fs'; import glob from 'fast-glob'; import { UM_FIX_INSTRUCTION } from '@/constants'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { generateNanoId } from '@db/utils/generators'; -import { UserRepository } from '@db/repositories/user.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { generateNanoId } from '@/databases/utils/generators'; +import { UserRepository } from '@/databases/repositories/user.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { IWorkflowToImport } from '@/Interfaces'; import { ImportService } from '@/services/import.service'; import { BaseCommand } from '../base-command'; diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts index 65f10368e42dd..5837825e59aa3 100644 --- a/packages/cli/src/commands/ldap/reset.ts +++ b/packages/cli/src/commands/ldap/reset.ts @@ -1,9 +1,9 @@ import Container from 'typedi'; import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants'; -import { AuthIdentityRepository } from '@db/repositories/auth-identity.repository'; +import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository'; -import { SettingsRepository } from '@db/repositories/settings.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { BaseCommand } from '../base-command'; import { Flags } from '@oclif/core'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/commands/license/clear.ts b/packages/cli/src/commands/license/clear.ts index 84394174712d2..5ae2e9015b55f 100644 --- a/packages/cli/src/commands/license/clear.ts +++ b/packages/cli/src/commands/license/clear.ts @@ -1,7 +1,7 @@ import { Container } from 'typedi'; import { SETTINGS_LICENSE_CERT_KEY } from '@/constants'; import { BaseCommand } from '../base-command'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { License } from '@/license'; export class ClearLicenseCommand extends BaseCommand { diff --git a/packages/cli/src/commands/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts index 35fd073f3578c..9a0cca8e13b37 100644 --- a/packages/cli/src/commands/list/workflow.ts +++ b/packages/cli/src/commands/list/workflow.ts @@ -1,6 +1,6 @@ import Container from 'typedi'; import { Flags } from '@oclif/core'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BaseCommand } from '../base-command'; export class ListWorkflowCommand extends BaseCommand { diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts index cc8ea6fa93df2..76de7585dd48d 100644 --- a/packages/cli/src/commands/start.ts +++ b/packages/cli/src/commands/start.ts @@ -21,8 +21,8 @@ import { OrchestrationService } from '@/services/orchestration.service'; import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service'; import { PruningService } from '@/services/pruning.service'; import { UrlService } from '@/services/url.service'; -import { SettingsRepository } from '@db/repositories/settings.repository'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; import { WaitTracker } from '@/wait-tracker'; import { BaseCommand } from './base-command'; diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts index 35a3ac016c602..b51f6049f0197 100644 --- a/packages/cli/src/commands/update/workflow.ts +++ b/packages/cli/src/commands/update/workflow.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import { Flags } from '@oclif/core'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BaseCommand } from '../base-command'; export class UpdateWorkflowCommand extends BaseCommand { diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts index f107b3b401b03..dcb11e5bef03a 100644 --- a/packages/cli/src/commands/user-management/reset.ts +++ b/packages/cli/src/commands/user-management/reset.ts @@ -1,11 +1,11 @@ import { Container } from 'typedi'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { User } from '@/databases/entities/User'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { BaseCommand } from '../base-command'; import { ProjectRepository } from '@/databases/repositories/project.repository'; diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts index c0d794528e68a..472658bf549a1 100644 --- a/packages/cli/src/controllers/__tests__/me.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts @@ -17,7 +17,7 @@ import { badPasswords } from '@test/testData'; import { mockInstance } from '@test/mocking'; import { AuthUserRepository } from '@/databases/repositories/auth-user.repository'; import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { MfaService } from '@/mfa/mfa.service'; import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error'; diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts index a850c67338e57..ae80b97f35349 100644 --- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts @@ -7,8 +7,8 @@ import type { AuthService } from '@/auth/auth.service'; import config from '@/config'; import { OwnerController } from '@/controllers/owner.controller'; import type { User } from '@/databases/entities/User'; -import type { SettingsRepository } from '@db/repositories/settings.repository'; -import type { UserRepository } from '@db/repositories/user.repository'; +import type { SettingsRepository } from '@/databases/repositories/settings.repository'; +import type { UserRepository } from '@/databases/repositories/user.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { License } from '@/license'; import type { OwnerRequest } from '@/requests'; diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts index 0b70a8b45a856..08301783e9942 100644 --- a/packages/cli/src/controllers/e2e.controller.ts +++ b/packages/cli/src/controllers/e2e.controller.ts @@ -1,8 +1,8 @@ import { Request } from 'express'; import { v4 as uuid } from 'uuid'; import config from '@/config'; -import { SettingsRepository } from '@db/repositories/settings.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { License } from '@/license'; diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts index 624cc9b3f0910..61177266b255f 100644 --- a/packages/cli/src/controllers/invitation.controller.ts +++ b/packages/cli/src/controllers/invitation.controller.ts @@ -13,7 +13,7 @@ import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers'; import { PasswordUtility } from '@/services/password.utility'; import { PostHogClient } from '@/posthog'; import type { User } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { ForbiddenError } from '@/errors/response-errors/forbidden.error'; import { ExternalHooks } from '@/external-hooks'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts index c5dc7db95f0ba..e5be0e3bcef50 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts @@ -9,7 +9,7 @@ import { OAuth1CredentialController } from '@/controllers/oauth/oauth1-credentia import { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { User } from '@/databases/entities/User'; import type { OAuthRequest } from '@/requests'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { ExternalHooks } from '@/external-hooks'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts index 7775ed07e2ec5..996aa1170a23e 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts @@ -9,7 +9,7 @@ import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credentia import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { User } from '@/databases/entities/User'; import type { OAuthRequest } from '@/requests'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { ExternalHooks } from '@/external-hooks'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts index 4255d6fc2f83b..7f066c8704ad4 100644 --- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts +++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts @@ -6,7 +6,7 @@ import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } f import { jsonParse, ApplicationError } from 'n8n-workflow'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import type { ICredentialsDb } from '@/Interfaces'; import type { OAuthRequest } from '@/requests'; diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts index 826bbc2fa7c4e..5f464e2bba6e9 100644 --- a/packages/cli/src/controllers/owner.controller.ts +++ b/packages/cli/src/controllers/owner.controller.ts @@ -7,8 +7,8 @@ import { validateEntity } from '@/generic-helpers'; import { GlobalScope, Post, RestController } from '@/decorators'; import { PasswordUtility } from '@/services/password.utility'; import { OwnerRequest } from '@/requests'; -import { SettingsRepository } from '@db/repositories/settings.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { PostHogClient } from '@/posthog'; import { UserService } from '@/services/user.service'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts index ffaae5860cc01..2755bfd786f31 100644 --- a/packages/cli/src/controllers/users.controller.ts +++ b/packages/cli/src/controllers/users.controller.ts @@ -13,7 +13,7 @@ import type { PublicUser } from '@/Interfaces'; import { AuthIdentity } from '@/databases/entities/auth-identity'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { UserService } from '@/services/user.service'; import { listQueryMiddleware } from '@/middlewares'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/credentials-helper.ts b/packages/cli/src/credentials-helper.ts index 100f731130669..1a40dc3674f21 100644 --- a/packages/cli/src/credentials-helper.ts +++ b/packages/cli/src/credentials-helper.ts @@ -34,7 +34,7 @@ import { CredentialTypes } from '@/credential-types'; import { CredentialsOverwrites } from '@/credentials-overwrites'; import { RESPONSE_ERROR_MESSAGES } from './constants'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { CredentialNotFoundError } from './errors/credential-not-found.error'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts index 6d98e3ffaf919..72a6ddd91c0c8 100644 --- a/packages/cli/src/credentials/credentials.service.ts +++ b/packages/cli/src/credentials/credentials.service.ts @@ -27,7 +27,7 @@ import type { CredentialRequest, ListQuery } from '@/requests'; import { CredentialTypes } from '@/credential-types'; import { OwnershipService } from '@/services/ownership.service'; import { Logger } from '@/logger'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { Service } from 'typedi'; import { CredentialsTester } from '@/services/credentials-tester.service'; diff --git a/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts b/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts index f245602c1f65c..f959d8e91bdc7 100644 --- a/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts +++ b/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts @@ -1,5 +1,5 @@ -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class UniqueWorkflowNames1620821879465 implements ReversibleMigration { protected indexSuffix = '943d8f922be094eb507cb9a7f9'; diff --git a/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts index 32c16f71c9aff..02a25e5d41984 100644 --- a/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts +++ b/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts @@ -1,7 +1,7 @@ import type { IWorkflowBase } from 'n8n-workflow'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts index 85c37b7c8454a..22a7af34cc6c0 100644 --- a/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts @@ -1,6 +1,6 @@ import type { INode } from 'n8n-workflow'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import { v4 as uuid } from 'uuid'; type Workflow = Pick & { nodes: string | INode[] }; diff --git a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts index dfdaee213f827..b9ab3216ce98b 100644 --- a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts +++ b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts @@ -1,6 +1,6 @@ import { isObjectLiteral } from '@/utils'; import type { IDataObject, INodeExecutionData } from 'n8n-workflow'; -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts index 004af7d2dff23..36d95530b0ad6 100644 --- a/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts +++ b/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import { v4 as uuidv4 } from 'uuid'; type Workflow = { id: number }; diff --git a/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts b/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts index 6bc183f3ab35d..47c26982e3ecb 100644 --- a/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts +++ b/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import { StatisticsNames } from '@/databases/entities/workflow-statistics'; export class RemoveWorkflowDataLoadedFlag1671726148419 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts index 1d915a5576e6f..5ccd0c40a47bb 100644 --- a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts +++ b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants'; export class CreateLdapEntities1674509946020 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts index c4978fb5508fb..894e741344528 100644 --- a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts +++ b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts @@ -1,5 +1,5 @@ -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; interface Workflow { id: number; diff --git a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts index 76a38898d8d5d..ef514285b25aa 100644 --- a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts +++ b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class RemoveResetPasswordColumns1690000000030 implements ReversibleMigration { async up({ schemaBuilder: { dropColumns } }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts b/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts index c38cd6067d3e1..a29feda00981d 100644 --- a/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts +++ b/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts index 73d411e464955..8538dba59e575 100644 --- a/packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts +++ b/packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; const tableName = 'workflow_history'; diff --git a/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts b/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts index c0f74ec0bb2f2..b38e8fd4c3e0c 100644 --- a/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts +++ b/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class DisallowOrphanExecutions1693554410387 implements ReversibleMigration { /** diff --git a/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts b/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts index 84ab2ba47abed..40374417af26c 100644 --- a/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts +++ b/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts index 6973d00214761..afed132cafe86 100644 --- a/packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts +++ b/packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; const tableName = 'workflow_history'; diff --git a/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts b/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts index c9077d79a0d8a..5e12a35d842e2 100644 --- a/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts +++ b/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import { ApplicationError } from 'n8n-workflow'; export class AddGlobalAdminRole1700571993961 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts b/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts index 2fa897707aee9..d62bd648a1482 100644 --- a/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts +++ b/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; type Table = 'user' | 'shared_workflow' | 'shared_credentials'; diff --git a/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts b/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts index 2f48fdbc1f93f..59b4218974dfa 100644 --- a/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts +++ b/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@db/types'; +import type { IrreversibleMigration, MigrationContext } from '@/databases/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/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts index be33118907b37..ff2c16807d11a 100644 --- a/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts +++ b/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts @@ -3,7 +3,7 @@ import { readFile, writeFile, rm } from 'node:fs/promises'; import Container from 'typedi'; import { Cipher, InstanceSettings } from 'n8n-core'; import { jsonParse } from 'n8n-workflow'; -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; /** * Move SSH key pair from file system to database, to enable SSH connections diff --git a/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts b/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts index 8460af61c4c97..8b206551c89ec 100644 --- a/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts +++ b/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@db/types'; +import type { IrreversibleMigration, MigrationContext } from '@/databases/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/cli/src/databases/migrations/common/1714133768519-CreateProject.ts index feb0979b2562f..ac1ec9d8e85a1 100644 --- a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts +++ b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import type { ProjectRole } from '@/databases/entities/project-relation'; import type { User } from '@/databases/entities/User'; import { generateNanoId } from '@/databases/utils/generators'; diff --git a/packages/cli/src/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts b/packages/cli/src/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts index 21cd672ce2b3f..1cfa42a9e0dd1 100644 --- a/packages/cli/src/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts +++ b/packages/cli/src/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import { nanoid } from 'nanoid'; export class AddConstraintToExecutionMetadata1720101653148 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts b/packages/cli/src/databases/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts index f28696c199088..30ec1b8ad8c4e 100644 --- a/packages/cli/src/databases/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts +++ b/packages/cli/src/databases/migrations/common/1723627610222-CreateInvalidAuthTokenTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; const tableName = 'invalid_auth_token'; diff --git a/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts b/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts index 0cf659d285f25..c38f1b2a433fc 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts index 0ffa4b10c28b1..5de2e233cf8b1 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts index 5ec7bc08fcc33..a0e69b9409784 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts index 2d9e1efd41a95..71f9a86ffdfdc 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts index bbccd94ed2581..85c7efada2ed0 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts index 211dee64e7522..122e271aa95d6 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts index 986db2d110ffe..7e96027cb5938 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts index cec34715cd5e1..c27f0b5daca5f 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class ChangeCredentialDataSize1620729500000 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts b/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts index 27ef69edc345e..1bf71c229f49b 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts index 86adde6058392..f52a6c385b4c0 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class AddWaitColumnId1626183952959 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts b/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts index aaa493fb81640..e6532c82b0452 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts index e36bec5e0fee7..063ea7580e42a 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts @@ -1,4 +1,4 @@ -import type { InsertResult, MigrationContext, ReversibleMigration } from '@db/types'; +import type { InsertResult, MigrationContext, ReversibleMigration } from '@/databases/types'; import { v4 as uuid } from 'uuid'; export class CreateUserManagement1646992772331 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts b/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts index aa4804357b4ec..b07686403303d 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts index 1b3b270689f5c..298bc4ef21c00 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts index 33020e7545a72..77e8968ff4b67 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts index ba390d3f6cfa9..9a31d543f9364 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts index 4d0eb25ec3964..049b41353388a 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class IntroducePinData1654090101303 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts b/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts index 98a8158081d8b..3d442fac7bc60 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts index d11f1c5f57ae8..8b47297f21adb 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts index f4c8e2cc0f016..83743e2165994 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts index e35185185f60d..4d2df6e1c28d6 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts index b7e86a29697bb..57512b741ed80 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class RemoveCredentialUsageTable1665754637026 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts b/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts index 8371c865d351e..00e7dd1773648 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts index 0fb0eef513faf..0f251975e96bd 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class MessageEventBusDestinations1671535397530 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts index a76f1508c6716..6e2e7c6809d38 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts index c193df2125fca..b41948eb70f99 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts index 38a51292d426a..aa675e5671ccf 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts index 16ac4c606b71a..c99143a74ff9f 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts index 08df64dcfb005..19fe0bc5b9c74 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts index 4a601af7ca5f4..9a65b594233a6 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts index d3b6b2f72c9e5..fc16c1711fe8e 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import type { UserSettings } from '@/Interfaces'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts b/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts index c756b5839a963..189c4bbe3ea34 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@db/types'; +import type { IrreversibleMigration, MigrationContext } from '@/databases/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/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts index 7da7113f91c8c..1f6bf77123c66 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts index cb56cf7b63e11..116874947e223 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts index 7107eaec1363d..591f22237f0b5 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts index 23fb794847027..8d1f580d288b0 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1717498465931-AddActivatedAtUserSetting.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class AddActivatedAtUserSetting1717498465931 implements ReversibleMigration { async up({ queryRunner, escape }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts index ed08c6b2f2916..ac55780b3236f 100644 --- a/packages/cli/src/databases/migrations/mysqldb/index.ts +++ b/packages/cli/src/databases/migrations/mysqldb/index.ts @@ -1,4 +1,4 @@ -import type { Migration } from '@db/types'; +import type { Migration } from '@/databases/types'; import { InitialMigration1588157391238 } from './1588157391238-InitialMigration'; import { WebhookModel1592447867632 } from './1592447867632-WebhookModel'; import { CreateIndexStoppedAt1594902918301 } from './1594902918301-CreateIndexStoppedAt'; diff --git a/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts b/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts index 7d3c948e1ee82..cfac3b4afea6e 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts index 3b1617a098dfd..71fb4a1bc2c54 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts index 1fb468b1640ac..1d9cf473a67c7 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts index bfedccd0cd607..e9d01b7a4e1b8 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts index 5a5df368649b9..30b39b42fa7fd 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts index 00a17d7088ec0..7f7ce4e02b155 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class CreateTagEntity1617270242566 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts b/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts index eff0301a4ce23..c9f69e6b5e2a0 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class AddwaitTill1626176912946 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts b/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts index 7426fb0ed148c..f65067250654e 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts index 576e8c80a0f87..8252c787e95b2 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts index a69bcb4297b33..5a0581a16e910 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts @@ -1,4 +1,4 @@ -import type { InsertResult, MigrationContext, ReversibleMigration } from '@db/types'; +import type { InsertResult, MigrationContext, ReversibleMigration } from '@/databases/types'; import { v4 as uuid } from 'uuid'; export class CreateUserManagement1646992772331 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts b/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts index 2f2ee528f1e0a..6ed635a91387e 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts index f0f429627357e..9d4b5316ad56c 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts index d3f9ad6bdd818..41c497cb7af08 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts index 80b2876a1be18..902f7cbc6269e 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts index 3a27cc7894cc2..e78ac95abeb72 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class IntroducePinData1654090467022 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts b/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts index 0a4f3c2cd1f2c..1e4b157a0c260 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts index 4951a637a03e2..11c521c3d223d 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts index 2dffdafd64bb2..3f7265d57c053 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts index 929d668d93957..012c5922e4c92 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts index a37236a228ae1..ba4259c8ccef1 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class RemoveCredentialUsageTable1665754637025 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts b/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts index 3094f9662490f..f8ae1854dfed0 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts index 1082c56d242da..3f1de8cf75671 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class MessageEventBusDestinations1671535397530 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts index c31c51f5a5339..93e6d627d8082 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts index 7c3efea2f1961..b2055cf63cc96 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts index fcc82e31064b9..d0e5ceafc07f9 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts index 5403732c831ce..078e29bde953e 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts index ef0281dc22d31..6c0a03991d3f7 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts index ef47c075fcb9c..4726d636aabce 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts index 38c1b22da4162..0a0a87e20c8dc 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import type { UserSettings } from '@/Interfaces'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts b/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts index 958cf30199444..ae4b98433ae41 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@db/types'; +import type { IrreversibleMigration, MigrationContext } from '@/databases/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/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts index e06bcfb334aee..e8a64a79e7738 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts index 4ee413b4b3eee..250c3b44a9db1 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class SeparateExecutionData1690000000020 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts b/packages/cli/src/databases/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts index 471206282fd90..76096ca5029cf 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1717498465931-AddActivatedAtUserSetting.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts index 2b9786ecada1b..911602cd30e3c 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1721377157740-FixExecutionMetadataSequence.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@db/types'; +import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; export class FixExecutionMetadataSequence1721377157740 implements IrreversibleMigration { async up({ queryRunner, escape }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts index 3a37f369360c3..d836eda509bd1 100644 --- a/packages/cli/src/databases/migrations/postgresdb/index.ts +++ b/packages/cli/src/databases/migrations/postgresdb/index.ts @@ -1,4 +1,4 @@ -import type { Migration } from '@db/types'; +import type { Migration } from '@/databases/types'; import { InitialMigration1587669153312 } from './1587669153312-InitialMigration'; import { WebhookModel1589476000887 } from './1589476000887-WebhookModel'; import { CreateIndexStoppedAt1594828256133 } from './1594828256133-CreateIndexStoppedAt'; diff --git a/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts b/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts index baf99502cc789..7d960dd9163dd 100644 --- a/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts +++ b/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts index eddde3176272f..0cd223110efe2 100644 --- a/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts +++ b/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts index b363b1623e8f5..70cf3ec44f55d 100644 --- a/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts +++ b/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts index 800d605ba6ab4..3bdf9149c1ef7 100644 --- a/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts +++ b/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts index 8d1d64f4de698..4c942daaf315f 100644 --- a/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts +++ b/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts index 314eded6d128a..ae30f9c7f5087 100644 --- a/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts +++ b/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts index 95c5cd51b1e83..22a83231b7e64 100644 --- a/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts +++ b/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts index babf466f01db0..6a5e7dcbc6501 100644 --- a/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts +++ b/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts index 3794f5cd04a01..83923e4285452 100644 --- a/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts +++ b/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts @@ -1,4 +1,4 @@ -import type { InsertResult, MigrationContext, ReversibleMigration } from '@db/types'; +import type { InsertResult, MigrationContext, ReversibleMigration } from '@/databases/types'; import { v4 as uuid } from 'uuid'; export class CreateUserManagement1646992772331 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts b/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts index 2f2ee528f1e0a..6ed635a91387e 100644 --- a/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts +++ b/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts index fc79d63e0dc10..fa07e62076493 100644 --- a/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts +++ b/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts index ee7339547870a..dadea4bdc209d 100644 --- a/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts +++ b/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class AddUserSettings1652367743993 implements ReversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts b/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts index 74440331bb19a..bfb7d3e21c2df 100644 --- a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts +++ b/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class AddAPIKeyColumn1652905585850 implements ReversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts b/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts index cdf424aec2888..29718616cd459 100644 --- a/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts +++ b/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts index f3481a387696b..117455578fdab 100644 --- a/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts +++ b/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts index 3f590a20b056e..84a5f1bd5e2f0 100644 --- a/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts +++ b/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts index 842af220f8dbb..c53e3a6c7ca49 100644 --- a/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts +++ b/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts index 3bc30e5c4d8e2..c238432684e89 100644 --- a/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts +++ b/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts index 54be01f00afe3..1da61600afbdd 100644 --- a/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts +++ b/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts index 0386b37550118..36395ee0a34dc 100644 --- a/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts +++ b/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts index 92a67e4e414c5..4f1811319bb5f 100644 --- a/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts +++ b/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts index cfd670bc62be3..1c2b2cd8ae33b 100644 --- a/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts +++ b/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; export class DeleteExecutionsWithWorkflows1673268682475 implements ReversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts b/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts index 8633fe8e004d7..8c9595b2f6652 100644 --- a/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts +++ b/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts index 71de0e434820d..f93fa1dd86aa3 100644 --- a/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts +++ b/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts index 0fe69a57ff90c..1ef2a8dae8de4 100644 --- a/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts +++ b/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts index adc7d2ead4f54..c73867da650e6 100644 --- a/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts +++ b/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts index e521c8494f36c..158d2a040bd18 100644 --- a/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts +++ b/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts index d4e73014a7edb..f9f7a0d74d5b7 100644 --- a/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts +++ b/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import type { UserSettings } from '@/Interfaces'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts b/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts index 4d8f7d47c6b24..f69f7c0d88dca 100644 --- a/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts +++ b/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@db/types'; +import type { IrreversibleMigration, MigrationContext } from '@/databases/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/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts index ab2da63cd58b8..b281c0dbdd8a9 100644 --- a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts +++ b/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts @@ -3,7 +3,7 @@ import path from 'path'; import { Container } from 'typedi'; import { InstanceSettings } from 'n8n-core'; import { GlobalConfig } from '@n8n/config'; -import type { MigrationContext, IrreversibleMigration } from '@db/types'; +import type { MigrationContext, IrreversibleMigration } from '@/databases/types'; export class MigrateIntegerKeysToString1690000000002 implements IrreversibleMigration { transaction = false as const; diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts b/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts index 8ea0053d9fc1a..1678ac3747efe 100644 --- a/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts +++ b/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts @@ -1,4 +1,4 @@ -import type { MigrationContext, ReversibleMigration } from '@db/types'; +import type { MigrationContext, ReversibleMigration } from '@/databases/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/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts index f950ff70da432..a604a46fca2b5 100644 --- a/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts +++ b/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts @@ -1,4 +1,4 @@ -import type { IrreversibleMigration, MigrationContext } from '@db/types'; +import type { IrreversibleMigration, MigrationContext } from '@/databases/types'; export class FixMissingIndicesFromStringIdMigration1690000000020 implements IrreversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext): Promise { diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts index e55a36c1c1c34..9200cee080702 100644 --- a/packages/cli/src/databases/migrations/sqlite/index.ts +++ b/packages/cli/src/databases/migrations/sqlite/index.ts @@ -1,4 +1,4 @@ -import type { Migration } from '@db/types'; +import type { Migration } from '@/databases/types'; import { InitialMigration1588102412422 } from './1588102412422-InitialMigration'; import { WebhookModel1592445003908 } from './1592445003908-WebhookModel'; import { CreateIndexStoppedAt1594825041918 } from './1594825041918-CreateIndexStoppedAt'; diff --git a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts index ac598a89ac150..1ca3a9227dc58 100644 --- a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts +++ b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts @@ -6,8 +6,8 @@ import { BinaryDataService } from 'n8n-core'; import { nanoid } from 'nanoid'; import { mock } from 'jest-mock-extended'; -import { ExecutionEntity } from '@db/entities/execution-entity'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionEntity } from '@/databases/entities/execution-entity'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { mockInstance, mockEntityManager } from '@test/mocking'; describe('ExecutionRepository', () => { diff --git a/packages/cli/src/databases/utils/migration-helpers.ts b/packages/cli/src/databases/utils/migration-helpers.ts index ed100f9c47882..072d7b3fd4dcf 100644 --- a/packages/cli/src/databases/utils/migration-helpers.ts +++ b/packages/cli/src/databases/utils/migration-helpers.ts @@ -7,8 +7,8 @@ import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner'; import { ApplicationError, jsonParse } from 'n8n-workflow'; import { inTest } from '@/constants'; -import type { BaseMigration, Migration, MigrationContext, MigrationFn } from '@db/types'; -import { createSchemaBuilder } from '@db/dsl'; +import type { BaseMigration, Migration, MigrationContext, MigrationFn } from '@/databases/types'; +import { createSchemaBuilder } from '@/databases/dsl'; import { NodeTypes } from '@/node-types'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments/source-control/source-control-export.service.ee.ts index dc1c8b68fb44d..2be67ef41b3b3 100644 --- a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts +++ b/packages/cli/src/environments/source-control/source-control-export.service.ee.ts @@ -20,11 +20,11 @@ import { sourceControlFoldersExistCheck, stringContainsExpression, } from './source-control-helper.ee'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { SourceControlledFile } from './types/source-controlled-file'; import { VariablesService } from '../variables/variables.service.ee'; -import { TagRepository } from '@db/repositories/tag.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { Logger } from '@/logger'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; diff --git a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts index 7be5c6c42f0da..6ab7ab09b3f7e 100644 --- a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts +++ b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts @@ -25,14 +25,14 @@ import type { SourceControlWorkflowVersionId } from './types/source-control-work import { getCredentialExportPath, getWorkflowExportPath } from './source-control-helper.ee'; import type { SourceControlledFile } from './types/source-controlled-file'; import { VariablesService } from '../variables/variables.service.ee'; -import { TagRepository } from '@db/repositories/tag.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { Logger } from '@/logger'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository'; -import { VariablesRepository } from '@db/repositories/variables.repository'; +import { VariablesRepository } from '@/databases/repositories/variables.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { Project } from '@/databases/entities/project'; import type { ResourceOwner } from './types/resource-owner'; diff --git a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts index 4e417704416f0..8e69e8e72afcc 100644 --- a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts +++ b/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts @@ -17,7 +17,7 @@ import path from 'path'; import type { KeyPairType } from './types/key-pair-type'; import config from '@/config'; import { Logger } from '@/logger'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; @Service() export class SourceControlPreferencesService { diff --git a/packages/cli/src/environments/source-control/source-control.service.ee.ts b/packages/cli/src/environments/source-control/source-control.service.ee.ts index 17bc878a44374..a236f9b3636df 100644 --- a/packages/cli/src/environments/source-control/source-control.service.ee.ts +++ b/packages/cli/src/environments/source-control/source-control.service.ee.ts @@ -31,7 +31,7 @@ import type { Variables } from '@/databases/entities/Variables'; import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id'; import type { ExportableCredential } from './types/exportable-credential'; import { EventService } from '@/events/event.service'; -import { TagRepository } from '@db/repositories/tag.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import { Logger } from '@/logger'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments/variables/variables.service.ee.ts index 83847acf4614f..de4d811fa0d23 100644 --- a/packages/cli/src/environments/variables/variables.service.ee.ts +++ b/packages/cli/src/environments/variables/variables.service.ee.ts @@ -1,9 +1,9 @@ import { Container, Service } from 'typedi'; import type { Variables } from '@/databases/entities/Variables'; -import { generateNanoId } from '@db/utils/generators'; +import { generateNanoId } from '@/databases/utils/generators'; import { canCreateNewVariable } from './environment-helpers'; import { CacheService } from '@/services/cache/cache.service'; -import { VariablesRepository } from '@db/repositories/variables.repository'; +import { VariablesRepository } from '@/databases/repositories/variables.repository'; import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error'; import { VariableValidationError } from '@/errors/variable-validation.error'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts index 74f753dc6b7b6..1989b9f251a32 100644 --- a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts +++ b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts @@ -9,8 +9,8 @@ import type { MessageEventBusDestinationOptions } from 'n8n-workflow'; import config from '@/config'; import { EventDestinationsRepository } from '@/databases/repositories/event-destinations.repository'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OrchestrationService } from '@/services/orchestration.service'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts index 2e5436758f3c3..20ffec55ee1b3 100644 --- a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts +++ b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts @@ -3,7 +3,7 @@ import type { ExecutionStatus, IRun, IWorkflowBase } from 'n8n-workflow'; import type { ExecutionPayload, IExecutionDb } from '@/Interfaces'; import pick from 'lodash/pick'; import { isWorkflowIdValid } from '@/utils'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionMetadataService } from '@/services/executionMetadata.service'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts index 1c8fe7d639035..a3fe0536cc4a1 100644 --- a/packages/cli/src/executions/execution-recovery.service.ts +++ b/packages/cli/src/executions/execution-recovery.service.ts @@ -1,7 +1,7 @@ import { Service } from 'typedi'; import { Push } from '@/push'; import { sleep } from 'n8n-workflow'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { getWorkflowHooksMain } from '@/workflow-execute-additional-data'; // @TODO: Dependency cycle import type { DateTime } from 'luxon'; import type { IRun, ITaskData } from 'n8n-workflow'; diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts index a4ae0ffbae38e..3e34a66475865 100644 --- a/packages/cli/src/executions/execution.service.ts +++ b/packages/cli/src/executions/execution.service.ts @@ -26,9 +26,9 @@ import type { import { NodeTypes } from '@/node-types'; import type { ExecutionRequest, ExecutionSummaries, StopResult } from './execution.types'; import { WorkflowRunner } from '@/workflow-runner'; -import type { IGetExecutionsQueryFilter } from '@db/repositories/execution.repository'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import type { IGetExecutionsQueryFilter } from '@/databases/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { Logger } from '@/logger'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts index 2cdbd441d7e4f..d85b742e5fe7f 100644 --- a/packages/cli/src/external-hooks.ts +++ b/packages/cli/src/external-hooks.ts @@ -2,10 +2,10 @@ import { Service } from 'typedi'; import type { IExternalHooksFileData, IExternalHooksFunctions } from '@/Interfaces'; import config from '@/config'; -import { UserRepository } from '@db/repositories/user.repository'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; -import { SettingsRepository } from '@db/repositories/settings.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ApplicationError } from 'n8n-workflow'; @Service() diff --git a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts b/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts index 6a0d1cc23eff4..80a6d3d065865 100644 --- a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts +++ b/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import { Cipher } from 'n8n-core'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { ExternalSecretsSettings } from '@/Interfaces'; import { License } from '@/license'; import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; diff --git a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts b/packages/cli/src/external-secrets/external-secrets-manager.ee.ts index 2281f03538530..1dea7bd686f36 100644 --- a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts +++ b/packages/cli/src/external-secrets/external-secrets-manager.ee.ts @@ -1,4 +1,4 @@ -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { ExternalSecretsSettings, SecretsProvider, diff --git a/packages/cli/src/generic-helpers.ts b/packages/cli/src/generic-helpers.ts index 17241cf037d48..f1a10030fdefe 100644 --- a/packages/cli/src/generic-helpers.ts +++ b/packages/cli/src/generic-helpers.ts @@ -1,5 +1,5 @@ import { validate } from 'class-validator'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { TagEntity } from '@/databases/entities/tag-entity'; import type { User } from '@/databases/entities/User'; diff --git a/packages/cli/src/ldap/helpers.ee.ts b/packages/cli/src/ldap/helpers.ee.ts index a36d2daf2135c..552392d0362f9 100644 --- a/packages/cli/src/ldap/helpers.ee.ts +++ b/packages/cli/src/ldap/helpers.ee.ts @@ -18,9 +18,9 @@ import { } from './constants'; import type { ConnectionSecurity, LdapConfig } from './types'; import { License } from '@/license'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository'; -import { AuthIdentityRepository } from '@db/repositories/auth-identity.repository'; +import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; /** * Check whether the LDAP feature is disabled in the instance diff --git a/packages/cli/src/ldap/ldap.service.ee.ts b/packages/cli/src/ldap/ldap.service.ee.ts index 5438640c1e07b..ffe1426775b55 100644 --- a/packages/cli/src/ldap/ldap.service.ee.ts +++ b/packages/cli/src/ldap/ldap.service.ee.ts @@ -10,7 +10,7 @@ import { Cipher } from 'n8n-core'; import config from '@/config'; import type { User } from '@/databases/entities/User'; import type { RunningMode, SyncStatus } from '@/databases/entities/auth-provider-sync-history'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { Logger } from '@/logger'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts index 57f576c5a39d2..1c54eb58edd59 100644 --- a/packages/cli/src/license.ts +++ b/packages/cli/src/license.ts @@ -11,7 +11,7 @@ import { SETTINGS_LICENSE_CERT_KEY, UNLIMITED_LICENSE_QUOTA, } from './constants'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { BooleanLicenseFeature, N8nInstanceType, NumericLicenseFeature } from './Interfaces'; import type { RedisServicePubSubPublisher } from './services/redis/RedisServicePubSubPublisher'; import { RedisService } from './services/redis.service'; diff --git a/packages/cli/src/license/__tests__/license.service.test.ts b/packages/cli/src/license/__tests__/license.service.test.ts index 9db929ec71057..8a730f01926ba 100644 --- a/packages/cli/src/license/__tests__/license.service.test.ts +++ b/packages/cli/src/license/__tests__/license.service.test.ts @@ -1,7 +1,7 @@ import { LicenseErrors, LicenseService } from '@/license/license.service'; import type { License } from '@/license'; import type { EventService } from '@/events/event.service'; -import type { WorkflowRepository } from '@db/repositories/workflow.repository'; +import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { TEntitlement } from '@n8n_io/license-sdk'; import { mock } from 'jest-mock-extended'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts index 7d7af80444ea9..b48fd1762196f 100644 --- a/packages/cli/src/license/license.service.ts +++ b/packages/cli/src/license/license.service.ts @@ -5,7 +5,7 @@ import { Logger } from '@/logger'; import { License } from '@/license'; import { EventService } from '@/events/event.service'; import type { User } from '@/databases/entities/User'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { UrlService } from '@/services/url.service'; diff --git a/packages/cli/src/mfa/helpers.ts b/packages/cli/src/mfa/helpers.ts index 54ebad078b5c6..e03c7c00e06eb 100644 --- a/packages/cli/src/mfa/helpers.ts +++ b/packages/cli/src/mfa/helpers.ts @@ -1,7 +1,7 @@ import Container from 'typedi'; import config from '@/config'; import { MFA_FEATURE_ENABLED } from './constants'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; export const isMfaFeatureEnabled = () => config.get(MFA_FEATURE_ENABLED); diff --git a/packages/cli/src/permissions/check-access.ts b/packages/cli/src/permissions/check-access.ts index e5a93bc50af9f..7e2825d119de8 100644 --- a/packages/cli/src/permissions/check-access.ts +++ b/packages/cli/src/permissions/check-access.ts @@ -5,7 +5,7 @@ import { In } from '@n8n/typeorm'; import { RoleService } from '@/services/role.service'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { User } from '@/databases/entities/User'; import type { Scope } from '@n8n/permissions'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts index baa26fb04da9d..e293fcf932050 100644 --- a/packages/cli/src/requests.ts +++ b/packages/cli/src/requests.ts @@ -19,7 +19,7 @@ import type { PublicUser, SecretsProvider, SecretsProviderState } from '@/Interf import { AssignableRole } from '@/databases/entities/User'; import type { GlobalRole, User } from '@/databases/entities/User'; import type { Variables } from '@/databases/entities/Variables'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { WorkflowHistory } from '@/databases/entities/workflow-history'; import type { Project, ProjectType } from '@/databases/entities/project'; diff --git a/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts index 11d76f2b8940f..f5ae3860f6c01 100644 --- a/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts @@ -3,9 +3,9 @@ import type { IWorkflowBase } from 'n8n-workflow'; import config from '@/config'; import { CREDENTIALS_REPORT } from '@/security-audit/constants'; import type { RiskReporter, Risk } from '@/security-audit/types'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository'; @Service() diff --git a/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts index 9f5df0fb3d1f3..dd537f71823a0 100644 --- a/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts @@ -5,7 +5,7 @@ import { DB_QUERY_PARAMS_DOCS_URL, SQL_NODE_TYPES_WITH_QUERY_PARAMS, } from '@/security-audit/constants'; -import type { WorkflowEntity as Workflow } from '@db/entities/workflow-entity'; +import type { WorkflowEntity as Workflow } from '@/databases/entities/workflow-entity'; import type { RiskReporter, Risk } from '@/security-audit/types'; import { Service } from 'typedi'; diff --git a/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts index 738e96813ff99..621611e052db2 100644 --- a/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts @@ -1,6 +1,6 @@ import { getNodeTypes } from '@/security-audit/utils'; import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/security-audit/constants'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { RiskReporter, Risk } from '@/security-audit/types'; import { Service } from 'typedi'; diff --git a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts index 9f6002ba98372..4667b5618947a 100644 --- a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts @@ -11,7 +11,7 @@ import { WEBHOOK_VALIDATOR_NODE_TYPES, } from '@/security-audit/constants'; import { getN8nPackageJson, inDevelopment } from '@/constants'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { RiskReporter, Risk, n8n } from '@/security-audit/types'; import { isApiEnabled } from '@/PublicApi'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts index 589d928b73533..57867d0150887 100644 --- a/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts @@ -10,7 +10,7 @@ import { COMMUNITY_NODES_RISKS_URL, NPM_PACKAGE_URL, } from '@/security-audit/constants'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { Risk, RiskReporter } from '@/security-audit/types'; import { CommunityPackagesService } from '@/services/communityPackages.service'; import { GlobalConfig } from '@n8n/config'; diff --git a/packages/cli/src/security-audit/types.ts b/packages/cli/src/security-audit/types.ts index 1e9a97bffd695..a848ff56c5659 100644 --- a/packages/cli/src/security-audit/types.ts +++ b/packages/cli/src/security-audit/types.ts @@ -1,4 +1,4 @@ -import type { WorkflowEntity as Workflow } from '@db/entities/workflow-entity'; +import type { WorkflowEntity as Workflow } from '@/databases/entities/workflow-entity'; export namespace Risk { export type Category = 'database' | 'credentials' | 'nodes' | 'instance' | 'filesystem'; diff --git a/packages/cli/src/security-audit/utils.ts b/packages/cli/src/security-audit/utils.ts index 4b3d30a77d584..b7241144948c1 100644 --- a/packages/cli/src/security-audit/utils.ts +++ b/packages/cli/src/security-audit/utils.ts @@ -1,4 +1,4 @@ -import type { WorkflowEntity as Workflow } from '@db/entities/workflow-entity'; +import type { WorkflowEntity as Workflow } from '@/databases/entities/workflow-entity'; import type { Risk } from '@/security-audit/types'; type Node = Workflow['nodes'][number]; diff --git a/packages/cli/src/services/__tests__/activeWorkflows.service.test.ts b/packages/cli/src/services/__tests__/activeWorkflows.service.test.ts index ac0050e3720b8..06eb9a5d96301 100644 --- a/packages/cli/src/services/__tests__/activeWorkflows.service.test.ts +++ b/packages/cli/src/services/__tests__/activeWorkflows.service.test.ts @@ -1,7 +1,7 @@ import type { ActivationErrorsService } from '@/activation-errors.service'; import type { User } from '@/databases/entities/User'; import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import type { WorkflowRepository } from '@db/repositories/workflow.repository'; +import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ActiveWorkflowsService } from '@/services/activeWorkflows.service'; import { mock } from 'jest-mock-extended'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/services/__tests__/hooks.service.test.ts b/packages/cli/src/services/__tests__/hooks.service.test.ts index 04bf854b24584..6d8c03a852d62 100644 --- a/packages/cli/src/services/__tests__/hooks.service.test.ts +++ b/packages/cli/src/services/__tests__/hooks.service.test.ts @@ -2,10 +2,10 @@ import type { Response } from 'express'; import { mock } from 'jest-mock-extended'; import type { AuthUser } from '@/databases/entities/auth-user'; -import type { CredentialsRepository } from '@db/repositories/credentials.repository'; -import type { SettingsRepository } from '@db/repositories/settings.repository'; -import type { UserRepository } from '@db/repositories/user.repository'; -import type { WorkflowRepository } from '@db/repositories/workflow.repository'; +import type { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import type { SettingsRepository } from '@/databases/repositories/settings.repository'; +import type { UserRepository } from '@/databases/repositories/user.repository'; +import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { AuthService } from '@/auth/auth.service'; import type { UserService } from '@/services/user.service'; import { HooksService } from '@/services/hooks.service'; diff --git a/packages/cli/src/services/activeWorkflows.service.ts b/packages/cli/src/services/activeWorkflows.service.ts index 4b1652910b135..b4312c16b3128 100644 --- a/packages/cli/src/services/activeWorkflows.service.ts +++ b/packages/cli/src/services/activeWorkflows.service.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; import type { User } from '@/databases/entities/User'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ActivationErrorsService } from '@/activation-errors.service'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/services/hooks.service.ts b/packages/cli/src/services/hooks.service.ts index fcef1536326f3..0cefeb9b57c0e 100644 --- a/packages/cli/src/services/hooks.service.ts +++ b/packages/cli/src/services/hooks.service.ts @@ -7,11 +7,11 @@ import type { FindManyOptions, FindOneOptions, FindOptionsWhere } from '@n8n/typ import { AuthService } from '@/auth/auth.service'; import type { AuthUser } from '@/databases/entities/auth-user'; import type { User } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; -import { SettingsRepository } from '@db/repositories/settings.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import { UserRepository } from '@/databases/repositories/user.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { AuthUserRepository } from '@/databases/repositories/auth-user.repository'; import type { Settings } from '@/databases/entities/settings'; diff --git a/packages/cli/src/services/import.service.ts b/packages/cli/src/services/import.service.ts index 5ca2bf63f28cd..992db5b75ee7c 100644 --- a/packages/cli/src/services/import.service.ts +++ b/packages/cli/src/services/import.service.ts @@ -4,12 +4,12 @@ import { type INode, type INodeCredentialsDetails } from 'n8n-workflow'; import { Logger } from '@/logger'; import * as Db from '@/Db'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; -import { TagRepository } from '@db/repositories/tag.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import { SharedWorkflow } from '@/databases/entities/shared-workflow'; import { replaceInvalidCredentials } from '@/workflow-helpers'; import { Project } from '@/databases/entities/project'; -import { WorkflowEntity } from '@db/entities/workflow-entity'; +import { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping'; import type { TagEntity } from '@/databases/entities/tag-entity'; import type { ICredentialsDb } from '@/Interfaces'; diff --git a/packages/cli/src/services/ownership.service.ts b/packages/cli/src/services/ownership.service.ts index 00fbf32e29360..5ae757f78466e 100644 --- a/packages/cli/src/services/ownership.service.ts +++ b/packages/cli/src/services/ownership.service.ts @@ -1,7 +1,7 @@ import { Service } from 'typedi'; import { CacheService } from '@/services/cache/cache.service'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import type { ListQuery } from '@/requests'; import type { Project } from '@/databases/entities/project'; import { ProjectRepository } from '@/databases/repositories/project.repository'; diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts index dab4bbf8e8762..f3977478b9c65 100644 --- a/packages/cli/src/services/pruning.service.ts +++ b/packages/cli/src/services/pruning.service.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; import { BinaryDataService, InstanceSettings } from 'n8n-core'; import { inTest, TIME } from '@/constants'; import config from '@/config'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { Logger } from '@/logger'; import { jsonStringify } from 'n8n-workflow'; import { OnShutdown } from '@/decorators/on-shutdown'; diff --git a/packages/cli/src/services/tag.service.ts b/packages/cli/src/services/tag.service.ts index 2866b953abc4e..683b7e56ae547 100644 --- a/packages/cli/src/services/tag.service.ts +++ b/packages/cli/src/services/tag.service.ts @@ -1,4 +1,4 @@ -import { TagRepository } from '@db/repositories/tag.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import { Service } from 'typedi'; import { validateEntity } from '@/generic-helpers'; import type { ITagWithCountDb } from '@/Interfaces'; diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts index fff454197945d..867cf7f603b34 100644 --- a/packages/cli/src/services/user.service.ts +++ b/packages/cli/src/services/user.service.ts @@ -3,7 +3,7 @@ import type { IUserSettings } from 'n8n-workflow'; import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; import type { User, AssignableRole } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import type { Invitation, PublicUser } from '@/Interfaces'; import type { PostHogClient } from '@/posthog'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/services/userOnboarding.service.ts b/packages/cli/src/services/userOnboarding.service.ts index 2ab1de1672061..91b37f9304d9a 100644 --- a/packages/cli/src/services/userOnboarding.service.ts +++ b/packages/cli/src/services/userOnboarding.service.ts @@ -4,7 +4,7 @@ import { In } from '@n8n/typeorm'; import type { User } from '@/databases/entities/User'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { UserService } from '@/services/user.service'; @Service() diff --git a/packages/cli/src/sso/saml/saml-helpers.ts b/packages/cli/src/sso/saml/saml-helpers.ts index 1a1be673208ca..ecd8104c54cce 100644 --- a/packages/cli/src/sso/saml/saml-helpers.ts +++ b/packages/cli/src/sso/saml/saml-helpers.ts @@ -5,8 +5,8 @@ import { randomString } from 'n8n-workflow'; import config from '@/config'; import { AuthIdentity } from '@/databases/entities/auth-identity'; import type { User } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; -import { AuthIdentityRepository } from '@db/repositories/auth-identity.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; +import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; import { AuthError } from '@/errors/response-errors/auth.error'; import { License } from '@/license'; diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts index e4b44b154b6c4..23045ad66f269 100644 --- a/packages/cli/src/sso/saml/saml.service.ee.ts +++ b/packages/cli/src/sso/saml/saml.service.ee.ts @@ -25,8 +25,8 @@ import https from 'https'; import type { SamlLoginBinding } from './types'; import { validateMetadata, validateResponse } from './saml-validator'; import { Logger } from '@/logger'; -import { UserRepository } from '@db/repositories/user.repository'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { AuthError } from '@/errors/response-errors/auth.error'; import { UrlService } from '@/services/url.service'; diff --git a/packages/cli/src/sso/sso-helpers.ts b/packages/cli/src/sso/sso-helpers.ts index e37ac32ca1066..b736785aa91a5 100644 --- a/packages/cli/src/sso/sso-helpers.ts +++ b/packages/cli/src/sso/sso-helpers.ts @@ -1,5 +1,5 @@ import config from '@/config'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { AuthProviderType } from '@/databases/entities/auth-identity'; import Container from 'typedi'; diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index 8ea072f7e20c7..3e89c529e85d5 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -10,9 +10,9 @@ import type { IExecutionTrackProperties } from '@/Interfaces'; import { Logger } from '@/logger'; import { License } from '@/license'; import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { SourceControlPreferencesService } from '../environments/source-control/source-control-preferences.service.ee'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; import { OnShutdown } from '@/decorators/on-shutdown'; diff --git a/packages/cli/src/user-management/email/user-management-mailer.ts b/packages/cli/src/user-management/email/user-management-mailer.ts index e73d22a2031c2..c91369df7b7bc 100644 --- a/packages/cli/src/user-management/email/user-management-mailer.ts +++ b/packages/cli/src/user-management/email/user-management-mailer.ts @@ -6,8 +6,8 @@ import { join as pathJoin } from 'path'; import { GlobalConfig } from '@n8n/config'; import type { User } from '@/databases/entities/User'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { UserRepository } from '@db/repositories/user.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { Logger } from '@/logger'; import { UrlService } from '@/services/url.service'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts index eec9cb64b1512..17a1bb9c0e764 100644 --- a/packages/cli/src/wait-tracker.ts +++ b/packages/cli/src/wait-tracker.ts @@ -2,7 +2,7 @@ import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workf import { Service } from 'typedi'; import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; import { WorkflowRunner } from '@/workflow-runner'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { OwnershipService } from '@/services/ownership.service'; import { Logger } from '@/logger'; import { OrchestrationService } from '@/services/orchestration.service'; diff --git a/packages/cli/src/webhooks/__tests__/webhook.service.test.ts b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts index 878c7bdaf1f91..13c921c65d286 100644 --- a/packages/cli/src/webhooks/__tests__/webhook.service.test.ts +++ b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts @@ -1,6 +1,6 @@ import { v4 as uuid } from 'uuid'; import config from '@/config'; -import { WebhookRepository } from '@db/repositories/webhook.repository'; +import { WebhookRepository } from '@/databases/repositories/webhook.repository'; import { CacheService } from '@/services/cache/cache.service'; import { WebhookService } from '@/webhooks/webhook.service'; import { WebhookEntity } from '@/databases/entities/webhook-entity'; diff --git a/packages/cli/src/webhooks/live-webhooks.ts b/packages/cli/src/webhooks/live-webhooks.ts index 1db85e231530d..f0736a221ebeb 100644 --- a/packages/cli/src/webhooks/live-webhooks.ts +++ b/packages/cli/src/webhooks/live-webhooks.ts @@ -3,7 +3,7 @@ import type { Response } from 'express'; import { Workflow, NodeHelpers } from 'n8n-workflow'; import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { IWebhookResponseCallbackData, IWebhookManager, diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts index f2c5706817a45..8fa0896a17308 100644 --- a/packages/cli/src/webhooks/waiting-webhooks.ts +++ b/packages/cli/src/webhooks/waiting-webhooks.ts @@ -10,7 +10,7 @@ import type { WaitingWebhookRequest, } from './webhook.types'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { Logger } from '@/logger'; import { ConflictError } from '@/errors/response-errors/conflict.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; diff --git a/packages/cli/src/webhooks/webhook.service.ts b/packages/cli/src/webhooks/webhook.service.ts index 67a9ce4f36b3b..c72edc18d1351 100644 --- a/packages/cli/src/webhooks/webhook.service.ts +++ b/packages/cli/src/webhooks/webhook.service.ts @@ -1,4 +1,4 @@ -import { WebhookRepository } from '@db/repositories/webhook.repository'; +import { WebhookRepository } from '@/databases/repositories/webhook.repository'; import { Service } from 'typedi'; import { CacheService } from '@/services/cache/cache.service'; import type { WebhookEntity } from '@/databases/entities/webhook-entity'; diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts index 2e0bda061eda9..1b4dae35b963d 100644 --- a/packages/cli/src/workflow-execute-additional-data.ts +++ b/packages/cli/src/workflow-execute-additional-data.ts @@ -52,7 +52,7 @@ import { Push } from '@/push'; import * as WorkflowHelpers from '@/workflow-helpers'; import { findSubworkflowStart, isWorkflowIdValid } from '@/utils'; import { PermissionChecker } from './user-management/permission-checker'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { WorkflowStatisticsService } from '@/services/workflow-statistics.service'; import { SecretsHelper } from './secrets-helpers'; import { OwnershipService } from './services/ownership.service'; diff --git a/packages/cli/src/workflow-helpers.ts b/packages/cli/src/workflow-helpers.ts index b8d9ee0a07d12..3619f7ace1ad4 100644 --- a/packages/cli/src/workflow-helpers.ts +++ b/packages/cli/src/workflow-helpers.ts @@ -14,8 +14,8 @@ import type { } from 'n8n-workflow'; import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { VariablesService } from '@/environments/variables/variables.service.ee'; export function generateFailedExecutionFromError( diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts index acfbdafd0135e..4590bb5c3b20c 100644 --- a/packages/cli/src/workflow-runner.ts +++ b/packages/cli/src/workflow-runner.ts @@ -24,7 +24,7 @@ import PCancelable from 'p-cancelable'; import { ActiveExecutions } from '@/active-executions'; import config from '@/config'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExternalHooks } from '@/external-hooks'; import type { IExecutionResponse, IWorkflowExecutionDataProcess } from '@/Interfaces'; import { NodeTypes } from '@/node-types'; diff --git a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts index 58d5fa5908034..0792e528d493f 100644 --- a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts +++ b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts @@ -1,7 +1,7 @@ import type { INode } from 'n8n-workflow'; import { mock } from 'jest-mock-extended'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { IWorkflowDb } from '@/Interfaces'; import { WorkflowExecutionService } from '@/workflows/workflow-execution.service'; import type { WorkflowRunner } from '@/workflow-runner'; diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts index 11c4ecea03442..1fe7c46818129 100644 --- a/packages/cli/src/workflows/workflow-execution.service.ts +++ b/packages/cli/src/workflows/workflow-execution.service.ts @@ -17,8 +17,8 @@ import { } from 'n8n-workflow'; import type { User } from '@/databases/entities/User'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import * as WorkflowHelpers from '@/workflow-helpers'; import type { WorkflowRequest } from '@/workflows/workflow.request'; import type { diff --git a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts b/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts index a18291c778efb..21b2c303ee3c0 100644 --- a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts +++ b/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts @@ -1,6 +1,6 @@ import { mockClear } from 'jest-mock-extended'; import { User } from '@/databases/entities/User'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts b/packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts index d692b08684a3e..56aec86777e10 100644 --- a/packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts +++ b/packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; import { DateTime } from 'luxon'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { WORKFLOW_HISTORY_PRUNE_INTERVAL } from './constants'; import { getWorkflowHistoryPruneTime, diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts b/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts index 644763ddc2574..4cd9d3a7028a4 100644 --- a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts +++ b/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts @@ -1,8 +1,8 @@ import type { User } from '@/databases/entities/User'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { WorkflowHistory } from '@/databases/entities/workflow-history'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { Service } from 'typedi'; import { isWorkflowHistoryEnabled } from './workflow-history-helper.ee'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/workflows/workflow-static-data.service.ts b/packages/cli/src/workflows/workflow-static-data.service.ts index d9c3564b26ea8..d7e2cf423a625 100644 --- a/packages/cli/src/workflows/workflow-static-data.service.ts +++ b/packages/cli/src/workflows/workflow-static-data.service.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; import { GlobalConfig } from '@n8n/config'; import { type IDataObject, type Workflow, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; import { Logger } from '@/logger'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { isWorkflowIdValid } from '@/utils'; @Service() diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts index 6f16753093efc..be3ba3bca6f10 100644 --- a/packages/cli/src/workflows/workflow.service.ee.ts +++ b/packages/cli/src/workflows/workflow.service.ee.ts @@ -4,9 +4,9 @@ import { ApplicationError, NodeOperationError, WorkflowActivationError } from 'n import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { User } from '@/databases/entities/User'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { CredentialsService } from '@/credentials/credentials.service'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts index ffc62c82ffb3a..46f6438f9b3b0 100644 --- a/packages/cli/src/workflows/workflow.service.ts +++ b/packages/cli/src/workflows/workflow.service.ts @@ -7,10 +7,10 @@ import { BinaryDataService } from 'n8n-core'; import config from '@/config'; import type { User } from '@/databases/entities/User'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import * as WorkflowHelpers from '@/workflow-helpers'; import { validateEntity } from '@/generic-helpers'; diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts index a9265ba4dcc4c..b3917e963378a 100644 --- a/packages/cli/src/workflows/workflows.controller.ts +++ b/packages/cli/src/workflows/workflows.controller.ts @@ -9,10 +9,10 @@ import type { IWorkflowResponse } from '@/Interfaces'; import config from '@/config'; import { Delete, Get, Patch, Post, ProjectScope, Put, RestController } from '@/decorators'; import { SharedWorkflow } from '@/databases/entities/shared-workflow'; -import { WorkflowEntity } from '@db/entities/workflow-entity'; +import { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { TagRepository } from '@db/repositories/tag.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { validateEntity } from '@/generic-helpers'; import { ExternalHooks } from '@/external-hooks'; import { WorkflowService } from './workflow.service'; diff --git a/packages/cli/src/workflows/workflows.types.ts b/packages/cli/src/workflows/workflows.types.ts index 9ab870e90b511..3f0df88a69c8e 100644 --- a/packages/cli/src/workflows/workflows.types.ts +++ b/packages/cli/src/workflows/workflows.types.ts @@ -1,5 +1,5 @@ import type { SharedWorkflow } from '@/databases/entities/shared-workflow'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { SlimProject } from '@/requests'; export interface WorkflowWithSharingsAndCredentials extends Omit { diff --git a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts index f6f448bf16692..e3d3a307a694a 100644 --- a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts +++ b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts @@ -5,7 +5,7 @@ import { mock } from 'jest-mock-extended'; import { License } from '@/license'; import type { ExternalSecretsSettings, SecretsProviderState } from '@/Interfaces'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { ExternalSecretsProviders } from '@/external-secrets/external-secrets-providers.ee'; import config from '@/config'; import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts index 3624355d70d24..6f6acecbeedf8 100644 --- a/packages/cli/test/integration/auth.api.test.ts +++ b/packages/cli/test/integration/auth.api.test.ts @@ -4,7 +4,7 @@ import validator from 'validator'; import config from '@/config'; import { AUTH_COOKIE_NAME } from '@/constants'; import type { User } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { MfaService } from '@/mfa/mfa.service'; import { LOGGED_OUT_RESPONSE_BODY } from './shared/constants'; diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts index e1f73831aa1c0..2af2878c30885 100644 --- a/packages/cli/test/integration/commands/ldap/reset.test.ts +++ b/packages/cli/test/integration/commands/ldap/reset.test.ts @@ -4,8 +4,8 @@ import { EntityNotFoundError } from '@n8n/typeorm'; import { Reset } from '@/commands/ldap/reset'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { getLdapSynchronizations, saveLdapSynchronization } from '@/ldap/helpers.ee'; diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts index dd5d0c216ce35..6ff2d952a9d3a 100644 --- a/packages/cli/test/integration/commands/reset.cmd.test.ts +++ b/packages/cli/test/integration/commands/reset.cmd.test.ts @@ -5,10 +5,10 @@ import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import { SettingsRepository } from '@db/repositories/settings.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { setupTestCommand } from '@test-integration/utils/testCommand'; import { mockInstance } from '../../shared/mocking'; diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts index 3207ba42868fd..9745fffd673a7 100644 --- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts @@ -5,7 +5,7 @@ import config from '@/config'; import type { ListQuery } from '@/requests'; import type { User } from '@/databases/entities/User'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { Project } from '@/databases/entities/project'; import { ProjectService } from '@/services/project.service'; import { UserManagementMailer } from '@/user-management/email'; diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts index 5eab07208bd50..cff168062808c 100644 --- a/packages/cli/test/integration/credentials/credentials.api.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.test.ts @@ -6,9 +6,9 @@ import { randomString } from 'n8n-workflow'; import type { ListQuery } from '@/requests'; import type { User } from '@/databases/entities/User'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { Project } from '@/databases/entities/project'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import * as testDb from '../shared/testDb'; diff --git a/packages/cli/test/integration/database/repositories/execution.repository.test.ts b/packages/cli/test/integration/database/repositories/execution.repository.test.ts index 3c34ae1027ae1..14f7bf7bfa9ed 100644 --- a/packages/cli/test/integration/database/repositories/execution.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/execution.repository.test.ts @@ -1,5 +1,5 @@ import Container from 'typedi'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository'; import * as testDb from '../../shared/testDb'; import { createWorkflow } from '../../shared/db/workflows'; diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index 757e1942f872e..4cd73e1303864 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -5,7 +5,7 @@ import { Cipher } from 'n8n-core'; import config from '@/config'; import type { User } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository'; import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap/constants'; import { LdapService } from '@/ldap/ldap.service.ee'; diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts index 092c618620101..6534b2f0a656f 100644 --- a/packages/cli/test/integration/me.api.test.ts +++ b/packages/cli/test/integration/me.api.test.ts @@ -3,8 +3,8 @@ import { IsNull } from '@n8n/typeorm'; import validator from 'validator'; import type { User } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import { SUCCESS_RESPONSE_BODY } from './shared/constants'; import { randomApiKey, randomEmail, randomName, randomValidPassword } from './shared/random'; diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts index 181e8d7fa71f3..9997659a51b10 100644 --- a/packages/cli/test/integration/owner.api.test.ts +++ b/packages/cli/test/integration/owner.api.test.ts @@ -3,7 +3,7 @@ import validator from 'validator'; import config from '@/config'; import type { User } from '@/databases/entities/User'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { randomEmail, diff --git a/packages/cli/test/integration/passwordReset.api.test.ts b/packages/cli/test/integration/passwordReset.api.test.ts index 5005f5543cd65..fb0105181fbf1 100644 --- a/packages/cli/test/integration/passwordReset.api.test.ts +++ b/packages/cli/test/integration/passwordReset.api.test.ts @@ -12,7 +12,7 @@ import { setCurrentAuthenticationMethod } from '@/sso/sso-helpers'; import { ExternalHooks } from '@/external-hooks'; import { JwtService } from '@/services/jwt.service'; import { UserManagementMailer } from '@/user-management/email'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { PasswordUtility } from '@/services/password.utility'; import { mockInstance } from '../shared/mocking'; diff --git a/packages/cli/test/integration/permission-checker.test.ts b/packages/cli/test/integration/permission-checker.test.ts index 171a779c73b4b..498755f8c2d5c 100644 --- a/packages/cli/test/integration/permission-checker.test.ts +++ b/packages/cli/test/integration/permission-checker.test.ts @@ -3,7 +3,7 @@ import { Container } from 'typedi'; import type { INode, INodeTypeData } from 'n8n-workflow'; import { randomInt } from 'n8n-workflow'; import type { User } from '@/databases/entities/User'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; diff --git a/packages/cli/test/integration/pruning.service.test.ts b/packages/cli/test/integration/pruning.service.test.ts index 9875217701ec4..abec1d033a85f 100644 --- a/packages/cli/test/integration/pruning.service.test.ts +++ b/packages/cli/test/integration/pruning.service.test.ts @@ -4,9 +4,9 @@ import type { ExecutionStatus } from 'n8n-workflow'; import Container from 'typedi'; import * as testDb from './shared/testDb'; -import type { ExecutionEntity } from '@db/entities/execution-entity'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import type { ExecutionEntity } from '@/databases/entities/execution-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { TIME } from '@/constants'; import { PruningService } from '@/services/pruning.service'; import { Logger } from '@/logger'; diff --git a/packages/cli/test/integration/publicApi/credentials.test.ts b/packages/cli/test/integration/publicApi/credentials.test.ts index c24042f3a7ebc..dfbb8d5fa0ed2 100644 --- a/packages/cli/test/integration/publicApi/credentials.test.ts +++ b/packages/cli/test/integration/publicApi/credentials.test.ts @@ -2,7 +2,7 @@ import { Container } from 'typedi'; import { randomString } from 'n8n-workflow'; import type { User } from '@/databases/entities/User'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { randomApiKey, randomName } from '../shared/random'; diff --git a/packages/cli/test/integration/publicApi/tags.test.ts b/packages/cli/test/integration/publicApi/tags.test.ts index eb9bc816e65fc..f38ea1c19dce7 100644 --- a/packages/cli/test/integration/publicApi/tags.test.ts +++ b/packages/cli/test/integration/publicApi/tags.test.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import type { User } from '@/databases/entities/User'; -import { TagRepository } from '@db/repositories/tag.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import { randomApiKey } from '../shared/random'; import * as utils from '../shared/utils/'; diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts index 5dcf684e78501..cf83033e83325 100644 --- a/packages/cli/test/integration/publicApi/workflows.test.ts +++ b/packages/cli/test/integration/publicApi/workflows.test.ts @@ -6,9 +6,9 @@ import { STARTING_NODES } from '@/constants'; import type { TagEntity } from '@/databases/entities/tag-entity'; import type { User } from '@/databases/entities/User'; import type { Project } from '@/databases/entities/project'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { ExecutionService } from '@/executions/execution.service'; diff --git a/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts b/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts index 7108606aef465..218839acd2f41 100644 --- a/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts @@ -4,11 +4,11 @@ import { SecurityAuditService } from '@/security-audit/security-audit.service'; import { CREDENTIALS_REPORT } from '@/security-audit/constants'; import { getRiskSection } from './utils'; import * as testDb from '../shared/testDb'; -import { generateNanoId } from '@db/utils/generators'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { generateNanoId } from '@/databases/utils/generators'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository'; let securityAuditService: SecurityAuditService; diff --git a/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts b/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts index bfa8ff0aafce1..e9a6dcb6f1c89 100644 --- a/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts @@ -7,8 +7,8 @@ import { } from '@/security-audit/constants'; import { getRiskSection, saveManualTriggerWorkflow } from './utils'; import * as testDb from '../shared/testDb'; -import { generateNanoId } from '@db/utils/generators'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { generateNanoId } from '@/databases/utils/generators'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; let securityAuditService: SecurityAuditService; diff --git a/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts b/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts index 5ec1f0c4d46e7..04b786f839469 100644 --- a/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts @@ -3,7 +3,7 @@ import { SecurityAuditService } from '@/security-audit/security-audit.service'; import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/security-audit/constants'; import { getRiskSection, saveManualTriggerWorkflow } from './utils'; import * as testDb from '../shared/testDb'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; let securityAuditService: SecurityAuditService; diff --git a/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts index d6dc020d4f5b6..59479cfdb7b14 100644 --- a/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts @@ -11,8 +11,8 @@ import { import * as testDb from '../shared/testDb'; import { toReportTitle } from '@/security-audit/utils'; import config from '@/config'; -import { generateNanoId } from '@db/utils/generators'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { generateNanoId } from '@/databases/utils/generators'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; import { NodeConnectionType } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts b/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts index e61027b356178..6556f1d3a6f1e 100644 --- a/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts @@ -6,7 +6,7 @@ import { toReportTitle } from '@/security-audit/utils'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; import { CommunityPackagesService } from '@/services/communityPackages.service'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { mockInstance } from '../../shared/mocking'; import { getRiskSection, MOCK_PACKAGE, saveManualTriggerWorkflow } from './utils'; diff --git a/packages/cli/test/integration/security-audit/utils.ts b/packages/cli/test/integration/security-audit/utils.ts index 42f358dd7dfd9..d87bb42b0abb7 100644 --- a/packages/cli/test/integration/security-audit/utils.ts +++ b/packages/cli/test/integration/security-audit/utils.ts @@ -5,7 +5,7 @@ import * as constants from '@/constants'; import type { Risk } from '@/security-audit/types'; import type { InstalledNodes } from '@/databases/entities/installed-nodes'; import type { InstalledPackages } from '@/databases/entities/installed-packages'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; import { GlobalConfig } from '@n8n/config'; diff --git a/packages/cli/test/integration/shared/db/credentials.ts b/packages/cli/test/integration/shared/db/credentials.ts index 9257180e8126b..03493ab116378 100644 --- a/packages/cli/test/integration/shared/db/credentials.ts +++ b/packages/cli/test/integration/shared/db/credentials.ts @@ -1,7 +1,7 @@ import { Container } from 'typedi'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { User } from '@/databases/entities/User'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import type { CredentialSharingRole } from '@/databases/entities/shared-credentials'; import type { ICredentialsDb } from '@/Interfaces'; diff --git a/packages/cli/test/integration/shared/db/executions.ts b/packages/cli/test/integration/shared/db/executions.ts index 12747e0365971..0409f68703b77 100644 --- a/packages/cli/test/integration/shared/db/executions.ts +++ b/packages/cli/test/integration/shared/db/executions.ts @@ -1,8 +1,8 @@ import Container from 'typedi'; import type { ExecutionData } from '@/databases/entities/execution-data'; -import type { ExecutionEntity } from '@db/entities/execution-entity'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { ExecutionRepository } from '@db/repositories/execution.repository'; +import type { ExecutionEntity } from '@/databases/entities/execution-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository'; import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository'; diff --git a/packages/cli/test/integration/shared/db/tags.ts b/packages/cli/test/integration/shared/db/tags.ts index 5bed30a097472..e3a61855e506c 100644 --- a/packages/cli/test/integration/shared/db/tags.ts +++ b/packages/cli/test/integration/shared/db/tags.ts @@ -1,9 +1,9 @@ import Container from 'typedi'; import type { TagEntity } from '@/databases/entities/tag-entity'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; -import { TagRepository } from '@db/repositories/tag.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository'; -import { generateNanoId } from '@db/utils/generators'; +import { generateNanoId } from '@/databases/utils/generators'; import { randomName } from '../random'; diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts index b95c3024e74f6..035a4425ea4c2 100644 --- a/packages/cli/test/integration/shared/db/users.ts +++ b/packages/cli/test/integration/shared/db/users.ts @@ -2,8 +2,8 @@ import Container from 'typedi'; import { hash } from 'bcryptjs'; import { AuthIdentity } from '@/databases/entities/auth-identity'; import { type GlobalRole, type User } from '@/databases/entities/User'; -import { AuthIdentityRepository } from '@db/repositories/auth-identity.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { TOTPService } from '@/mfa/totp.service'; import { MfaService } from '@/mfa/mfa.service'; diff --git a/packages/cli/test/integration/shared/db/workflowHistory.ts b/packages/cli/test/integration/shared/db/workflowHistory.ts index 75e579b787b50..09d2738c7100d 100644 --- a/packages/cli/test/integration/shared/db/workflowHistory.ts +++ b/packages/cli/test/integration/shared/db/workflowHistory.ts @@ -1,7 +1,7 @@ import Container from 'typedi'; import { v4 as uuid } from 'uuid'; import type { WorkflowHistory } from '@/databases/entities/workflow-history'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; export async function createWorkflowHistoryItem( workflowId: string, diff --git a/packages/cli/test/integration/shared/db/workflows.ts b/packages/cli/test/integration/shared/db/workflows.ts index 25858dc2c83ed..aa22575ebf19a 100644 --- a/packages/cli/test/integration/shared/db/workflows.ts +++ b/packages/cli/test/integration/shared/db/workflows.ts @@ -3,9 +3,9 @@ import type { DeepPartial } from '@n8n/typeorm'; import { v4 as uuid } from 'uuid'; import { User } from '@/databases/entities/User'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { SharedWorkflow, WorkflowSharingRole } from '@/databases/entities/shared-workflow'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { Project } from '@/databases/entities/project'; diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts index 5dae224161e26..639b726223bc8 100644 --- a/packages/cli/test/integration/shared/testDb.ts +++ b/packages/cli/test/integration/shared/testDb.ts @@ -6,7 +6,7 @@ import type { Class } from 'n8n-core'; import { randomString } from 'n8n-workflow'; import * as Db from '@/Db'; -import { getOptionOverrides } from '@db/config'; +import { getOptionOverrides } from '@/databases/config'; import { kebabCase } from 'lodash'; export const testDbPrefix = 'n8n_test_'; @@ -80,9 +80,9 @@ const repositories = [ */ export async function truncate(names: Array<(typeof repositories)[number]>) { for (const name of names) { - const RepositoryClass: Class> = ( - await import(`@db/repositories/${kebabCase(name)}.repository`) - )[`${name}Repository`]; + const RepositoryClass: Class> = + // eslint-disable-next-line n8n-local-rules/no-dynamic-import-template + (await import(`@/databases/repositories/${kebabCase(name)}.repository`))[`${name}Repository`]; await Container.get(RepositoryClass).delete({}); } } diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts index 0fb4df23120e7..849af9a9c3e26 100644 --- a/packages/cli/test/integration/shared/utils/index.ts +++ b/packages/cli/test/integration/shared/utils/index.ts @@ -10,8 +10,8 @@ import type request from 'supertest'; import { v4 as uuid } from 'uuid'; import config from '@/config'; -import { WorkflowEntity } from '@db/entities/workflow-entity'; -import { SettingsRepository } from '@db/repositories/settings.repository'; +import { WorkflowEntity } from '@/databases/entities/workflow-entity'; +import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { AUTH_COOKIE_NAME } from '@/constants'; import { ExecutionService } from '@/executions/execution.service'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; diff --git a/packages/cli/test/integration/shared/workflow.ts b/packages/cli/test/integration/shared/workflow.ts index 26e2dede8e302..bf5ab0423e76e 100644 --- a/packages/cli/test/integration/shared/workflow.ts +++ b/packages/cli/test/integration/shared/workflow.ts @@ -1,5 +1,5 @@ import type { INode } from 'n8n-workflow'; -import { WorkflowEntity } from '@db/entities/workflow-entity'; +import { WorkflowEntity } from '@/databases/entities/workflow-entity'; export const FIRST_CREDENTIAL_ID = '1'; export const SECOND_CREDENTIAL_ID = '2'; diff --git a/packages/cli/test/integration/tags.api.test.ts b/packages/cli/test/integration/tags.api.test.ts index a452d68da825e..abc9dc6c927bc 100644 --- a/packages/cli/test/integration/tags.api.test.ts +++ b/packages/cli/test/integration/tags.api.test.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; -import { TagRepository } from '@db/repositories/tag.repository'; +import { TagRepository } from '@/databases/repositories/tag.repository'; import * as utils from './shared/utils/'; import * as testDb from './shared/testDb'; diff --git a/packages/cli/test/integration/user.repository.test.ts b/packages/cli/test/integration/user.repository.test.ts index 2aa5c230a1e5c..6b35dde37be0f 100644 --- a/packages/cli/test/integration/user.repository.test.ts +++ b/packages/cli/test/integration/user.repository.test.ts @@ -1,5 +1,5 @@ import Container from 'typedi'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { createAdmin, createMember, createOwner } from './shared/db/users'; import * as testDb from './shared/testDb'; import { randomEmail } from './shared/random'; diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts index 333eefa84e3fa..b76c8ad295c53 100644 --- a/packages/cli/test/integration/users.api.test.ts +++ b/packages/cli/test/integration/users.api.test.ts @@ -4,9 +4,9 @@ import { v4 as uuid } from 'uuid'; import { RESPONSE_ERROR_MESSAGES } from '@/constants'; import { UsersController } from '@/controllers/users.controller'; import type { User } from '@/databases/entities/User'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; -import { UserRepository } from '@db/repositories/user.repository'; +import { UserRepository } from '@/databases/repositories/user.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { CacheService } from '@/services/cache/cache.service'; diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts index bf60263cfe585..9917d7dc2b9fc 100644 --- a/packages/cli/test/integration/variables.test.ts +++ b/packages/cli/test/integration/variables.test.ts @@ -1,8 +1,8 @@ import { Container } from 'typedi'; import type { Variables } from '@/databases/entities/Variables'; -import { VariablesRepository } from '@db/repositories/variables.repository'; -import { generateNanoId } from '@db/utils/generators'; +import { VariablesRepository } from '@/databases/repositories/variables.repository'; +import { generateNanoId } from '@/databases/utils/generators'; import { VariablesService } from '@/environments/variables/variables.service.ee'; import * as testDb from './shared/testDb'; diff --git a/packages/cli/test/integration/webhooks.api.test.ts b/packages/cli/test/integration/webhooks.api.test.ts index 15b262c465aa9..78b78299811a7 100644 --- a/packages/cli/test/integration/webhooks.api.test.ts +++ b/packages/cli/test/integration/webhooks.api.test.ts @@ -6,7 +6,7 @@ import { AbstractServer } from '@/abstract-server'; import { ExternalHooks } from '@/external-hooks'; import { NodeTypes } from '@/node-types'; import { Push } from '@/push'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { mockInstance } from '../shared/mocking'; import { initActiveWorkflowManager } from './shared/utils'; diff --git a/packages/cli/test/integration/workflowHistoryManager.test.ts b/packages/cli/test/integration/workflowHistoryManager.test.ts index 69d793964d1ab..49e60ee1bed28 100644 --- a/packages/cli/test/integration/workflowHistoryManager.test.ts +++ b/packages/cli/test/integration/workflowHistoryManager.test.ts @@ -3,7 +3,7 @@ import { In } from '@n8n/typeorm'; import { DateTime } from 'luxon'; import config from '@/config'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { License } from '@/license'; import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee'; diff --git a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts index 5675878252522..29efa61fcfcae 100644 --- a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts @@ -1,9 +1,9 @@ import Container from 'typedi'; import { mock } from 'jest-mock-extended'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import { CredentialsRepository } from '@db/repositories/credentials.repository'; +import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { Telemetry } from '@/telemetry'; import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee'; diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts index b6fe3576db14b..157b937c79884 100644 --- a/packages/cli/test/integration/workflows/workflow.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.test.ts @@ -2,7 +2,7 @@ import Container from 'typedi'; import { mock } from 'jest-mock-extended'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { Telemetry } from '@/telemetry'; import { OrchestrationService } from '@/services/orchestration.service'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts index 8884ef9835468..3cbec2e646044 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts @@ -4,9 +4,9 @@ import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workf import config from '@/config'; import type { Project } from '@/databases/entities/project'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { User } from '@/databases/entities/User'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { License } from '@/license'; import { UserManagementMailer } from '@/user-management/email'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts index 4d6e42ec8b468..cb702858b2bc4 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts @@ -4,12 +4,12 @@ import type { INode, IPinData } from 'n8n-workflow'; import type { Scope } from '@n8n/permissions'; import type { User } from '@/databases/entities/User'; -import { WorkflowRepository } from '@db/repositories/workflow.repository'; -import type { WorkflowEntity } from '@db/entities/workflow-entity'; +import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; +import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { ListQuery } from '@/requests'; -import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository'; +import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { ProjectRepository } from '@db/repositories/project.repository'; +import { ProjectRepository } from '@/databases/repositories/project.repository'; import { ProjectService } from '@/services/project.service'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee'; diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 0efc9328610d8..14e93de1b8f42 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -7,7 +7,6 @@ "baseUrl": "src", "paths": { "@/*": ["./*"], - "@db/*": ["./databases/*"], "@test/*": ["../test/shared/*"], "@test-integration/*": ["../test/integration/shared/*"] },