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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Mike Cao
2023-03-08 16:38:12 -08:00
parent 696d9c978c bb2cd93ad4
commit fcf51d9727
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
db/postgresql/migrations/01_init/migration.sql
View File

@@ -56,6 +56,7 @@ CREATE TABLE "website_event" (
"referrer" VARCHAR(500), "referrer" VARCHAR(500),
"event_type" INTEGER NOT NULL DEFAULT 1, "event_type" INTEGER NOT NULL DEFAULT 1,
"event_name" VARCHAR(50), "event_name" VARCHAR(50),
"event_data" JSONB,
CONSTRAINT "website_event_pkey" PRIMARY KEY ("event_id") CONSTRAINT "website_event_pkey" PRIMARY KEY ("event_id")
); );

6
queries/analytics/pageview/getPageviewMetrics.ts
View File

@@ -52,7 +52,8 @@ async function relationalQuery(
and event_type = $4 and event_type = $4
${filterQuery} ${filterQuery}
group by 1 group by 1
order by 2 desc`, order by 2 desc
limit 200`,
params, params,
); );
} }
@@ -86,7 +87,8 @@ async function clickhouseQuery(
and ${getBetweenDates('created_at', startDate, endDate)} and ${getBetweenDates('created_at', startDate, endDate)}
${filterQuery} ${filterQuery}
group by x group by x
order by y desc`, order by y desc
limit 200`,
params, params,
); );
} }

6
queries/analytics/session/getSessionMetrics.ts
View File

@@ -39,7 +39,8 @@ async function relationalQuery(
${filterQuery} ${filterQuery}
) )
group by 1 group by 1
order by 2 desc`, order by 2 desc
limit 200`,
params, params,
); );
} }
@@ -63,7 +64,8 @@ async function clickhouseQuery(
and ${getBetweenDates('created_at', startDate, endDate)} and ${getBetweenDates('created_at', startDate, endDate)}
${filterQuery} ${filterQuery}
group by x group by x
order by y desc`, order by y desc
limit 200`,
params, params,
); );
} }