watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add table alias to filterQuery. Closed  #3869
Some checks are pending
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Details

Browse source
This commit is contained in:
Francis Cao 2025-12-19 13:32:20 -08:00
parent 86d2672c47
commit 3072f02f1b
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/prisma.ts
View file

@ -74,15 +74,21 @@ function getSearchSQL(column: string, param: string = 'search'): string {
function mapFilter(column: string, operator: string, name: string, type: string = '') {
const value = `{{${name}${type ? `::${type}` : ''}}}`;
if (name.startsWith('cohort_')) {
name = name.slice('cohort_'.length);
}
const table = SESSION_COLUMNS.includes(name) ? 'session' : 'website_event';
switch (operator) {
case OPERATORS.equals:
return `${column} = ${value}`;
return `${table}.${column} = ${value}`;
case OPERATORS.notEquals:
return `${column} != ${value}`;
return `${table}.${column} != ${value}`;
case OPERATORS.contains:
return `${column} ilike ${value}`;
return `${table}.${column} ilike ${value}`;
case OPERATORS.doesNotContain:
return `${column} not ilike ${value}`;
return `${table}.${column} not ilike ${value}`;
default:
return '';
}

3
src/queries/sql/reports/getRevenue.ts
View file

@ -41,7 +41,8 @@ async function relationalQuery(
currency,
});
const joinQuery = filterQuery
const joinQuery =
filterQuery || cohortQuery
? `join website_event
on website_event.website_id = revenue.website_id
and website_event.session_id = revenue.session_id