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

Fix merge conflicts

This commit is contained in:
Adria Navarro 2024-08-05 17:32:40 +02:00
parent 9743aca715
commit 58162410ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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