github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into brian/um-16-clickhouse-support

Browse Source
This commit is contained in:
Brian Cao
2022-07-22 17:03:42 -07:00
parent 65910c7348 6f92677f10
commit 304314fff0
114 changed files with 1474 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/db.js
View File

@@ -30,17 +30,7 @@ function logQuery(e) {
}
function initializePrisma(options) {
let prisma;
if (process.env.NODE_ENV === 'production') {
prisma = new PrismaClient(options);
} else {
if (!global.prisma) {
global.prisma = new PrismaClient(options);
}
prisma = global.prisma;
}
const prisma = new PrismaClient(options);
if (process.env.LOG_QUERY) {
prisma.$on('query', logQuery);
@@ -55,7 +45,6 @@ function initializeClickhouse() {
}
const url = new URL(process.env.ANALYTICS_URL);
const database = url.pathname.replace('/', '');
return new ClickHouse({
@@ -74,10 +63,13 @@ function initializeClickhouse() {
});
}
const prisma = initializePrisma(options);
const clickhouse = initializeClickhouse();
const prisma = global.prisma || initializePrisma(options);
const clickhouse = global.clickhouse || initializeClickhouse();
console.log('clickhouse1: ', clickhouse);
if (process.env.NODE_ENV !== 'production') {
global.prisma = prisma;
global.clickhouse = clickhouse;
}
export { prisma, clickhouse };
@@ -109,18 +101,6 @@ export function getAnalyticsDatabase() {
return type;
}
export function getDateStringQuery(data, unit) {
const db = getDatabase();
if (db === POSTGRESQL) {
return `to_char(${data}, '${POSTGRESQL_DATE_FORMATS[unit]}')`;
}
if (db === MYSQL) {
return `DATE_FORMAT(${data}, '${MYSQL_DATE_FORMATS[unit]}')`;
}
}
export function getDateStringQueryClickhouse(data, unit) {
return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;
}
@@ -130,19 +110,19 @@ export function getDateQuery(field, unit, timezone) {
if (db === POSTGRESQL) {
if (timezone) {
return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
}
return `date_trunc('${unit}', ${field})`;
return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
}
if (db === MYSQL) {
if (timezone) {
const tz = moment.tz(timezone).format('Z');
return `convert_tz(${field},'+00:00','${tz}')`;
return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
}
return `${field}`;
return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
}
}
@@ -174,7 +154,7 @@ export function getTimestampInterval(maxColumn, minColumn) {
}
}
export function getFilterQuery(table, filters = {}, params = []) {
export function getFilterQuery(table, column, filters = {}, params = []) {
const query = Object.keys(filters).reduce((arr, key) => {
const value = filters[key];
@@ -230,7 +210,7 @@ export function getFilterQuery(table, filters = {}, params = []) {
return query.join('\n');
}
export function parseFilters(table, filters = {}, params = [], sessionKey = 'session_id') {
export function parseFilters(table, column, filters = {}, params = [], sessionKey = 'session_id') {
const { domain, url, event_url, referrer, os, browser, device, country, event_type } = filters;
const pageviewFilters = { domain, url, referrer };
@@ -246,9 +226,9 @@ export function parseFilters(table, filters = {}, params = [], sessionKey = 'ses
os || browser || device || country
? `inner join session on ${table}.${sessionKey} = session.${sessionKey}`
: '',
pageviewQuery: getFilterQuery('pageview', pageviewFilters, params),
sessionQuery: getFilterQuery('session', sessionFilters, params),
eventQuery: getFilterQuery('event', eventFilters, params),
pageviewQuery: getFilterQuery('pageview', column, pageviewFilters, params),
sessionQuery: getFilterQuery('session', column, sessionFilters, params),
eventQuery: getFilterQuery('event', column, eventFilters, params),
};
}