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

WebsiteId query param. Fix Prisma filters.

Browse source
This commit is contained in:
Brian Cao 2023-01-11 11:01:44 -08:00
parent f654e6728c
commit b4bd988e4e
10 changed files with 62 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/prisma.ts
View file

@ -19,6 +19,18 @@ const POSTGRESQL_DATE_FORMATS = {
year: 'YYYY-01-01',
};
function toUuid(): string {
const db = getDatabaseType(process.env.DATABASE_URL);
if (db === POSTGRESQL) {
return '::uuid';
}
if (db === MYSQL) {
return '';
}
}
function getDateQuery(field: string, unit: string, timezone?: string): string {
const db = getDatabaseType(process.env.DATABASE_URL);
@ -173,7 +185,7 @@ function parseFilters(
event: { eventName },
joinSession:
os || browser || device || country
? `inner join session on ${sessionKey} = session.${sessionKey}`
? `inner join session on website_event.${sessionKey} = session.${sessionKey}`
: '',
filterQuery: getFilterQuery(filters, params),
};
@ -198,6 +210,7 @@ export default {
getFilterQuery,
getEventDataColumnsQuery,
getEventDataFilterQuery,
toUuid,
parseFilters,
rawQuery,
};