github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adds _none and _some operators (#13453)

Browse Source 
* re-introducing the _none and _some operators

* abstracted subQuery function out of the loop
This commit is contained in:
Brainslug
2022-05-23 16:57:48 +02:00
committed by GitHub
parent a7534c1211
commit eec2c087db
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/src/utils/apply-query/index.ts
View File

@@ -319,7 +319,7 @@ export function applyFilter(
}
}
function callbackSubqueryRelation(relation: Relation, value: any) {
function subQueryBuilderSingle(relation: Relation, value: any) {
return function (subQueryKnex: Knex.QueryBuilder<any, any>) {
const field = relation!.field;
const collection = relation!.collection;
@@ -340,6 +340,22 @@ export function applyFilter(
};
}
function subQueryBuilderMultiple(relation: Relation, filter: Filter) {
return (subQueryKnex: Knex.QueryBuilder<any, unknown[]>) => {
const field = relation!.field;
const collection = relation!.collection;
const column = `${collection}.${field}`;
// specifically used for o2m, m2m subqueries
subQueryKnex
.select({ [field]: column })
.from(collection)
.whereNotNull(column);
applyQuery(knex, relation!.collection, subQueryKnex, { filter }, schema, true);
};
}
function inverseFilters(value: any) {
for (const field in value) {
for (const operator in value[field]) {
@@ -410,11 +426,15 @@ export function applyFilter(
pkField = knex.raw(`CAST(?? AS CHAR(255))`, [pkField]);
}
if (isNegativeOperator(filterOperator)) {
if (filterOperator === '_none') {
dbQuery[logical].whereNotIn(pkField as string, subQueryBuilderMultiple(relation, filterValue as Filter));
} else if (filterOperator === '_some') {
dbQuery[logical].whereIn(pkField as string, subQueryBuilderMultiple(relation, filterValue as Filter));
} else if (isNegativeOperator(filterOperator)) {
inverseFilters(value);
dbQuery[logical].whereNotExists(callbackSubqueryRelation(relation, value));
dbQuery[logical].whereNotExists(subQueryBuilderSingle(relation, value));
} else {
dbQuery[logical].whereExists(callbackSubqueryRelation(relation, value));
dbQuery[logical].whereExists(subQueryBuilderSingle(relation, value));
}
}
}