watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' into jajaja

Browse source
This commit is contained in:
Mike Cao 2025-06-25 14:49:36 -07:00
commit b0023feee9
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/queries/sql/events/getWebsiteEvents.ts
View file

@ -24,7 +24,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
return pagedRawQuery( return pagedRawQuery(
` `
with events as (
select select
event_id as "id", event_id as "id",
website_id as "websiteId", website_id as "websiteId",
@ -49,8 +48,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
: '' : ''
} }
order by created_at desc order by created_at desc
limit 1000)
select * from events
`, `,
{ ...params, search: `%${search}%` }, { ...params, search: `%${search}%` },
pageParams, pageParams,
@ -64,7 +61,6 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
return pagedQuery( return pagedQuery(
` `
with events as (
select select
event_id as id, event_id as id,
website_id as websiteId, website_id as websiteId,
@ -89,8 +85,6 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
: '' : ''
} }
order by created_at desc order by created_at desc
limit 1000)
select * from events
`, `,
{ ...params, search }, { ...params, search },
pageParams, pageParams,

6
src/queries/sql/sessions/getWebsiteSessions.ts
View file

@ -24,7 +24,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
return pagedRawQuery( return pagedRawQuery(
` `
with sessions as (
select select
session.session_id as "id", session.session_id as "id",
session.website_id as "websiteId", session.website_id as "websiteId",
@ -68,8 +67,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
session.region, session.region,
session.city session.city
order by max(website_event.created_at) desc order by max(website_event.created_at) desc
limit 1000)
select * from sessions
`, `,
{ ...params, search: `%${search}%` }, { ...params, search: `%${search}%` },
pageParams, pageParams,
@ -83,7 +80,6 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
return pagedQuery( return pagedQuery(
` `
with sessions as (
select select
session_id as id, session_id as id,
website_id as websiteId, website_id as websiteId,
@ -116,8 +112,6 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
} }
group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, city group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, city
order by lastAt desc order by lastAt desc
limit 1000)
select * from sessions
`, `,
{ ...params, search }, { ...params, search },
pageParams, pageParams,