watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2380 from Maxime-J/stats

Browse source 
Match cloud stats in self hosted
This commit is contained in:
Mike Cao 2023-11-30 15:47:34 -10:00 • committed by GitHub
commit 5c8941bba2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/prisma.ts
View file

@ -23,15 +23,15 @@ const POSTGRESQL_DATE_FORMATS = {
year: 'YYYY-01-01',
};
function getAddMinutesQuery(field: string, minutes: number): string {
function getAddIntervalQuery(field: string, interval: string): string {
const db = getDatabaseType(process.env.DATABASE_URL);
if (db === POSTGRESQL) {
return `${field} + interval '${minutes} minute'`;
return `${field} + interval '${interval}'`;
}
if (db === MYSQL) {
return `DATE_ADD(${field}, interval ${minutes} minute)`;
return `DATE_ADD(${field}, interval ${interval})`;
}
}
@ -80,15 +80,15 @@ function getDateQuery(field: string, unit: string, timezone?: string): string {
}
}
function getTimestampIntervalQuery(field: string): string {
function getTimestampDiffQuery(field1: string, field2: string): string {
const db = getDatabaseType();
if (db === POSTGRESQL) {
return `floor(extract(epoch from max(${field}) - min(${field})))`;
return `floor(extract(epoch from (${field2} - ${field1})))`;
}
if (db === MYSQL) {
return `floor(unix_timestamp(max(${field})) - unix_timestamp(min(${field})))`;
return `timestampdiff(second, ${field1}, ${field2})`;
}
}
@ -216,11 +216,11 @@ function getSearchMode(): { mode?: Prisma.QueryMode } {
export default {
...prisma,
getAddMinutesQuery,
getAddIntervalQuery,
getDayDiffQuery,
getCastColumnQuery,
getDateQuery,
getTimestampIntervalQuery,
getTimestampDiffQuery,
getFilterQuery,
parseFilters,
getPageFilters,