github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor filter handling for queries.

Browse Source
This commit is contained in:
Mike Cao
2025-07-02 01:44:12 -07:00
parent 5b300f1ff5
commit ee6c68d27c
107 changed files with 731 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/queries/sql/reports/getRetention.ts
View File

@@ -31,7 +31,7 @@ async function relationalQuery(
const { getDateSQL, getDayDiffQuery, getCastColumnQuery, rawQuery, parseFilters } = prisma;
const unit = 'day';
const { filterQuery, filterParams } = await parseFilters(websiteId, criteria);
const { filterQuery, queryParams } = await parseFilters(criteria);
return rawQuery(
`
@@ -85,7 +85,7 @@ async function relationalQuery(
websiteId,
startDate,
endDate,
...filterParams,
...queryParams,
},
);
}
@@ -98,7 +98,7 @@ async function clickhouseQuery(
const { getDateSQL, rawQuery, parseFilters } = clickhouse;
const unit = 'day';
const { filterQuery, filterParams } = await parseFilters(websiteId, criteria);
const { filterQuery, queryParams } = await parseFilters(criteria);
return rawQuery(
`
@@ -154,7 +154,7 @@ async function clickhouseQuery(
websiteId,
startDate,
endDate,
...filterParams,
...queryParams,
},
);
}