diff --git a/src/paginate.ts b/src/paginate.ts index 7448e60..615ec46 100644 --- a/src/paginate.ts +++ b/src/paginate.ts @@ -115,11 +115,8 @@ export async function paginate( } } - let hasWhereClause = false - if (config.where) { - queryBuilder = queryBuilder.where(config.where) - hasWhereClause = true + queryBuilder = queryBuilder.andWhere(config.where) } if (query.search && config.searchableColumns) { @@ -127,8 +124,7 @@ export async function paginate( for (const column of config.searchableColumns) { search.push({ [column]: ILike(`%${query.search}%`) }) } - queryBuilder = queryBuilder[hasWhereClause ? 'andWhere' : 'where'](search) - hasWhereClause = true + queryBuilder = queryBuilder.andWhere(search) } if (query.filter) { @@ -196,7 +192,7 @@ export async function paginate( } } - queryBuilder = queryBuilder[hasWhereClause ? 'andWhere' : 'where'](filter) + queryBuilder = queryBuilder.andWhere(filter) } ;[items, totalItems] = await queryBuilder.getManyAndCount()