Fix ors
This commit is contained in:
parent
2311f8aa50
commit
cf089eff26
|
@ -406,6 +406,7 @@ class InternalBuilder {
|
|||
addRelationshipForFilter(
|
||||
query: Knex.QueryBuilder,
|
||||
filterKey: string,
|
||||
isOr: boolean,
|
||||
whereCb: (query: Knex.QueryBuilder) => Knex.QueryBuilder
|
||||
): Knex.QueryBuilder {
|
||||
const mainKnex = this.knex
|
||||
|
@ -470,7 +471,12 @@ class InternalBuilder {
|
|||
)
|
||||
)
|
||||
}
|
||||
query = query.whereExists(whereCb(subQuery))
|
||||
|
||||
if (isOr) {
|
||||
query = query.orWhereExists(whereCb(subQuery))
|
||||
} else {
|
||||
query = query.whereExists(whereCb(subQuery))
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
|
@ -555,9 +561,14 @@ class InternalBuilder {
|
|||
value
|
||||
)
|
||||
} else if (shouldProcessRelationship) {
|
||||
query = builder.addRelationshipForFilter(query, updatedKey, q => {
|
||||
return handleRelationship(q, updatedKey, value)
|
||||
})
|
||||
query = builder.addRelationshipForFilter(
|
||||
query,
|
||||
updatedKey,
|
||||
!!allOr,
|
||||
q => {
|
||||
return handleRelationship(q, updatedKey, value)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue