1
0
Fork 0
mirror of synced 2024-09-20 11:27:56 +12:00

Fix merge conflicts

This commit is contained in:
Adria Navarro 2024-08-05 17:32:40 +02:00
parent 9743aca715
commit 58162410ea

View file

@ -467,7 +467,7 @@ class InternalBuilder {
const { $and } = filters
query = query.where(x => {
for (const condition of $and.conditions) {
x = this.addFilters(x, condition, table, opts)
x = this.addFilters(x, condition, opts)
}
})
}
@ -476,7 +476,7 @@ class InternalBuilder {
const { $or } = filters
query = query.where(x => {
for (const condition of $or.conditions) {
x = this.addFilters(x, { ...condition, allOr: true }, table, opts)
x = this.addFilters(x, { ...condition, allOr: true }, opts)
}
})
}