From e536ec50935972269b6615c47cbf2175fac15ca5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 21 Aug 2024 12:58:46 +0200
Subject: [PATCH] Fix conditions

---
 packages/backend-core/src/sql/sql.ts | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
index ebae09e156..21baa5adcc 100644
--- a/packages/backend-core/src/sql/sql.ts
+++ b/packages/backend-core/src/sql/sql.ts
@@ -465,20 +465,16 @@ class InternalBuilder {
 
     if (filters.$and) {
       const { $and } = filters
-      query = query.where(x => {
-        for (const condition of $and.conditions) {
-          x = this.addFilters(x, condition, opts)
-        }
-      })
+      for (const condition of $and.conditions) {
+        query = query.andWhere(b => this.addFilters(b, condition, opts))
+      }
     }
 
     if (filters.$or) {
       const { $or } = filters
-      query = query.where(x => {
-        for (const condition of $or.conditions) {
-          x = this.addFilters(x, { ...condition, allOr: true }, opts)
-        }
-      })
+      for (const condition of $or.conditions) {
+        query = query.orWhere(b => this.addFilters(b, condition, opts))
+      }
     }
 
     if (filters.oneOf) {