From 40a43f59577abc581aa60dedfd006a0a59e867f8 Mon Sep 17 00:00:00 2001 From: Mutasem Date: Thu, 4 Aug 2022 11:27:37 +0200 Subject: [PATCH 1/4] add check for arr --- .../migrations/mysqldb/1658932910559-AddNodeIds.ts | 6 ++++++ .../migrations/postgresdb/1658932090381-AddNodeIds.ts | 8 ++++++++ .../migrations/sqlite/1658930531669-AddNodeIds.ts | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts index 6dbc16623a..7aea6da484 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts @@ -20,6 +20,9 @@ export class AddNodeIds1658932910559 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; + if (!Array.isArray(nodes)) { + return; + } // @ts-ignore nodes.forEach((node) => { if (!node.id) { @@ -55,6 +58,9 @@ export class AddNodeIds1658932910559 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; + if (!Array.isArray(nodes)) { + return; + } // @ts-ignore nodes.forEach((node) => delete node.id ); diff --git a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts index 3571693fa4..93a7f2396c 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts @@ -26,6 +26,10 @@ export class AddNodeIds1658932090381 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; + if (!Array.isArray(nodes)) { + return; + } + // @ts-ignore nodes.forEach((node) => { if (!node.id) { @@ -67,6 +71,10 @@ export class AddNodeIds1658932090381 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; + if (!Array.isArray(nodes)) { + return; + } + // @ts-ignore nodes.forEach((node) => delete node.id ); diff --git a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts b/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts index d772d5c47b..25504d5bf6 100644 --- a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts @@ -24,6 +24,10 @@ export class AddNodeIds1658930531669 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = JSON.parse(workflow.nodes); + if (!Array.isArray(nodes)) { + return; + } + nodes.forEach((node: INode) => { if (!node.id) { node.id = uuid(); @@ -61,6 +65,10 @@ export class AddNodeIds1658930531669 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = JSON.parse(workflow.nodes); + if (!Array.isArray(nodes)) { + return; + } + // @ts-ignore nodes.forEach((node) => delete node.id ); From 59a5d808ce81933395493478ff5d1355ca31ee86 Mon Sep 17 00:00:00 2001 From: Mutasem Date: Thu, 4 Aug 2022 16:26:44 +0200 Subject: [PATCH 2/4] Revert "add check for arr" 40a43f59577abc581aa60dedfd006a0a59e867f8 --- .../migrations/mysqldb/1658932910559-AddNodeIds.ts | 6 ------ .../migrations/postgresdb/1658932090381-AddNodeIds.ts | 8 -------- .../migrations/sqlite/1658930531669-AddNodeIds.ts | 8 -------- 3 files changed, 22 deletions(-) diff --git a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts index 7aea6da484..6dbc16623a 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts @@ -20,9 +20,6 @@ export class AddNodeIds1658932910559 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; - if (!Array.isArray(nodes)) { - return; - } // @ts-ignore nodes.forEach((node) => { if (!node.id) { @@ -58,9 +55,6 @@ export class AddNodeIds1658932910559 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; - if (!Array.isArray(nodes)) { - return; - } // @ts-ignore nodes.forEach((node) => delete node.id ); diff --git a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts index 93a7f2396c..3571693fa4 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts @@ -26,10 +26,6 @@ export class AddNodeIds1658932090381 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; - if (!Array.isArray(nodes)) { - return; - } - // @ts-ignore nodes.forEach((node) => { if (!node.id) { @@ -71,10 +67,6 @@ export class AddNodeIds1658932090381 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = workflow.nodes; - if (!Array.isArray(nodes)) { - return; - } - // @ts-ignore nodes.forEach((node) => delete node.id ); diff --git a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts b/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts index 25504d5bf6..d772d5c47b 100644 --- a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts @@ -24,10 +24,6 @@ export class AddNodeIds1658930531669 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = JSON.parse(workflow.nodes); - if (!Array.isArray(nodes)) { - return; - } - nodes.forEach((node: INode) => { if (!node.id) { node.id = uuid(); @@ -65,10 +61,6 @@ export class AddNodeIds1658930531669 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { const nodes = JSON.parse(workflow.nodes); - if (!Array.isArray(nodes)) { - return; - } - // @ts-ignore nodes.forEach((node) => delete node.id ); From a9e63b992352d4babe8ba5731d68993fba18efa8 Mon Sep 17 00:00:00 2001 From: Mutasem Date: Thu, 4 Aug 2022 16:28:47 +0200 Subject: [PATCH 3/4] fix mariadb issue --- .../migrations/mysqldb/1658932910559-AddNodeIds.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts index 6dbc16623a..c8ee937d8c 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts @@ -19,7 +19,11 @@ export class AddNodeIds1658932910559 implements MigrationInterface { // @ts-ignore await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { - const nodes = workflow.nodes; + let nodes = workflow.nodes; + if (typeof nodes === 'string') { // mariadb + nodes = JSON.parse(nodes); + } + // @ts-ignore nodes.forEach((node) => { if (!node.id) { From 48ddf1f68f40ac7ac566d7a05cabe0ea9e9e1d7a Mon Sep 17 00:00:00 2001 From: Mutasem Date: Thu, 4 Aug 2022 16:54:00 +0200 Subject: [PATCH 4/4] remove comment --- .../databases/migrations/mysqldb/1658932910559-AddNodeIds.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts index c8ee937d8c..000d0adb1e 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts @@ -20,7 +20,7 @@ export class AddNodeIds1658932910559 implements MigrationInterface { await runChunked(queryRunner, workflowsQuery, (workflows) => { workflows.forEach(async (workflow) => { let nodes = workflow.nodes; - if (typeof nodes === 'string') { // mariadb + if (typeof nodes === 'string') { nodes = JSON.parse(nodes); }