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

Removed output parsing for clickhouse.

Browse source
This commit is contained in:
Mike Cao 2025-02-08 20:08:36 -08:00
parent 592708eafd
commit 7a0575e33a
9 changed files with 20 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,9 +86,5 @@ async function clickhouseQuery(
`;
}
return rawQuery(sql, params).then(a => {
return Object.values(a).map(a => {
return { x: a.x, t: a.t, y: Number(a.y) };
});
});
return rawQuery(sql, params);
}

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

@ -30,9 +30,5 @@ function clickhouseQuery(
startDate,
endDate,
},
).then(a => {
return Object.values(a).map(a => {
return { websiteId: a.websiteId, count: Number(a.count) };
});
});
);
}

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

@ -14,7 +14,7 @@ export function getWebsiteEvents(
async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedRawQuery, parseFilters } = prisma;
const { query } = pageParams;
const { search } = pageParams;
const { filterQuery, params } = await parseFilters(websiteId, {
...filters,
});
@ -43,16 +43,16 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
and created_at between {{startDate}} and {{endDate}}
${filterQuery}
${
query
? `and ((event_name ${like} {{query}} and event_type = 2)
or (url_path ${like} {{query}} and event_type = 1))`
search
? `and ((event_name ${like} {{search}} and event_type = 2)
or (url_path ${like} {{search}} and event_type = 1))`
: ''
}
order by created_at desc
limit 1000)
select * from events
`,
{ ...params, query: `%${query}%` },
{ ...params, query: `%${search}%` },
pageParams,
);
}
@ -60,7 +60,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedQuery, parseFilters } = clickhouse;
const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
const { query } = pageParams;
const { search } = pageParams;
return pagedQuery(
`
@ -83,16 +83,16 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
${dateQuery}
${filterQuery}
${
query
? `and ((positionCaseInsensitive(event_name, {query:String}) > 0 and event_type = 2)
or (positionCaseInsensitive(url_path, {query:String}) > 0 and event_type = 1))`
search
? `and ((positionCaseInsensitive(event_name, {search:String}) > 0 and event_type = 2)
or (positionCaseInsensitive(url_path, {search:String}) > 0 and event_type = 1))`
: ''
}
order by created_at desc
limit 1000)
select * from events
`,
{ ...params, query },
{ ...params, search },
pageParams,
);
}