mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-01 20:39:44 +01:00
add daydiff function query
This commit is contained in:
parent
27226d1b0e
commit
979ea33d74
@ -34,6 +34,18 @@ function getAddMinutesQuery(field: string, minutes: number): string {
|
||||
}
|
||||
}
|
||||
|
||||
function getDayDiffQuery(field1: string, field2: string): string {
|
||||
const db = getDatabaseType(process.env.DATABASE_URL);
|
||||
|
||||
if (db === POSTGRESQL) {
|
||||
return `${field1}::date - ${field2}::date`;
|
||||
}
|
||||
|
||||
if (db === MYSQL) {
|
||||
return `DATEDIFF(${field1}, ${field2});`;
|
||||
}
|
||||
}
|
||||
|
||||
function getDateQuery(field: string, unit: string, timezone?: string): string {
|
||||
const db = getDatabaseType();
|
||||
|
||||
@ -180,6 +192,7 @@ function getPageFilters(filters: SearchFilter<any>): [
|
||||
export default {
|
||||
...prisma,
|
||||
getAddMinutesQuery,
|
||||
getDayDiffQuery,
|
||||
getDateQuery,
|
||||
getTimestampIntervalQuery,
|
||||
getFilterQuery,
|
||||
|
@ -33,7 +33,7 @@ async function relationalQuery(
|
||||
}[]
|
||||
> {
|
||||
const { startDate, endDate } = dateRange;
|
||||
const { getDateQuery, rawQuery } = prisma;
|
||||
const { getDateQuery, getDayDiffQuery, rawQuery } = prisma;
|
||||
const timezone = 'utc';
|
||||
const unit = 'day';
|
||||
|
||||
@ -49,7 +49,10 @@ async function relationalQuery(
|
||||
user_activities AS (
|
||||
select distinct
|
||||
w.session_id,
|
||||
(${getDateQuery('created_at', unit, timezone)}::date - c.cohort_date::date) as day_number
|
||||
(${getDayDiffQuery(
|
||||
getDateQuery('created_at', unit, timezone),
|
||||
'c.cohort_date',
|
||||
)}) as day_number
|
||||
from website_event w
|
||||
join cohort_items c
|
||||
on w.session_id = c.session_id
|
||||
|
Loading…
Reference in New Issue
Block a user