From 32f004a890ba6db1ed912e14ec1517d028f0f07e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 12 Sep 2022 14:21:32 +0100 Subject: [PATCH 1/2] Compare string versions of relationship columns --- packages/server/src/api/controllers/row/ExternalRequest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index dd5778b9d9..25b26d461f 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -371,7 +371,7 @@ module External { const toColumn = `${linkedTable.name}.${relationship.to}` // this is important when working with multiple relationships // between the same tables, don't want to overlap/multiply the relations - if (!relationship.through && row[fromColumn] !== row[toColumn]) { + if (!relationship.through && row[fromColumn]?.toString() !== row[toColumn]?.toString()) { continue } let linked = basicProcessing(row, linkedTable) From f782375e128d68c8e057c2fc90838b8262904fcf Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 12 Sep 2022 14:22:07 +0100 Subject: [PATCH 2/2] lint --- packages/server/src/api/controllers/row/ExternalRequest.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index 25b26d461f..dc62453f77 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -371,7 +371,10 @@ module External { const toColumn = `${linkedTable.name}.${relationship.to}` // this is important when working with multiple relationships // between the same tables, don't want to overlap/multiply the relations - if (!relationship.through && row[fromColumn]?.toString() !== row[toColumn]?.toString()) { + if ( + !relationship.through && + row[fromColumn]?.toString() !== row[toColumn]?.toString() + ) { continue } let linked = basicProcessing(row, linkedTable)