From ceb3129e221c4871c6c48dc0d14f62ff11fd8c5a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 13 Sep 2023 12:02:13 +0200
Subject: [PATCH] Revert relationship changes

---
 .../server/src/api/controllers/table/external.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts
index 513b989a3a..327904666d 100644
--- a/packages/server/src/api/controllers/table/external.ts
+++ b/packages/server/src/api/controllers/table/external.ts
@@ -67,15 +67,13 @@ function cleanupRelationships(
   tables: Record<string, Table>,
   oldTable?: Table
 ) {
-  const isUpdate = !!oldTable
-  if (!isUpdate) {
-    return
-  }
-
-  // When updating a table, we want to detect if some relationships were removed.
-  // If so, we want to remove the relationship from the other end
-  for (let [key, schema] of Object.entries(oldTable.schema)) {
-    if (schema.type === FieldTypes.LINK && !table.schema[key]) {
+  const tableToIterate = oldTable ? oldTable : table
+  // clean up relationships in couch table schemas
+  for (let [key, schema] of Object.entries(tableToIterate.schema)) {
+    if (
+      schema.type === FieldTypes.LINK &&
+      (!oldTable || table.schema[key] == null)
+    ) {
       const relatedTable = Object.values(tables).find(
         table => table._id === schema.tableId
       )