This commit is contained in:
Adria Navarro 2024-10-14 16:17:24 +02:00
parent b3cea00ab3
commit 7ea2c187a7
1 changed files with 7 additions and 15 deletions

View File

@ -406,7 +406,6 @@ class InternalBuilder {
addRelationshipForFilter( addRelationshipForFilter(
query: Knex.QueryBuilder, query: Knex.QueryBuilder,
filterKey: string, filterKey: string,
isOr: boolean,
whereCb: (query: Knex.QueryBuilder) => Knex.QueryBuilder whereCb: (query: Knex.QueryBuilder) => Knex.QueryBuilder
): Knex.QueryBuilder { ): Knex.QueryBuilder {
const mainKnex = this.knex const mainKnex = this.knex
@ -471,12 +470,7 @@ class InternalBuilder {
) )
) )
} }
query = query.whereExists(whereCb(subQuery))
if (isOr) {
query = query.orWhereExists(whereCb(subQuery))
} else {
query = query.whereExists(whereCb(subQuery))
}
break break
} }
} }
@ -561,14 +555,12 @@ class InternalBuilder {
value value
) )
} else if (shouldProcessRelationship) { } else if (shouldProcessRelationship) {
query = builder.addRelationshipForFilter( if (allOr) {
query, query = query.or
updatedKey, }
!!allOr, query = builder.addRelationshipForFilter(query, updatedKey, q => {
q => { return handleRelationship(q, updatedKey, value)
return handleRelationship(q, updatedKey, value) })
}
)
} }
} }
} }