github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-01 00:18:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3483 from apstanisic/reverse-comparisson

Browse Source 
Enable reversing _null, _nnull, _empty and _nempty
This commit is contained in:
Rijk van Zanten
2020-12-21 08:25:56 -05:00
committed by GitHub
parent 9f58589a43 9c1308b8b6
commit 64111ef282
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/utils/apply-query.ts
View File

@@ -193,22 +193,22 @@ export async function applyFilter(knex: Knex, rootQuery: QueryBuilder, rootFilte
dbQuery[logical].whereNotIn(key, value as string[]);
}
if (operator === '_null') {
if (operator === '_null' || (operator === '_nnull' && compareValue === false)) {
dbQuery[logical].whereNull(key);
}
if (operator === '_nnull') {
if (operator === '_nnull' || (operator === '_null' && compareValue === false)) {
dbQuery[logical].whereNotNull(key);
}
if (operator === '_empty') {
if (operator === '_empty' || (operator === '_nempty' && compareValue === false)) {
dbQuery[logical].andWhere((query) => {
query.whereNull(key);
query.orWhere(key, '=', '');
});
}
if (operator === '_nempty') {
if (operator === '_nempty' || (operator === '_empty' && compareValue === false)) {
dbQuery[logical].andWhere((query) => {
query.whereNotNull(key);
query.orWhere(key, '!=', '');