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

Cherry pick prisma query protection.

Browse source
This commit is contained in:
Brian Cao 2023-01-12 11:29:37 -08:00
parent 4c202741c2
commit 9a7385e4d5
9 changed files with 68 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/prisma.ts
View file

@ -54,7 +54,19 @@ function getClient(options) {
return prisma;
}
function getDateQuery(field, unit, timezone?): string {
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);
if (db === POSTGRESQL) {
@ -201,7 +213,7 @@ function parseFilters(
event: { event_name },
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),
};
@ -235,6 +247,7 @@ export default {
getFilterQuery,
getEventDataColumnsQuery,
getEventDataFilterQuery,
toUuid,
parseFilters,
rawQuery,
transaction,