zias/stats
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(api): add parentheses around or statements in chart.service

Browse Source
This commit is contained in:
Carl-Gerhard Lindesvärd
2024-09-24 13:15:03 +02:00
parent 25a7365569
commit 0391552ef7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/db/src/services/chart.service.ts
View File

@@ -209,12 +209,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
.map((val) => `x LIKE ${escape(`%${String(val).trim()}%`)}`) .map((val) => `x LIKE ${escape(`%${String(val).trim()}%`)}`)
.join(' OR ')}, ${whereFrom})`; .join(' OR ')}, ${whereFrom})`;
} else { } else {
where[id] = value where[id] = `(${value
.map( .map(
(val) => (val) =>
`${whereFrom} LIKE ${escape(`%${String(val).trim()}%`)}`, `${whereFrom} LIKE ${escape(`%${String(val).trim()}%`)}`,
) )
.join(' OR '); .join(' OR ')})`;
} }
break; break;
} }
@@ -224,12 +224,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
.map((val) => `x NOT LIKE ${escape(`%${String(val).trim()}%`)}`) .map((val) => `x NOT LIKE ${escape(`%${String(val).trim()}%`)}`)
.join(' OR ')}, ${whereFrom})`; .join(' OR ')}, ${whereFrom})`;
} else { } else {
where[id] = value where[id] = `(${value
.map( .map(
(val) => (val) =>
`${whereFrom} NOT LIKE ${escape(`%${String(val).trim()}%`)}`, `${whereFrom} NOT LIKE ${escape(`%${String(val).trim()}%`)}`,
) )
.join(' OR '); .join(' OR ')})`;
} }
break; break;
} }
@@ -239,12 +239,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
.map((val) => `x LIKE ${escape(`${String(val).trim()}%`)}`) .map((val) => `x LIKE ${escape(`${String(val).trim()}%`)}`)
.join(' OR ')}, ${whereFrom})`; .join(' OR ')}, ${whereFrom})`;
} else { } else {
where[id] = value where[id] = `(${value
.map( .map(
(val) => (val) =>
`${whereFrom} LIKE ${escape(`${String(val).trim()}%`)}`, `${whereFrom} LIKE ${escape(`${String(val).trim()}%`)}`,
) )
.join(' OR '); .join(' OR ')})`;
} }
break; break;
} }
@@ -254,12 +254,12 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
.map((val) => `x LIKE ${escape(`%${String(val).trim()}`)}`) .map((val) => `x LIKE ${escape(`%${String(val).trim()}`)}`)
.join(' OR ')}, ${whereFrom})`; .join(' OR ')}, ${whereFrom})`;
} else { } else {
where[id] = value where[id] = `(${value
.map( .map(
(val) => (val) =>
`${whereFrom} LIKE ${escape(`%${String(val).trim()}`)}`, `${whereFrom} LIKE ${escape(`%${String(val).trim()}`)}`,
) )
.join(' OR '); .join(' OR ')})`;
} }
break; break;
} }
@@ -269,11 +269,11 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
.map((val) => `match(x, ${escape(String(val).trim())})`) .map((val) => `match(x, ${escape(String(val).trim())})`)
.join(' OR ')}, ${whereFrom})`; .join(' OR ')}, ${whereFrom})`;
} else { } else {
where[id] = value where[id] = `(${value
.map( .map(
(val) => `match(${whereFrom}, ${escape(String(val).trim())})`, (val) => `match(${whereFrom}, ${escape(String(val).trim())})`,
) )
.join(' OR '); .join(' OR ')})`;
} }
break; break;
} }