From 7ea2c187a7a6572da98587c0dd8e55dd3a8c854e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 14 Oct 2024 16:17:24 +0200
Subject: [PATCH] Simplify

---
 packages/backend-core/src/sql/sql.ts | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
index 2b697d42ae..b415a6f1b7 100644
--- a/packages/backend-core/src/sql/sql.ts
+++ b/packages/backend-core/src/sql/sql.ts
@@ -406,7 +406,6 @@ class InternalBuilder {
   addRelationshipForFilter(
     query: Knex.QueryBuilder,
     filterKey: string,
-    isOr: boolean,
     whereCb: (query: Knex.QueryBuilder) => Knex.QueryBuilder
   ): Knex.QueryBuilder {
     const mainKnex = this.knex
@@ -471,12 +470,7 @@ class InternalBuilder {
             )
           )
         }
-
-        if (isOr) {
-          query = query.orWhereExists(whereCb(subQuery))
-        } else {
-          query = query.whereExists(whereCb(subQuery))
-        }
+        query = query.whereExists(whereCb(subQuery))
         break
       }
     }
@@ -561,14 +555,12 @@ class InternalBuilder {
             value
           )
         } else if (shouldProcessRelationship) {
-          query = builder.addRelationshipForFilter(
-            query,
-            updatedKey,
-            !!allOr,
-            q => {
-              return handleRelationship(q, updatedKey, value)
-            }
-          )
+          if (allOr) {
+            query = query.or
+          }
+          query = builder.addRelationshipForFilter(query, updatedKey, q => {
+            return handleRelationship(q, updatedKey, value)
+          })
         }
       }
     }