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

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts

@@ -9,7 +9,7 @@ import { SqlDatabase } from 'langchain/sql_db';
 import type { SqlCreatePromptArgs } from 'langchain/agents/toolkits/sql';
 import { SqlToolkit, createSqlAgent } from 'langchain/agents/toolkits/sql';
 import type { BaseLanguageModel } from 'langchain/dist/base_language';
-import type { DataSource } from 'typeorm';
+import type { DataSource } from '@n8n/typeorm';
 
 import { getSqliteDataSource } from './other/handlers/sqlite';
 import { getPostgresDataSource } from './other/handlers/postgres';

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts

@@ -1,5 +1,5 @@
 import { type IExecuteFunctions } from 'n8n-workflow';
-import { DataSource } from 'typeorm';
+import { DataSource } from '@n8n/typeorm';
 
 export async function getMysqlDataSource(this: IExecuteFunctions): Promise<DataSource> {
 	const credentials = await this.getCredentials('mySql');

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts

@@ -1,5 +1,5 @@
 import { type IExecuteFunctions } from 'n8n-workflow';
-import { DataSource } from 'typeorm';
+import { DataSource } from '@n8n/typeorm';
 
 export async function getPostgresDataSource(this: IExecuteFunctions): Promise<DataSource> {
 	const credentials = await this.getCredentials('postgres');

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts

@@ -3,7 +3,7 @@ import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 import * as temp from 'temp';
 import * as sqlite3 from 'sqlite3';
-import { DataSource } from 'typeorm';
+import { DataSource } from '@n8n/typeorm';
 
 export function getSqliteDataSource(
 	this: IExecuteFunctions,

packages/@n8n/nodes-langchain/package.json

@@ -131,6 +131,7 @@
     "@huggingface/inference": "2.6.4",
     "@langchain/core": "0.1.8",
     "@langchain/mistralai": "0.0.6",
+    "@n8n/typeorm": "0.3.20",
     "@n8n/vm2": "3.9.20",
     "@pinecone-database/pinecone": "1.1.2",
     "@qdrant/js-client-rest": "1.7.0",
@@ -154,7 +155,6 @@
     "redis": "4.6.12",
     "sqlite3": "5.1.7",
     "temp": "0.9.4",
-    "typeorm": "0.3.20",
     "zod": "3.22.4",
     "zod-to-json-schema": "3.22.0"
   }

packages/cli/package.json

@@ -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",

packages/cli/src/Db.ts

@@ -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';
 

packages/cli/src/Ldap/ldap.service.ts

@@ -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';

packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts

@@ -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';

packages/cli/src/commands/db/revert.ts

@@ -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';

packages/cli/src/commands/import/credentials.ts

@@ -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';

packages/cli/src/credentials/credentials.service.ee.ts

@@ -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';

packages/cli/src/credentials/credentials.service.ts

@@ -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';

packages/cli/src/databases/config.ts

@@ -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';

packages/cli/src/databases/dsl/Column.ts

@@ -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';

packages/cli/src/databases/dsl/Indices.ts

@@ -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> {

packages/cli/src/databases/dsl/Table.ts

@@ -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';

packages/cli/src/databases/dsl/index.ts

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

packages/cli/src/databases/entities/AbstractEntity.ts

@@ -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';

packages/cli/src/databases/entities/AuthIdentity.ts

@@ -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';
 

packages/cli/src/databases/entities/AuthProviderSyncHistory.ts

@@ -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';
 

packages/cli/src/databases/entities/CredentialsEntity.ts

@@ -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';

packages/cli/src/databases/entities/EventDestinations.ts

@@ -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' })

packages/cli/src/databases/entities/ExecutionData.ts

@@ -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';

packages/cli/src/databases/entities/ExecutionEntity.ts

@@ -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';

packages/cli/src/databases/entities/ExecutionMetadata.ts

@@ -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()

packages/cli/src/databases/entities/InstalledNodes.ts

@@ -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()

packages/cli/src/databases/entities/InstalledPackages.ts

@@ -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';
 

packages/cli/src/databases/entities/Settings.ts

@@ -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;

packages/cli/src/databases/entities/SharedCredentials.ts

@@ -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';

packages/cli/src/databases/entities/SharedWorkflow.ts

@@ -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';

packages/cli/src/databases/entities/TagEntity.ts

@@ -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';

packages/cli/src/databases/entities/User.ts

@@ -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';

packages/cli/src/databases/entities/Variables.ts

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

packages/cli/src/databases/entities/WebhookEntity.ts

@@ -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'])

packages/cli/src/databases/entities/WorkflowEntity.ts

@@ -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';

packages/cli/src/databases/entities/WorkflowHistory.ts

@@ -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';

packages/cli/src/databases/entities/WorkflowStatistics.ts

@@ -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';
 

packages/cli/src/databases/entities/WorkflowTagMapping.ts

@@ -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';
 

packages/cli/src/databases/repositories/authIdentity.repository.ts

@@ -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()

packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts

@@ -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()

packages/cli/src/databases/repositories/credentials.repository.ts

@@ -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';

packages/cli/src/databases/repositories/eventDestinations.repository.ts

@@ -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()

packages/cli/src/databases/repositories/execution.repository.ts

@@ -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,

packages/cli/src/databases/repositories/executionData.repository.ts

@@ -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()

packages/cli/src/databases/repositories/executionMetadata.repository.ts

@@ -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()

packages/cli/src/databases/repositories/installedNodes.repository.ts

@@ -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()

packages/cli/src/databases/repositories/installedPackages.repository.ts

@@ -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';

packages/cli/src/databases/repositories/settings.repository.ts

@@ -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';