From ecdf4d39b033f40c003009ca7ced77f32667cee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?bartosjiri=20=E2=9A=A1?= <me@bartosjiri.com>
Date: Tue, 7 Dec 2021 16:42:20 +0100
Subject: [PATCH] fix: isolate all where clauses (#130)

---
 src/paginate.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/paginate.ts b/src/paginate.ts
index 04081e4..c9512d2 100644
--- a/src/paginate.ts
+++ b/src/paginate.ts
@@ -227,13 +227,13 @@ export async function paginate<T>(
         for (const column of searchBy) {
             search.push({ [column]: ILike(`%${query.search}%`) })
         }
-        queryBuilder = queryBuilder.andWhere(search)
+        queryBuilder = queryBuilder.andWhere(new Brackets((queryBuilder) => queryBuilder.andWhere(search)))
     }
 
     if (query.filter) {
         const filter = parseFilter<T>(query, config)
 
-        queryBuilder = queryBuilder.andWhere(filter)
+        queryBuilder = queryBuilder.andWhere(new Brackets((queryBuilder) => queryBuilder.andWhere(filter)))
     }
 
     ;[items, totalItems] = await queryBuilder.getManyAndCount()