From 0391552ef7487e7c1c338d6a5149028148557b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= Date: Tue, 24 Sep 2024 13:15:03 +0200 Subject: [PATCH] fix(api): add parentheses around or statements in chart.service --- packages/db/src/services/chart.service.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/db/src/services/chart.service.ts b/packages/db/src/services/chart.service.ts index 111f5610..c2ae3c3a 100644 --- a/packages/db/src/services/chart.service.ts +++ b/packages/db/src/services/chart.service.ts @@ -209,12 +209,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) { .map((val) => `x LIKE ${escape(`%${String(val).trim()}%`)}`) .join(' OR ')}, ${whereFrom})`; } else { - where[id] = value + where[id] = `(${value .map( (val) => `${whereFrom} LIKE ${escape(`%${String(val).trim()}%`)}`, ) - .join(' OR '); + .join(' OR ')})`; } break; } @@ -224,12 +224,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) { .map((val) => `x NOT LIKE ${escape(`%${String(val).trim()}%`)}`) .join(' OR ')}, ${whereFrom})`; } else { - where[id] = value + where[id] = `(${value .map( (val) => `${whereFrom} NOT LIKE ${escape(`%${String(val).trim()}%`)}`, ) - .join(' OR '); + .join(' OR ')})`; } break; } @@ -239,12 +239,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) { .map((val) => `x LIKE ${escape(`${String(val).trim()}%`)}`) .join(' OR ')}, ${whereFrom})`; } else { - where[id] = value + where[id] = `(${value .map( (val) => `${whereFrom} LIKE ${escape(`${String(val).trim()}%`)}`, ) - .join(' OR '); + .join(' OR ')})`; } break; } @@ -254,12 +254,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) { .map((val) => `x LIKE ${escape(`%${String(val).trim()}`)}`) .join(' OR ')}, ${whereFrom})`; } else { - where[id] = value + where[id] = `(${value .map( (val) => `${whereFrom} LIKE ${escape(`%${String(val).trim()}`)}`, ) - .join(' OR '); + .join(' OR ')})`; } break; } @@ -269,11 +269,11 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) { .map((val) => `match(x, ${escape(String(val).trim())})`) .join(' OR ')}, ${whereFrom})`; } else { - where[id] = value + where[id] = `(${value .map( (val) => `match(${whereFrom}, ${escape(String(val).trim())})`, ) - .join(' OR '); + .join(' OR ')})`; } break; }