Merge branch 'Master' into 'Pipedrive-OAuth2-support'

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

@@ -39,6 +39,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	@Column()
 	startedAt: Date;
 
+	@Index()
 	@Column()
 	stoppedAt: Date;
 

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

@@ -0,0 +1,25 @@
+import {
+	Column,
+	Entity,
+	PrimaryColumn,
+} from 'typeorm';
+
+import {
+	IWebhookDb,
+ } from '../../Interfaces';
+
+@Entity()
+export class WebhookEntity implements IWebhookDb {
+
+	@Column()
+	workflowId: number;
+
+	@PrimaryColumn()
+	webhookPath: string;
+
+	@PrimaryColumn()
+	method: string;
+
+	@Column()
+	node: string;
+}

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

@@ -1,4 +1,4 @@
 export * from './CredentialsEntity';
 export * from './ExecutionEntity';
 export * from './WorkflowEntity';
-
+export * from './WebhookEntity';

packages/cli/src/databases/sqlite/migrations/1588102412422-InitialMigration.ts

@@ -1,4 +1,7 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
+import {
+	MigrationInterface,
+	QueryRunner,
+} from 'typeorm';
 
 import * as config from '../../../../config';
 
@@ -9,9 +12,9 @@ export class InitialMigration1588102412422 implements MigrationInterface {
 		const tablePrefix = config.get('database.tablePrefix');
 
 		await queryRunner.query(`CREATE TABLE IF NOT EXISTS "${tablePrefix}credentials_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(128) NOT NULL, "data" text NOT NULL, "type" varchar(32) NOT NULL, "nodesAccess" text NOT NULL, "createdAt" datetime NOT NULL, "updatedAt" datetime NOT NULL)`, undefined);
-		await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_07fde106c0b471d8cc80a64fc8" ON "${tablePrefix}credentials_entity" ("type") `, undefined);
+		await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8" ON "${tablePrefix}credentials_entity" ("type") `, undefined);
 		await queryRunner.query(`CREATE TABLE IF NOT EXISTS "${tablePrefix}execution_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "data" text NOT NULL, "finished" boolean NOT NULL, "mode" varchar NOT NULL, "retryOf" varchar, "retrySuccessId" varchar, "startedAt" datetime NOT NULL, "stoppedAt" datetime NOT NULL, "workflowData" text NOT NULL, "workflowId" varchar)`, undefined);
-		await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_c4d999a5e90784e8caccf5589d" ON "${tablePrefix}execution_entity" ("workflowId") `, undefined);
+		await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_${tablePrefix}c4d999a5e90784e8caccf5589d" ON "${tablePrefix}execution_entity" ("workflowId") `, undefined);
 		await queryRunner.query(`CREATE TABLE IF NOT EXISTS "${tablePrefix}workflow_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(128) NOT NULL, "active" boolean NOT NULL, "nodes" text NOT NULL, "connections" text NOT NULL, "createdAt" datetime NOT NULL, "updatedAt" datetime NOT NULL, "settings" text, "staticData" text)`, undefined);
 	}
 
@@ -19,9 +22,9 @@ export class InitialMigration1588102412422 implements MigrationInterface {
 		const tablePrefix = config.get('database.tablePrefix');
 
 		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_entity"`, undefined);
-		await queryRunner.query(`DROP INDEX "IDX_c4d999a5e90784e8caccf5589d"`, undefined);
+		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}c4d999a5e90784e8caccf5589d"`, undefined);
 		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_entity"`, undefined);
-		await queryRunner.query(`DROP INDEX "IDX_07fde106c0b471d8cc80a64fc8"`, undefined);
+		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8"`, undefined);
 		await queryRunner.query(`DROP TABLE "${tablePrefix}credentials_entity"`, undefined);
 	}
 

packages/cli/src/databases/sqlite/migrations/1592445003908-WebhookModel.ts

@@ -0,0 +1,63 @@
+import {
+	MigrationInterface,
+	QueryRunner,
+} from 'typeorm';
+
+import * as config from '../../../../config';
+
+import {
+	IWorkflowDb,
+	NodeTypes,
+	WebhookHelpers,
+} from '../../..';
+
+import {
+	Workflow,
+} from 'n8n-workflow';
+
+import {
+	IWebhookDb,
+} from '../../../Interfaces';
+
+export class WebhookModel1592445003908 implements MigrationInterface {
+	name = 'WebhookModel1592445003908';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+		await queryRunner.query(`CREATE TABLE IF NOT EXISTS ${tablePrefix}webhook_entity ("workflowId" integer NOT NULL, "webhookPath" varchar NOT NULL, "method" varchar NOT NULL, "node" varchar NOT NULL, PRIMARY KEY ("webhookPath", "method"))`);
+
+		const workflows = await queryRunner.query(`SELECT * FROM ${tablePrefix}workflow_entity WHERE active=true`) as IWorkflowDb[];
+		const data: IWebhookDb[] = [];
+		const nodeTypes = NodeTypes();
+		for (const workflow of workflows) {
+			workflow.nodes = JSON.parse(workflow.nodes as unknown as string);
+			workflow.connections = JSON.parse(workflow.connections as unknown as string);
+			workflow.staticData = JSON.parse(workflow.staticData as unknown as string);
+			workflow.settings = JSON.parse(workflow.settings as unknown as string);
+			const workflowInstance = new Workflow({ id: workflow.id as string, name: workflow.name, nodes: workflow.nodes, connections: workflow.connections, active: workflow.active, nodeTypes, staticData: workflow.staticData, settings: workflow.settings });
+			const webhooks = WebhookHelpers.getWorkflowWebhooksBasic(workflowInstance);
+			for (const webhook of webhooks) {
+				data.push({
+					workflowId: workflowInstance.id as string,
+					webhookPath: webhook.path,
+					method: webhook.httpMethod,
+					node: webhook.node,
+				 });
+			}
+		}
+
+		if (data.length !== 0) {
+			await queryRunner.manager.createQueryBuilder()
+			.insert()
+			.into(`${tablePrefix}webhook_entity`)
+			.values(data)
+			.execute();
+		}
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+		await queryRunner.query(`DROP TABLE ${tablePrefix}webhook_entity`);
+	}
+}

packages/cli/src/databases/sqlite/migrations/1594825041918-CreateIndexStoppedAt.ts

@@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+import * as config from '../../../../config';
+
+export class CreateIndexStoppedAt1594825041918 implements MigrationInterface {
+    name = 'CreateIndexStoppedAt1594825041918'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+        await queryRunner.query(`CREATE INDEX "IDX_${tablePrefix}cefb067df2402f6aed0638a6c1" ON "execution_entity" ("stoppedAt") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+        await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}cefb067df2402f6aed0638a6c1"`);
+    }
+
+}

packages/cli/src/databases/sqlite/migrations/index.ts

@@ -1 +1,3 @@
-export * from './1588102412422-InitialMigration';
+export * from './1588102412422-InitialMigration';
+export * from './1592445003908-WebhookModel';
+export * from './1594825041918-CreateIndexStoppedAt'