watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-20 12:35:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add sql param logic.

Browse source
This commit is contained in:
Brian Cao 2023-01-16 12:58:51 -08:00
parent cc46cfdcbf
commit d93c2f9dd7
9 changed files with 46 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
queries/analytics/event/getEventData.js
View file

@ -10,8 +10,8 @@ export async function getEventData(...args) {
}
async function relationalQuery(websiteId, { startDate, endDate, event_name, columns, filters }) {
const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;
const params = [startDate, endDate];
const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery, toUuid } = prisma;
const params = [websiteId, startDate, endDate];
return rawQuery(
`select
@ -21,8 +21,8 @@ async function relationalQuery(websiteId, { startDate, endDate, event_name, colu
on event.website_id = website.website_id
join event_data
on event.event_id = event_data.event_id
where website_uuid='${websiteId}'
and event.created_at between $1 and $2
where website_uuid = $1${toUuid()}
and event.created_at between $2 and $3
${event_name ? `and event_name = ${event_name}` : ''}
${
Object.keys(filters).length > 0

8
queries/analytics/event/getEventMetrics.js
View file

@ -17,8 +17,8 @@ async function relationalQuery(
unit = 'day',
filters = {},
) {
const { rawQuery, getDateQuery, getFilterQuery } = prisma;
const params = [start_at, end_at];
const { rawQuery, getDateQuery, getFilterQuery, toUuid } = prisma;
const params = [websiteId, start_at, end_at];
return rawQuery(
`select
@ -28,8 +28,8 @@ async function relationalQuery(
from event
join website
on event.website_id = website.website_id
where website_uuid='${websiteId}'
and event.created_at between $1 and $2
where website_uuid = $1${toUuid()}
and event.created_at between $2 and $3
${getFilterQuery('event', filters, params)}
group by 1, 2
order by 2`,