ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move parameters to param injection.

pull/1745/head
Brian Cao 2023-01-17 00:20:18 -08:00
parent dd2d9dc3f5
commit 509739fc9a
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/prisma.js
View File

@ -97,11 +97,13 @@ function getTimestampInterval(field) {
} }
} }
function getJsonField(column, property, isNumber) { function getJsonField(column, property, isNumber, params) {
const db = getDatabaseType(process.env.DATABASE_URL); const db = getDatabaseType(process.env.DATABASE_URL);
if (db === POSTGRESQL) { if (db === POSTGRESQL) {
let accessor = `${column} ->> '${property}'`; params.push(property);
let accessor = `${column} ->> $${params.length}`;
if (isNumber) { if (isNumber) {
accessor = `CAST(${accessor} AS DECIMAL)`; accessor = `CAST(${accessor} AS DECIMAL)`;
@ -111,21 +113,31 @@ function getJsonField(column, property, isNumber) {
} }
if (db === MYSQL) { if (db === MYSQL) {
return `${column} ->> "$.${property}"`; params.push(`$.?${params.length}`);
return `${column} ->> ${params.length}`;
} }
} }
function getEventDataColumnsQuery(column, columns) { function getEventDataColumnsQuery(column, columns, params) {
const query = Object.keys(columns).reduce((arr, key) => { const query = Object.keys(columns).reduce((arr, key, i) => {
const filter = columns[key]; const filter = columns[key];
if (filter === undefined) { if (filter === undefined) {
return arr; return arr;
} }
const isNumber = ['sum', 'avg', 'min', 'max'].some(a => a === filter); switch (filter) {
case 'sum':
arr.push(`${filter}(${getJsonField(column, key, isNumber)}) as "${filter}(${key})"`); case 'svg':
case 'min':
case 'max':
arr.push(`${filter}(${getJsonField(column, key, true, params)}) as "${i}"`);
break;
case 'count':
arr.push(`${filter}(${getJsonField(column, key, false, params)}) as "${i}"`);
break;
}
return arr; return arr;
}, []); }, []);
@ -133,7 +145,7 @@ function getEventDataColumnsQuery(column, columns) {
return query.join(',\n'); return query.join(',\n');
} }
function getEventDataFilterQuery(column, filters) { function getEventDataFilterQuery(column, filters, params) {
const query = Object.keys(filters).reduce((arr, key) => { const query = Object.keys(filters).reduce((arr, key) => {
const filter = filters[key]; const filter = filters[key];
@ -143,11 +155,9 @@ function getEventDataFilterQuery(column, filters) {
const isNumber = filter && typeof filter === 'number'; const isNumber = filter && typeof filter === 'number';
arr.push( arr.push(`${getJsonField(column, key, isNumber, params)} = $${params.length + 1}`);
`${getJsonField(column, key, isNumber)} = ${
typeof filter === 'string' ? `'${filter}'` : filter params.push(filter);
}`,
);
return arr; return arr;
}, []); }, []);

27
queries/analytics/event/getEventData.js
View File

@ -13,9 +13,20 @@ async function relationalQuery(websiteId, { startDate, endDate, event_name, colu
const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery, toUuid } = prisma; const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery, toUuid } = prisma;
const params = [websiteId, startDate, endDate]; const params = [websiteId, startDate, endDate];
if (event_name) {
params.push(event_name);
}
const columnQuery = getEventDataColumnsQuery('event_data.event_data', columns, params);
const filterQuery =
Object.keys(filters).length > 0
? `and ${getEventDataFilterQuery('event_data.event_data', filters, params)}`
: '';
return rawQuery( return rawQuery(
`select `select
${getEventDataColumnsQuery('event_data.event_data', columns)} ${columnQuery}
from event from event
join website join website
on event.website_id = website.website_id on event.website_id = website.website_id
@ -23,16 +34,14 @@ async function relationalQuery(websiteId, { startDate, endDate, event_name, colu
on event.event_id = event_data.event_id on event.event_id = event_data.event_id
where website_uuid = $1${toUuid()} where website_uuid = $1${toUuid()}
and event.created_at between $2 and $3 and event.created_at between $2 and $3
${event_name ? `and event_name = ${event_name}` : ''} ${event_name ? `and event_name = $4` : ''}
${ ${filterQuery}`,
Object.keys(filters).length > 0
? `and ${getEventDataFilterQuery('event_data.event_data', filters)}`
: ''
}`,
params, params,
).then(results => { ).then(results => {
return Object.keys(results[0]).map(a => { const fields = Object.keys(columns);
return { x: a, y: results[0][`${a}`] };
return Object.keys(results[0]).map((a, i) => {
return { x: `${columns[fields[i]]}(${fields[i]})`, y: results[0][i] };
}); });
}); });
} }