admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 02:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): Migrate to n8n's typeorm fork (#8590)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2024-02-08 15:13:29 +01:00
committed by GitHub
parent a822588012
commit 8e392cfc1d
81 changed files with 273 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/package.json
View File

@@ -97,6 +97,7 @@
"@n8n/localtunnel": "2.1.0",
"@n8n/n8n-nodes-langchain": "workspace:*",
"@n8n/permissions": "workspace:*",
"@n8n/typeorm": "0.3.20",
"@n8n_io/license-sdk": "2.9.1",
"@oclif/core": "3.18.1",
"@rudderstack/rudder-sdk-node": "2.0.7",
@@ -176,7 +177,6 @@
"swagger-ui-express": "5.0.0",
"syslog-client": "1.1.1",
"typedi": "0.10.0",
"typeorm": "0.3.20",
"uuid": "8.3.2",
"validator": "13.7.0",
"winston": "3.8.2",

8
packages/cli/src/Db.ts
View File

@@ -1,7 +1,11 @@
/* eslint-disable @typescript-eslint/restrict-template-expressions */
import { Container } from 'typedi';
import type { DataSourceOptions as ConnectionOptions, EntityManager, LoggerOptions } from 'typeorm';
import { DataSource as Connection } from 'typeorm';
import type {
DataSourceOptions as ConnectionOptions,
EntityManager,
LoggerOptions,
} from '@n8n/typeorm';
import { DataSource as Connection } from '@n8n/typeorm';
import type { TlsOptions } from 'tls';
import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';

2
packages/cli/src/Ldap/ldap.service.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { QueryFailedError } from 'typeorm';
import { QueryFailedError } from '@n8n/typeorm';
import type { Entry as LdapUser, ClientOptions } from 'ldapts';
import { Client } from 'ldapts';
import type { ConnectionOptions } from 'tls';

4
packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
View File

@@ -1,7 +1,7 @@
import type express from 'express';
import { Container } from 'typedi';
import type { FindOptionsWhere } from 'typeorm';
import { In } from 'typeorm';
import type { FindOptionsWhere } from '@n8n/typeorm';
import { In } from '@n8n/typeorm';
import { v4 as uuid } from 'uuid';
import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';

4
packages/cli/src/commands/db/revert.ts
View File

@@ -1,6 +1,6 @@
import { Command, Flags } from '@oclif/core';
import type { DataSourceOptions as ConnectionOptions } from 'typeorm';
import { DataSource as Connection } from 'typeorm';
import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm';
import { DataSource as Connection } from '@n8n/typeorm';
import { Container } from 'typedi';
import { Logger } from '@/Logger';
import { getConnectionOptions, setSchema } from '@/Db';

2
packages/cli/src/commands/import/credentials.ts
View File

@@ -3,7 +3,7 @@ import { Flags } from '@oclif/core';
import { Cipher } from 'n8n-core';
import fs from 'fs';
import glob from 'fast-glob';
import type { EntityManager } from 'typeorm';
import type { EntityManager } from '@n8n/typeorm';
import * as Db from '@/Db';
import type { User } from '@db/entities/User';

2
packages/cli/src/credentials/credentials.service.ee.ts
View File

@@ -1,4 +1,4 @@
import type { EntityManager, FindOptionsWhere } from 'typeorm';
import type { EntityManager, FindOptionsWhere } from '@n8n/typeorm';
import type { SharedCredentials } from '@db/entities/SharedCredentials';
import type { User } from '@db/entities/User';
import { type CredentialsGetSharedOptions } from './credentials.service';

2
packages/cli/src/credentials/credentials.service.ts
View File

@@ -6,7 +6,7 @@ import type {
INodeProperties,
} from 'n8n-workflow';
import { CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers } from 'n8n-workflow';
import type { FindOptionsWhere } from 'typeorm';
import type { FindOptionsWhere } from '@n8n/typeorm';
import type { Scope } from '@n8n/permissions';
import * as Db from '@/Db';
import type { ICredentialsDb } from '@/Interfaces';

6
packages/cli/src/databases/config.ts
View File

@@ -1,8 +1,8 @@
import path from 'path';
import { Container } from 'typedi';
import type { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions';
import type { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
import type { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions';
import type { SqliteConnectionOptions } from '@n8n/typeorm/driver/sqlite/SqliteConnectionOptions';
import type { PostgresConnectionOptions } from '@n8n/typeorm/driver/postgres/PostgresConnectionOptions';
import type { MysqlConnectionOptions } from '@n8n/typeorm/driver/mysql/MysqlConnectionOptions';
import { InstanceSettings } from 'n8n-core';
import { entities } from './entities';

2
packages/cli/src/databases/dsl/Column.ts
View File

@@ -1,4 +1,4 @@
import type { Driver, TableColumnOptions } from 'typeorm';
import type { Driver, TableColumnOptions } from '@n8n/typeorm';
export class Column {
private type: 'int' | 'boolean' | 'varchar' | 'text' | 'json' | 'timestamp' | 'uuid';

4
packages/cli/src/databases/dsl/Indices.ts
View File

@@ -1,5 +1,5 @@
import type { QueryRunner } from 'typeorm';
import { TableIndex } from 'typeorm';
import type { QueryRunner } from '@n8n/typeorm';
import { TableIndex } from '@n8n/typeorm';
import LazyPromise from 'p-lazy';
abstract class IndexOperation extends LazyPromise<void> {

4
packages/cli/src/databases/dsl/Table.ts
View File

@@ -1,5 +1,5 @@
import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from 'typeorm';
import { Table, TableColumn, TableForeignKey } from 'typeorm';
import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from '@n8n/typeorm';
import { Table, TableColumn, TableForeignKey } from '@n8n/typeorm';
import LazyPromise from 'p-lazy';
import { Column } from './Column';
import { ApplicationError } from 'n8n-workflow';

2
packages/cli/src/databases/dsl/index.ts
View File

@@ -1,4 +1,4 @@
import type { QueryRunner } from 'typeorm';
import type { QueryRunner } from '@n8n/typeorm';
import { Column } from './Column';
import {
AddColumns,

4
packages/cli/src/databases/entities/AbstractEntity.ts
View File

@@ -1,11 +1,11 @@
import type { ColumnOptions } from 'typeorm';
import type { ColumnOptions } from '@n8n/typeorm';
import {
BeforeInsert,
BeforeUpdate,
CreateDateColumn,
PrimaryColumn,
UpdateDateColumn,
} from 'typeorm';
} from '@n8n/typeorm';
import config from '@/config';
import type { Class } from 'n8n-core';
import { generateNanoId } from '../utils/generators';

2
packages/cli/src/databases/entities/AuthIdentity.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from '@n8n/typeorm';
import { WithTimestamps } from './AbstractEntity';
import { User } from './User';

2
packages/cli/src/databases/entities/AuthProviderSyncHistory.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { Column, Entity, PrimaryGeneratedColumn } from '@n8n/typeorm';
import { datetimeColumnType } from './AbstractEntity';
import { AuthProviderType } from './AuthIdentity';

2
packages/cli/src/databases/entities/CredentialsEntity.ts
View File

@@ -1,5 +1,5 @@
import type { ICredentialNodeAccess } from 'n8n-workflow';
import { Column, Entity, Index, OneToMany } from 'typeorm';
import { Column, Entity, Index, OneToMany } from '@n8n/typeorm';
import { IsArray, IsObject, IsString, Length } from 'class-validator';
import type { SharedCredentials } from './SharedCredentials';
import { WithTimestampsAndStringId, jsonColumnType } from './AbstractEntity';

2
packages/cli/src/databases/entities/EventDestinations.ts
View File

@@ -1,5 +1,5 @@
import { MessageEventBusDestinationOptions } from 'n8n-workflow';
import { Column, Entity, PrimaryColumn } from 'typeorm';
import { Column, Entity, PrimaryColumn } from '@n8n/typeorm';
import { WithTimestamps, jsonColumnType } from './AbstractEntity';
@Entity({ name: 'event_destinations' })

2
packages/cli/src/databases/entities/ExecutionData.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import { idStringifier } from '../utils/transformers';
import { ExecutionEntity } from './ExecutionEntity';
import { jsonColumnType } from './AbstractEntity';

2
packages/cli/src/databases/entities/ExecutionEntity.ts
View File

@@ -10,7 +10,7 @@ import {
PrimaryColumn,
Relation,
DeleteDateColumn,
} from 'typeorm';
} from '@n8n/typeorm';
import { datetimeColumnType } from './AbstractEntity';
import { idStringifier } from '../utils/transformers';
import type { ExecutionData } from './ExecutionData';

2
packages/cli/src/databases/entities/ExecutionMetadata.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId } from '@n8n/typeorm';
import { ExecutionEntity } from './ExecutionEntity';
@Entity()

2
packages/cli/src/databases/entities/InstalledNodes.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import { InstalledPackages } from './InstalledPackages';
@Entity()

2
packages/cli/src/databases/entities/InstalledPackages.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm';
import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from '@n8n/typeorm';
import type { InstalledNodes } from './InstalledNodes';
import { WithTimestamps } from './AbstractEntity';

2
packages/cli/src/databases/entities/Settings.ts
View File

@@ -1,5 +1,5 @@
import type { IDataObject } from 'n8n-workflow';
import { Column, Entity, PrimaryColumn } from 'typeorm';
import { Column, Entity, PrimaryColumn } from '@n8n/typeorm';
interface ISettingsDb {
key: string;

2
packages/cli/src/databases/entities/SharedCredentials.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import { CredentialsEntity } from './CredentialsEntity';
import { User } from './User';
import { WithTimestamps } from './AbstractEntity';

2
packages/cli/src/databases/entities/SharedWorkflow.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import { WorkflowEntity } from './WorkflowEntity';
import { User } from './User';
import { WithTimestamps } from './AbstractEntity';

2
packages/cli/src/databases/entities/TagEntity.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, Index, ManyToMany, OneToMany } from 'typeorm';
import { Column, Entity, Index, ManyToMany, OneToMany } from '@n8n/typeorm';
import { IsString, Length } from 'class-validator';
import type { WorkflowEntity } from './WorkflowEntity';
import type { WorkflowTagMapping } from './WorkflowTagMapping';

2
packages/cli/src/databases/entities/User.ts
View File

@@ -8,7 +8,7 @@ import {
OneToMany,
PrimaryGeneratedColumn,
BeforeInsert,
} from 'typeorm';
} from '@n8n/typeorm';
import { IsEmail, IsString, Length } from 'class-validator';
import type { IUser, IUserSettings } from 'n8n-workflow';
import type { SharedWorkflow } from './SharedWorkflow';

2
packages/cli/src/databases/entities/Variables.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity } from 'typeorm';
import { Column, Entity } from '@n8n/typeorm';
import { WithStringId } from './AbstractEntity';
@Entity()

2
packages/cli/src/databases/entities/WebhookEntity.ts
View File

@@ -1,5 +1,5 @@
import { IHttpRequestMethods } from 'n8n-workflow';
import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
import { Column, Entity, Index, PrimaryColumn } from '@n8n/typeorm';
@Entity()
@Index(['webhookId', 'method', 'pathLength'])

2
packages/cli/src/databases/entities/WorkflowEntity.ts
View File

@@ -3,7 +3,7 @@ import { Length } from 'class-validator';
import { IConnections, IDataObject, IWorkflowSettings, WorkflowFEMeta } from 'n8n-workflow';
import type { IBinaryKeyData, INode, IPairedItemData } from 'n8n-workflow';
import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, OneToMany } from 'typeorm';
import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, OneToMany } from '@n8n/typeorm';
import config from '@/config';
import type { TagEntity } from './TagEntity';

2
packages/cli/src/databases/entities/WorkflowHistory.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import { WithTimestamps, jsonColumnType } from './AbstractEntity';
import { IConnections } from 'n8n-workflow';
import type { INode } from 'n8n-workflow';

2
packages/cli/src/databases/entities/WorkflowStatistics.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import { datetimeColumnType } from './AbstractEntity';
import { WorkflowEntity } from './WorkflowEntity';

2
packages/cli/src/databases/entities/WorkflowTagMapping.ts
View File

@@ -1,4 +1,4 @@
import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import type { TagEntity } from './TagEntity';
import type { WorkflowEntity } from './WorkflowEntity';

2
packages/cli/src/databases/repositories/authIdentity.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { AuthIdentity } from '../entities/AuthIdentity';
@Service()

2
packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { AuthProviderSyncHistory } from '../entities/AuthProviderSyncHistory';
@Service()

4
packages/cli/src/databases/repositories/credentials.repository.ts
View File

@@ -1,6 +1,6 @@
import { Service } from 'typedi';
import { DataSource, In, Not, Repository, Like } from 'typeorm';
import type { FindManyOptions, DeleteResult, EntityManager, FindOptionsWhere } from 'typeorm';
import { DataSource, In, Not, Repository, Like } from '@n8n/typeorm';
import type { FindManyOptions, DeleteResult, EntityManager, FindOptionsWhere } from '@n8n/typeorm';
import { CredentialsEntity } from '../entities/CredentialsEntity';
import { SharedCredentials } from '../entities/SharedCredentials';
import type { ListQuery } from '@/requests';

2
packages/cli/src/databases/repositories/eventDestinations.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { EventDestinations } from '../entities/EventDestinations';
@Service()

6
packages/cli/src/databases/repositories/execution.repository.ts
View File

@@ -10,15 +10,15 @@ import {
Not,
Raw,
Repository,
} from 'typeorm';
import { DateUtils } from 'typeorm/util/DateUtils';
} from '@n8n/typeorm';
import { DateUtils } from '@n8n/typeorm/util/DateUtils';
import type {
FindManyOptions,
FindOneOptions,
FindOperator,
FindOptionsWhere,
SelectQueryBuilder,
} from 'typeorm';
} from '@n8n/typeorm';
import { parse, stringify } from 'flatted';
import {
ApplicationError,

2
packages/cli/src/databases/repositories/executionData.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, In, Repository } from 'typeorm';
import { DataSource, In, Repository } from '@n8n/typeorm';
import { ExecutionData } from '../entities/ExecutionData';
@Service()

2
packages/cli/src/databases/repositories/executionMetadata.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { ExecutionMetadata } from '../entities/ExecutionMetadata';
@Service()

2
packages/cli/src/databases/repositories/installedNodes.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { InstalledNodes } from '../entities/InstalledNodes';
@Service()

2
packages/cli/src/databases/repositories/installedPackages.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { InstalledPackages } from '../entities/InstalledPackages';
import { InstalledNodesRepository } from './installedNodes.repository';
import type { PackageDirectoryLoader } from 'n8n-core';

2
packages/cli/src/databases/repositories/settings.repository.ts
View File

@@ -1,6 +1,6 @@
import { EXTERNAL_SECRETS_DB_KEY } from '@/ExternalSecrets/constants';
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
import { Settings } from '../entities/Settings';
import config from '@/config';

4
packages/cli/src/databases/repositories/sharedCredentials.repository.ts
View File

@@ -1,6 +1,6 @@
import { Service } from 'typedi';
import type { EntityManager } from 'typeorm';
import { DataSource, In, Not, Repository } from 'typeorm';
import type { EntityManager } from '@n8n/typeorm';
import { DataSource, In, Not, Repository } from '@n8n/typeorm';
import { type CredentialSharingRole, SharedCredentials } from '../entities/SharedCredentials';
import type { User } from '../entities/User';

4
packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
View File

@@ -1,6 +1,6 @@
import { Service } from 'typedi';
import { DataSource, Repository, In, Not } from 'typeorm';
import type { EntityManager, FindManyOptions, FindOptionsWhere } from 'typeorm';
import { DataSource, Repository, In, Not } from '@n8n/typeorm';
import type { EntityManager, FindManyOptions, FindOptionsWhere } from '@n8n/typeorm';
import { SharedWorkflow, type WorkflowSharingRole } from '../entities/SharedWorkflow';
import { type User } from '../entities/User';
import type { Scope } from '@n8n/permissions';

4
packages/cli/src/databases/repositories/tag.repository.ts
View File

@@ -1,6 +1,6 @@
import { Service } from 'typedi';
import type { EntityManager } from 'typeorm';
import { DataSource, In, Repository } from 'typeorm';
import type { EntityManager } from '@n8n/typeorm';
import { DataSource, In, Repository } from '@n8n/typeorm';
import { TagEntity } from '../entities/TagEntity';
import type { WorkflowEntity } from '../entities/WorkflowEntity';
import intersection from 'lodash/intersection';

2
packages/cli/src/databases/repositories/usageMetrics.repository.ts
View File

@@ -1,6 +1,6 @@
import config from '@/config';
import { Service } from 'typedi';
import { DataSource, Repository, Entity } from 'typeorm';
import { DataSource, Repository, Entity } from '@n8n/typeorm';
@Entity()
export class UsageMetrics {}

4
packages/cli/src/databases/repositories/user.repository.ts
View File

@@ -1,6 +1,6 @@
import { Service } from 'typedi';
import type { EntityManager, FindManyOptions } from 'typeorm';
import { DataSource, In, IsNull, Not, Repository } from 'typeorm';
import type { EntityManager, FindManyOptions } from '@n8n/typeorm';
import { DataSource, In, IsNull, Not, Repository } from '@n8n/typeorm';
import type { ListQuery } from '@/requests';
import { type GlobalRole, User } from '../entities/User';

2
packages/cli/src/databases/repositories/variables.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { Variables } from '../entities/Variables';
@Service()

2
packages/cli/src/databases/repositories/webhook.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { WebhookEntity } from '../entities/WebhookEntity';
@Service()

2
packages/cli/src/databases/repositories/workflow.repository.ts
View File

@@ -11,7 +11,7 @@ import {
type EntityManager,
type DeleteResult,
Not,
} from 'typeorm';
} from '@n8n/typeorm';
import type { ListQuery } from '@/requests';
import { isStringArray } from '@/utils';
import config from '@/config';

2
packages/cli/src/databases/repositories/workflowHistory.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, LessThan, Repository } from 'typeorm';
import { DataSource, LessThan, Repository } from '@n8n/typeorm';
import { WorkflowHistory } from '../entities/WorkflowHistory';
@Service()

2
packages/cli/src/databases/repositories/workflowStatistics.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, QueryFailedError, Repository } from 'typeorm';
import { DataSource, QueryFailedError, Repository } from '@n8n/typeorm';
import config from '@/config';
import { StatisticsNames, WorkflowStatistics } from '../entities/WorkflowStatistics';
import type { User } from '@/databases/entities/User';

2
packages/cli/src/databases/repositories/workflowTagMapping.repository.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { DataSource, Repository } from '@n8n/typeorm';
import { WorkflowTagMapping } from '../entities/WorkflowTagMapping';
@Service()

4
packages/cli/src/databases/types.ts
View File

@@ -1,5 +1,5 @@
import type { INodeTypes } from 'n8n-workflow';
import type { QueryRunner, ObjectLiteral } from 'typeorm';
import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm';
import type { Logger } from '@/Logger';
import type { createSchemaBuilder } from './dsl';
@@ -60,4 +60,4 @@ export interface Migration extends Function {
export type InsertResult = Array<{ insertId: number }>;
export { QueryFailedError } from 'typeorm/error/QueryFailedError';
export { QueryFailedError } from '@n8n/typeorm/error/QueryFailedError';

2
packages/cli/src/databases/utils/commandHelpers.ts
View File

@@ -1,6 +1,6 @@
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
import { getMetadataArgsStorage } from 'typeorm';
import { getMetadataArgsStorage } from '@n8n/typeorm';
export const disableAutoGeneratedIds = (
entityClass: typeof WorkflowEntity | typeof CredentialsEntity,

4
packages/cli/src/databases/utils/migrationHelpers.ts
View File

@@ -1,8 +1,8 @@
import { Container } from 'typedi';
import { readFileSync, rmSync } from 'fs';
import { InstanceSettings } from 'n8n-core';
import type { ObjectLiteral } from 'typeorm';
import type { QueryRunner } from 'typeorm/query-runner/QueryRunner';
import type { ObjectLiteral } from '@n8n/typeorm';
import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner';
import { ApplicationError, jsonParse } from 'n8n-workflow';
import config from '@/config';
import { inTest } from '@/constants';

2
packages/cli/src/databases/utils/transformers.ts
View File

@@ -1,5 +1,5 @@
import { jsonParse } from 'n8n-workflow';
import type { ValueTransformer, FindOperator } from 'typeorm';
import type { ValueTransformer, FindOperator } from '@n8n/typeorm';
import config from '@/config';
export const idStringifier = {

2
packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
View File

@@ -18,7 +18,7 @@ import { SharedCredentials } from '@db/entities/SharedCredentials';
import type { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
import type { TagEntity } from '@db/entities/TagEntity';
import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
import { In } from 'typeorm';
import { In } from '@n8n/typeorm';
import { isUniqueConstraintError } from '@/ResponseHelper';
import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
import { getCredentialExportPath, getWorkflowExportPath } from './sourceControlHelper.ee';

4
packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
View File

@@ -1,6 +1,6 @@
import { Service } from 'typedi';
import type { DeleteResult } from 'typeorm';
import { In } from 'typeorm';
import type { DeleteResult } from '@n8n/typeorm';
import { In } from '@n8n/typeorm';
import EventEmitter from 'events';
import uniqby from 'lodash/uniqBy';
import { jsonParse } from 'n8n-workflow';

2
packages/cli/src/services/userOnboarding.service.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { In } from 'typeorm';
import { In } from '@n8n/typeorm';
import type { User } from '@db/entities/User';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';

2
packages/cli/src/workflows/workflowSharing.service.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { In, type FindOptionsWhere } from 'typeorm';
import { In, type FindOptionsWhere } from '@n8n/typeorm';
import type { SharedWorkflow, WorkflowSharingRole } from '@db/entities/SharedWorkflow';
import type { User } from '@db/entities/User';

2
packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
View File

@@ -1,6 +1,6 @@
import { mocked } from 'jest-mock';
import Container from 'typedi';
import { Not } from 'typeorm';
import { Not } from '@n8n/typeorm';
import { InternalHooks } from '@/InternalHooks';
import { ExternalHooks } from '@/ExternalHooks';

2
packages/cli/test/integration/credentials.ee.test.ts
View File

@@ -1,6 +1,6 @@
import { Container } from 'typedi';
import type { SuperAgentTest } from 'supertest';
import { In } from 'typeorm';
import { In } from '@n8n/typeorm';
import type { IUser } from 'n8n-workflow';
import type { ListQuery } from '@/requests';

2
packages/cli/test/integration/ldap/ldap.api.test.ts
View File

@@ -1,7 +1,7 @@
import Container from 'typedi';
import type { SuperAgentTest } from 'supertest';
import type { Entry as LdapUser } from 'ldapts';
import { Not } from 'typeorm';
import { Not } from '@n8n/typeorm';
import { jsonParse } from 'n8n-workflow';
import { Cipher } from 'n8n-core';

2
packages/cli/test/integration/me.api.test.ts
View File

@@ -1,5 +1,5 @@
import type { SuperAgentTest } from 'supertest';
import { IsNull } from 'typeorm';
import { IsNull } from '@n8n/typeorm';
import validator from 'validator';
import type { User } from '@db/entities/User';
import { SUCCESS_RESPONSE_BODY } from './shared/constants';

2
packages/cli/test/integration/shared/db/workflows.ts
View File

@@ -1,5 +1,5 @@
import Container from 'typedi';
import type { DeepPartial } from 'typeorm';
import type { DeepPartial } from '@n8n/typeorm';
import { v4 as uuid } from 'uuid';
import type { User } from '@db/entities/User';

4
packages/cli/test/integration/shared/testDb.ts
View File

@@ -1,5 +1,5 @@
import type { DataSourceOptions as ConnectionOptions, Repository } from 'typeorm';
import { DataSource as Connection } from 'typeorm';
import type { DataSourceOptions as ConnectionOptions, Repository } from '@n8n/typeorm';
import { DataSource as Connection } from '@n8n/typeorm';
import { Container } from 'typedi';
import type { Class } from 'n8n-core';

2
packages/cli/test/integration/workflowHistoryManager.test.ts
View File

@@ -1,5 +1,5 @@
import Container from 'typedi';
import { In } from 'typeorm';
import { In } from '@n8n/typeorm';
import { DateTime } from 'luxon';
import config from '@/config';

2
packages/cli/test/teardown.ts
View File

@@ -1,5 +1,5 @@
import 'tsconfig-paths/register';
import { DataSource as Connection } from 'typeorm';
import { DataSource as Connection } from '@n8n/typeorm';
import config from '@/config';
import { getBootstrapDBOptions, testDbPrefix } from './integration/shared/testDb';

4
packages/cli/test/unit/repositories/execution.repository.test.ts
View File

@@ -1,7 +1,7 @@
import { mock } from 'jest-mock-extended';
import Container from 'typedi';
import type { EntityMetadata } from 'typeorm';
import { EntityManager, DataSource, Not, LessThanOrEqual } from 'typeorm';
import type { EntityMetadata } from '@n8n/typeorm';
import { EntityManager, DataSource, Not, LessThanOrEqual } from '@n8n/typeorm';
import config from '@/config';
import { ExecutionEntity } from '@db/entities/ExecutionEntity';

2
packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts
View File

@@ -1,5 +1,5 @@
import { Container } from 'typedi';
import { DataSource, EntityManager, type EntityMetadata } from 'typeorm';
import { DataSource, EntityManager, type EntityMetadata } from '@n8n/typeorm';
import { mock } from 'jest-mock-extended';
import type { User } from '@db/entities/User';
import type { CredentialsEntity } from '@db/entities/CredentialsEntity';

2
packages/cli/test/unit/repositories/workflowStatistics.test.ts
View File

@@ -1,5 +1,5 @@
import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
import { DataSource, EntityManager, InsertResult, QueryFailedError } from 'typeorm';
import { DataSource, EntityManager, InsertResult, QueryFailedError } from '@n8n/typeorm';
import { mockInstance } from '../../shared/mocking';
import { mock, mockClear } from 'jest-mock-extended';
import { StatisticsNames, WorkflowStatistics } from '@/databases/entities/WorkflowStatistics';

2
packages/cli/test/unit/services/events.service.test.ts
View File

@@ -4,7 +4,7 @@ import {
type DataSource,
type EntityManager,
type EntityMetadata,
} from 'typeorm';
} from '@n8n/typeorm';
import { mocked } from 'jest-mock';
import { mock } from 'jest-mock-extended';