MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conditions

This commit is contained in:
Adria Navarro 2024-08-21 12:58:46 +02:00
parent ff9d934f87
commit e536ec5093
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend-core/src/sql/sql.ts
View File

@ -465,20 +465,16 @@ class InternalBuilder {
if (filters.$and) { if (filters.$and) {
const { $and } = filters const { $and } = filters
query = query.where(x => { for (const condition of $and.conditions) {
for (const condition of $and.conditions) { query = query.andWhere(b => this.addFilters(b, condition, opts))
x = this.addFilters(x, condition, opts) }
}
})
} }
if (filters.$or) { if (filters.$or) {
const { $or } = filters const { $or } = filters
query = query.where(x => { for (const condition of $or.conditions) {
for (const condition of $or.conditions) { query = query.orWhere(b => this.addFilters(b, condition, opts))
x = this.addFilters(x, { ...condition, allOr: true }, opts) }
}
})
} }
if (filters.oneOf) { if (filters.oneOf) {