refactor(core): Don't use DB transactions on ExecutionRepository.crea…

…teNewExecution (no-changelog)
n8n-io · Dec 12, 2023 · c9bf57e · c9bf57e
1 parent 19e88ec
commit c9bf57e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
@@ -60,9 +60,7 @@ export class ActiveExecutions {
 				fullExecutionData.workflowId = workflowId;
 			}
 
-			const executionResult =
-				await Container.get(ExecutionRepository).createNewExecution(fullExecutionData);
-			executionId = executionResult.id;
+			executionId = await Container.get(ExecutionRepository).createNewExecution(fullExecutionData);
 			if (executionId === undefined) {
 				throw new ApplicationError('There was an issue assigning an execution id to the execution');
 			}

diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -25,7 +25,7 @@ import type {
 import config from '@/config';
 import type { IGetExecutionsQueryFilter } from '@/executions/executions.service';
 import { isAdvancedExecutionFiltersEnabled } from '@/executions/executionHelpers';
-import type { ExecutionData } from '../entities/ExecutionData';
+import { ExecutionData } from '../entities/ExecutionData';
 import { ExecutionEntity } from '../entities/ExecutionEntity';
 import { ExecutionMetadata } from '../entities/ExecutionMetadata';
 import { ExecutionDataRepository } from './executionData.repository';
@@ -213,17 +213,32 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		return rest;
 	}
 
-	async createNewExecution(execution: ExecutionPayload) {
+	async createNewExecution(execution: ExecutionPayload): Promise<string> {
 		const { data, workflowData, ...rest } = execution;
-
-		const newExecution = await this.save(rest);
-		await this.executionDataRepository.save({
-			execution: newExecution,
-			workflowData,
-			data: stringify(data),
-		});
-
-		return newExecution;
+		const { identifiers: inserted } = await this.manager
+			.createQueryBuilder()
+			.insert()
+			.into(ExecutionEntity)
+			.values([rest])
+			.returning('id')
+			.execute();
+
+		const { id: executionId } = inserted[0] as { id: string };
+		const { connections, nodes, name, pinData, staticData } = workflowData ?? {};
+		await this.manager
+			.createQueryBuilder()
+			.insert()
+			.into(ExecutionData)
+			.values([
+				{
+					executionId,
+					// @ts-ignore
+					workflowData: { connections, nodes, name, pinData: pinData!, staticData },
+					data: stringify(data),
+				},
+			])
+			.execute();
+		return executionId;
 	}
 
 	async markAsCrashed(executionIds: string[]) {

diff --git a/packages/cli/test/unit/ActiveExecutions.test.ts b/packages/cli/test/unit/ActiveExecutions.test.ts
@@ -12,9 +12,7 @@ const FAKE_EXECUTION_ID = '15';
 const FAKE_SECOND_EXECUTION_ID = '20';
 
 const updateExistingExecution = jest.fn();
-const createNewExecution = jest.fn(async () => {
-	return { id: FAKE_EXECUTION_ID };
-});
+const createNewExecution = jest.fn(async () => FAKE_EXECUTION_ID);
 
 Container.set(ExecutionRepository, {
 	updateExistingExecution,