Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
split db files
Brian Caobb507537046e
diff --git a/db/clickhouse/migrations/01_init/migration.sql b/db/clickhouse/migrations/01_init/migration.sqlindex d83ebdab6..7794c6fd1 100644--- a/db/clickhouse/migrations/01_init/migration.sql+++ b/db/clickhouse/migrations/01_init/migration.sql@@ -19,7 +19,7 @@ CREATE TABLE pageview_queue (referrer String)ENGINE = Kafka-SETTINGS kafka_broker_list = 'localhost:9092,localhost:9093,localhost:9094', -- input broker list+SETTINGS kafka_broker_list = 'dev-01.umami.dev:9092,dev-01.umami.dev:9093,dev-01.umami.dev:9094', -- input broker listkafka_topic_list = 'pageview',kafka_group_name = 'pageview_consumer_group',kafka_format = 'JSONEachRow',@@ -65,7 +65,7 @@ CREATE TABLE session_queue (country LowCardinality(String))ENGINE = Kafka-SETTINGS kafka_broker_list = 'localhost:9092,localhost:9093,localhost:9094', -- input broker list+SETTINGS kafka_broker_list = 'dev-01.umami.dev:9092,dev-01.umami.dev:9093,dev-01.umami.dev:9094', -- input broker listkafka_topic_list = 'session',kafka_group_name = 'session_consumer_group',kafka_format = 'JSONEachRow',@@ -110,7 +110,7 @@ CREATE TABLE event_queue (event_data String)ENGINE = Kafka-SETTINGS kafka_broker_list = 'localhost:9092,localhost:9093,localhost:9094', -- input broker list+SETTINGS kafka_broker_list = 'dev-01.umami.dev:9092,dev-01.umami.dev:9093,dev-01.umami.dev:9094', -- input broker listkafka_topic_list = 'event',kafka_group_name = 'event_consumer_group',kafka_format = 'JSONEachRow',diff --git a/lib/clickhouse.js b/lib/clickhouse.jsnew file mode 100644index 000000000..3eea9f484--- /dev/null+++ b/lib/clickhouse.js@@ -0,0 +1,173 @@+import { ClickHouse } from 'clickhouse';+import dateFormat from 'dateformat';+import { FILTER_IGNORED } from 'lib/constants';+import { CLICKHOUSE_DATE_FORMATS } from './constants';++function getClient() {+ if (!process.env.ANALYTICS_URL) {+ return null;+ }++ const url = new URL(process.env.ANALYTICS_URL);+ const database = url.pathname.replace('/', '');++ return new ClickHouse({+ url: url.hostname,+ port: Number(url.port),+ basicAuth: url.password+ ? {+ username: url.username || 'default',+ password: url.password,+ }+ : null,+ format: 'json',+ config: {+ database,+ },+ });+}++const clickhouse = global.clickhouse || getClient();++if (process.env.NODE_ENV !== 'production') {+ global.clickhouse = clickhouse;+}++export { clickhouse };++export function getDateStringQuery(data, unit) {+ return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;+}++export function getDateQuery(field, unit, timezone) {+ if (timezone) {+ return `date_trunc('${unit}', ${field}, '${timezone}')`;+ }+ return `date_trunc('${unit}', ${field})`;+}++export function getDateFormat(date) {+ return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;+}++export function getBetweenDates(field, start_at, end_at) {+ return `${field} between ${getDateFormat(start_at)}+ and ${getDateFormat(end_at)}`;+}++export function getFilterQuery(table, column, filters = {}, params = []) {+ const query = Object.keys(filters).reduce((arr, key) => {+ const filter = filters[key];++ if (filter === undefined || filter === FILTER_IGNORED) {+ return arr;+ }++ switch (key) {+ case 'url':+ if (table === 'pageview' || table === 'event') {+ arr.push(`and ${table}.${key}=$${params.length + 1}`);+ params.push(decodeURIComponent(filter));+ }+ break;++ case 'os':+ case 'browser':+ case 'device':+ case 'country':+ if (table === 'session') {+ arr.push(`and ${table}.${key}=$${params.length + 1}`);+ params.push(decodeURIComponent(filter));+ }+ break;++ case 'event_name':+ if (table === 'event') {+ arr.push(`and ${table}.${key}=$${params.length + 1}`);+ params.push(decodeURIComponent(filter));+ }+ break;++ case 'referrer':+ if (table === 'pageview' || table === 'event') {+ arr.push(`and ${table}.referrer like $${params.length + 1}`);+ params.push(`%${decodeURIComponent(filter)}%`);+ }+ break;++ case 'domain':+ if (table === 'pageview') {+ arr.push(`and ${table}.referrer not like $${params.length + 1}`);+ arr.push(`and ${table}.referrer not like '/%'`);+ params.push(`%://${filter}/%`);+ }+ break;++ case 'query':+ if (table === 'pageview') {+ arr.push(`and ${table}.url like '%?%'`);+ }+ }++ return arr;+ }, []);++ return query.join('\n');+}++export function parseFilters(table, column, filters = {}, params = [], sessionKey = 'session_id') {+ const { domain, url, event_url, referrer, os, browser, device, country, event_name, query } =+ filters;++ const pageviewFilters = { domain, url, referrer, query };+ const sessionFilters = { os, browser, device, country };+ const eventFilters = { url: event_url, event_name };++ return {+ pageviewFilters,+ sessionFilters,+ eventFilters,+ event: { event_name },+ joinSession:+ os || browser || device || country+ ? `inner join session on ${table}.${sessionKey} = session.${sessionKey}`+ : '',+ pageviewQuery: getFilterQuery('pageview', column, pageviewFilters, params),+ sessionQuery: getFilterQuery('session', column, sessionFilters, params),+ eventQuery: getFilterQuery('event', column, eventFilters, params),+ };+}++export function replaceQuery(string, params = []) {+ let formattedString = string;++ params.forEach((a, i) => {+ let replace = a;++ if (typeof a === 'string' || a instanceof String) {+ replace = `'${replace}'`;+ }++ formattedString = formattedString.replace(`$${i + 1}`, replace);+ });++ return formattedString;+}++export async function rawQuery(query, params = [], debug = false) {+ let formattedQuery = replaceQuery(query, params);++ if (debug || process.env.LOG_QUERY) {+ console.log(formattedQuery);+ }++ return clickhouse.query(formattedQuery).toPromise();+}++export async function findUnique(data) {+ if (data.length > 1) {+ throw `${data.length} records found when expecting 1.`;+ }++ return data[0] ?? null;+}diff --git a/lib/db.js b/lib/db.jsindex 30fa79f68..06443074c 100644--- a/lib/db.js+++ b/lib/db.js@@ -1,305 +1,33 @@-import { PrismaClient } from '@prisma/client';-import { ClickHouse } from 'clickhouse';-import dateFormat from 'dateformat';-import chalk from 'chalk';-import { getKafkaService } from './db/kafka';-import {- MYSQL,- MYSQL_DATE_FORMATS,- POSTGRESQL,- POSTGRESQL_DATE_FORMATS,- CLICKHOUSE,- RELATIONAL,- FILTER_IGNORED,- KAFKA,-} from 'lib/constants';-import moment from 'moment-timezone';-import { CLICKHOUSE_DATE_FORMATS } from './constants';+import { POSTGRESQL, RELATIONAL, MYSQL, KAFKA } from 'lib/constants';+import { CLICKHOUSE } from 'lib/constants';BigInt.prototype.toJSON = function () {return Number(this);};-const options = {- log: [- {- emit: 'event',- level: 'query',- },- ],-};--function logQuery(e) {- console.log(chalk.yellow(e.params), '->', e.query, chalk.greenBright(`${e.duration}ms`));-}--function getPrismaClient(options) {- const prisma = new PrismaClient(options);-- if (process.env.LOG_QUERY) {- prisma.$on('query', logQuery);- }-- return prisma;-}--function getClickhouseClient() {- if (!process.env.ANALYTICS_URL) {- return null;- }-- const url = new URL(process.env.ANALYTICS_URL);- const database = url.pathname.replace('/', '');-- return new ClickHouse({- url: url.hostname,- port: Number(url.port),- basicAuth: url.password- ? {- username: url.username || 'default',- password: url.password,- }- : null,- format: 'json',- config: {- database,- },- });-}--const prisma = global.prisma || getPrismaClient(options);-const clickhouse = global.clickhouse || getClickhouseClient();--if (process.env.NODE_ENV !== 'production') {- global.prisma = prisma;- global.clickhouse = clickhouse;-}--export { prisma, clickhouse };--export function getDatabase() {- const type =- process.env.DATABASE_TYPE ||- (process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]);-- if (type === 'postgres') {- return POSTGRESQL;- }-- return type;-}--export function getAnalyticsDatabase() {- const type = process.env.ANALYTICS_URL && process.env.ANALYTICS_URL.split(':')[0];+export function getDatabase(database, databaseType, fallback) {+ const type = databaseType || (database && database.split(':')[0]);if (type === 'postgres') {return POSTGRESQL;}if (!type) {- return getDatabase();+ return getDatabase(fallback);}return type;}-export function getDateStringQueryClickhouse(data, unit) {- return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;-}--export function getDateQuery(field, unit, timezone) {- const db = getDatabase();-- if (db === POSTGRESQL) {- if (timezone) {- return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;- }- return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;- }-- if (db === MYSQL) {- if (timezone) {- const tz = moment.tz(timezone).format('Z');-- return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;- }-- return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;- }-}--export function getDateQueryClickhouse(field, unit, timezone) {- if (timezone) {- return `date_trunc('${unit}', ${field}, '${timezone}')`;- }- return `date_trunc('${unit}', ${field})`;-}--export function getDateFormatClickhouse(date) {- return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;-}--export function getBetweenDatesClickhouse(field, start_at, end_at) {- return `${field} between ${getDateFormatClickhouse(start_at)}- and ${getDateFormatClickhouse(end_at)}`;-}--export function getTimestampInterval(field) {- const db = getDatabase();-- if (db === POSTGRESQL) {- return `floor(extract(epoch from max(${field}) - min(${field})))`;- }-- if (db === MYSQL) {- return `floor(unix_timestamp(max(${field})) - unix_timestamp(min(${field})))`;- }-}--export function getFilterQuery(table, column, filters = {}, params = []) {- const query = Object.keys(filters).reduce((arr, key) => {- const filter = filters[key];-- if (filter === undefined || filter === FILTER_IGNORED) {- return arr;- }-- switch (key) {- case 'url':- if (table === 'pageview' || table === 'event') {- arr.push(`and ${table}.${key}=$${params.length + 1}`);- params.push(decodeURIComponent(filter));- }- break;-- case 'os':- case 'browser':- case 'device':- case 'country':- if (table === 'session') {- arr.push(`and ${table}.${key}=$${params.length + 1}`);- params.push(decodeURIComponent(filter));- }- break;-- case 'event_name':- if (table === 'event') {- arr.push(`and ${table}.${key}=$${params.length + 1}`);- params.push(decodeURIComponent(filter));- }- break;-- case 'referrer':- if (table === 'pageview' || table === 'event') {- arr.push(`and ${table}.referrer like $${params.length + 1}`);- params.push(`%${decodeURIComponent(filter)}%`);- }- break;-- case 'domain':- if (table === 'pageview') {- arr.push(`and ${table}.referrer not like $${params.length + 1}`);- arr.push(`and ${table}.referrer not like '/%'`);- params.push(`%://${filter}/%`);- }- break;-- case 'query':- if (table === 'pageview') {- arr.push(`and ${table}.url like '%?%'`);- }- }-- return arr;- }, []);-- return query.join('\n');-}--export function parseFilters(table, column, filters = {}, params = [], sessionKey = 'session_id') {- const { domain, url, event_url, referrer, os, browser, device, country, event_name, query } =- filters;-- const pageviewFilters = { domain, url, referrer, query };- const sessionFilters = { os, browser, device, country };- const eventFilters = { url: event_url, event_name };-- return {- pageviewFilters,- sessionFilters,- eventFilters,- event: { event_name },- joinSession:- os || browser || device || country- ? `inner join session on ${table}.${sessionKey} = session.${sessionKey}`- : '',- pageviewQuery: getFilterQuery('pageview', column, pageviewFilters, params),- sessionQuery: getFilterQuery('session', column, sessionFilters, params),- eventQuery: getFilterQuery('event', column, eventFilters, params),- };-}--export function replaceQueryClickhouse(string, params = []) {- let formattedString = string;-- params.forEach((a, i) => {- let replace = a;-- if (typeof a === 'string' || a instanceof String) {- replace = `'${replace}'`;- }-- formattedString = formattedString.replace(`$${i + 1}`, replace);- });-- return formattedString;-}--export async function runQuery(query) {- return query.catch(e => {- throw e;- });-}--export async function rawQuery(query, params = []) {- const db = getDatabase();-- if (db !== POSTGRESQL && db !== MYSQL) {- return Promise.reject(new Error('Unknown database.'));- }-- const sql = db === MYSQL ? query.replace(/\$[0-9]+/g, '?') : query;-- return runQuery(prisma.$queryRawUnsafe.apply(prisma, [sql, ...params]));-}--export async function rawQueryClickhouse(query, params = [], debug = false) {- let formattedQuery = replaceQueryClickhouse(query, params);-- if (debug || process.env.LOG_QUERY) {- console.log(formattedQuery);- }-- return clickhouse.query(formattedQuery).toPromise();-}--export async function findUnique(data) {- if (data.length > 1) {- throw `${data.length} records found when expecting 1.`;- }-- return data[0] ?? null;-}-export async function runAnalyticsQuery(queries) {- const db = getAnalyticsDatabase();+ const db = getDatabase(process.env.ANALYTICS_URL, null, process.env.DATABASE_URL);if (db === POSTGRESQL || db === MYSQL) {return queries[RELATIONAL]();}if (db === CLICKHOUSE) {- const kafka = getKafkaService();+ const kafka = getDatabase(process.env.KAFKA_URL);if (kafka === KAFKA && queries[KAFKA]) {return queries[KAFKA]();}diff --git a/lib/db/kafka.js b/lib/kafka.jssimilarity index 74%rename from lib/db/kafka.jsrename to lib/kafka.jsindex e2256d271..ab3b3e686 100644--- a/lib/db/kafka.js+++ b/lib/kafka.js@@ -1,7 +1,7 @@import { Kafka, logLevel } from 'kafkajs';import dateFormat from 'dateformat';-export function getKafkaClient() {+export function getClient() {if (!process.env.KAFKA_URL) {return null;}@@ -30,11 +30,11 @@ export function getKafkaClient() {});}}-const kafka = global.kafka || getKafkaClient();+const kafka = global.kafka || getClient();let kafkaProducer = null;(async () => {- kafkaProducer = global.kakfaProducer || (await getKafkaProducer());+ kafkaProducer = global.kakfaProducer || (await getProducer());if (process.env.NODE_ENV !== 'production') {global.kafka = kafka;@@ -44,14 +44,18 @@ let kafkaProducer = null;export { kafka, kafkaProducer };-export async function getKafkaProducer() {+export async function getProducer() {const producer = kafka.producer();await producer.connect();return producer;}-export async function sendKafkaMessage(params, topic) {+export function getDateFormat(date) {+ return dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss');+}++export async function sendMessage(params, topic) {await kafkaProducer.send({topic,messages: [@@ -63,13 +67,3 @@ export async function sendKafkaMessage(params, topic) {acks: 0,});}--export function getDateFormatKafka(date) {- return dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss');-}--export function getKafkaService() {- const type = process.env.KAFKA_URL && process.env.KAFKA_URL.split(':')[0];-- return type;-}diff --git a/lib/relational.js b/lib/relational.jsnew file mode 100644index 000000000..7d1ed8c27--- /dev/null+++ b/lib/relational.js@@ -0,0 +1,163 @@+import { PrismaClient } from '@prisma/client';+import chalk from 'chalk';+import {+ FILTER_IGNORED,+ MYSQL,+ MYSQL_DATE_FORMATS,+ POSTGRESQL,+ POSTGRESQL_DATE_FORMATS,+} from 'lib/constants';+import { getDatabase } from './db';+import moment from 'moment-timezone';++const options = {+ log: [+ {+ emit: 'event',+ level: 'query',+ },+ ],+};++function logQuery(e) {+ console.log(chalk.yellow(e.params), '->', e.query, chalk.greenBright(`${e.duration}ms`));+}++function getPrismaClient(options) {+ const prisma = new PrismaClient(options);++ if (process.env.LOG_QUERY) {+ prisma.$on('query', logQuery);+ }++ return prisma;+}+const prisma = global.prisma || getPrismaClient(options);++if (process.env.NODE_ENV !== 'production') {+ global.prisma = prisma;+}++export { prisma };++export function getDateQuery(field, unit, timezone) {+ const db = getDatabase();++ if (db === POSTGRESQL) {+ if (timezone) {+ return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;+ }+ return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;+ }++ if (db === MYSQL) {+ if (timezone) {+ const tz = moment.tz(timezone).format('Z');++ return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;+ }++ return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;+ }+}++export function getFilterQuery(table, column, filters = {}, params = []) {+ const query = Object.keys(filters).reduce((arr, key) => {+ const filter = filters[key];++ if (filter === undefined || filter === FILTER_IGNORED) {+ return arr;+ }++ switch (key) {+ case 'url':+ if (table === 'pageview' || table === 'event') {+ arr.push(`and ${table}.${key}=$${params.length + 1}`);+ params.push(decodeURIComponent(filter));+ }+ break;++ case 'os':+ case 'browser':+ case 'device':+ case 'country':+ if (table === 'session') {+ arr.push(`and ${table}.${key}=$${params.length + 1}`);+ params.push(decodeURIComponent(filter));+ }+ break;++ case 'event_name':+ if (table === 'event') {+ arr.push(`and ${table}.${key}=$${params.length + 1}`);+ params.push(decodeURIComponent(filter));+ }+ break;++ case 'referrer':+ if (table === 'pageview' || table === 'event') {+ arr.push(`and ${table}.referrer like $${params.length + 1}`);+ params.push(`%${decodeURIComponent(filter)}%`);+ }+ break;++ case 'domain':+ if (table === 'pageview') {+ arr.push(`and ${table}.referrer not like $${params.length + 1}`);+ arr.push(`and ${table}.referrer not like '/%'`);+ params.push(`%://${filter}/%`);+ }+ break;++ case 'query':+ if (table === 'pageview') {+ arr.push(`and ${table}.url like '%?%'`);+ }+ }++ return arr;+ }, []);++ return query.join('\n');+}++export function parseFilters(table, column, filters = {}, params = [], sessionKey = 'session_id') {+ const { domain, url, event_url, referrer, os, browser, device, country, event_name, query } =+ filters;++ const pageviewFilters = { domain, url, referrer, query };+ const sessionFilters = { os, browser, device, country };+ const eventFilters = { url: event_url, event_name };++ return {+ pageviewFilters,+ sessionFilters,+ eventFilters,+ event: { event_name },+ joinSession:+ os || browser || device || country+ ? `inner join session on ${table}.${sessionKey} = session.${sessionKey}`+ : '',+ pageviewQuery: getFilterQuery('pageview', column, pageviewFilters, params),+ sessionQuery: getFilterQuery('session', column, sessionFilters, params),+ eventQuery: getFilterQuery('event', column, eventFilters, params),+ };+}++export async function runQuery(query) {+ return query.catch(e => {+ throw e;+ });+}++export async function rawQuery(query, params = []) {+ const db = getDatabase(process.env.DATABASE_URL, process.env.DATABASE_TYPE);++ if (db !== POSTGRESQL && db !== MYSQL) {+ return Promise.reject(new Error('Unknown database.'));+ }++ const sql = db === MYSQL ? query.replace(/\$[0-9]+/g, '?') : query;++ return runQuery(prisma.$queryRawUnsafe.apply(prisma, [sql, ...params]));+}diff --git a/lib/session.js b/lib/session.jsindex c9fb04d7d..b90e88f7d 100644--- a/lib/session.js+++ b/lib/session.js@@ -37,6 +37,8 @@ export async function getSession(req) {let session = await getSessionByUuid(session_uuid);+ console.log('session here!: ', session);+if (!session) {try {session = await createSession(website_id, {diff --git a/pages/api/collect.js b/pages/api/collect.jsindex 1cff48411..4b9763195 100644--- a/pages/api/collect.js+++ b/pages/api/collect.js@@ -4,7 +4,7 @@ import ipaddr from 'ipaddr.js';import { savePageView, saveEvent } from 'queries';import { useCors, useSession } from 'lib/middleware';import { getJsonBody, getIpAddress } from 'lib/request';-import { ok, send, badRequest, forbidden } from 'lib/response';+import { unauthorized, send, badRequest, forbidden } from 'lib/response';import { createToken } from 'lib/crypto';import { removeTrailingSlash } from 'lib/url';import { uuid } from 'lib/crypto';@@ -13,7 +13,7 @@ export default async (req, res) => {await useCors(req, res);if (isbot(req.headers['user-agent'])) {- return ok(res);+ return unauthorized(res);}const ignoreIps = process.env.IGNORE_IP;@@ -93,3 +93,38 @@ export default async (req, res) => {return send(res, token);};++// async function relational(req, res) {+// await useSession(req, res);++// const {+// session: { website_id, session_id, session_uuid },+// } = req;++// const { type, payload } = getJsonBody(req);++// let { url, referrer, event_name, event_data } = payload;++// if (process.env.REMOVE_TRAILING_SLASH) {+// url = removeTrailingSlash(url);+// }++// const event_uuid = uuid();++// if (type === 'pageview') {+// await savePageView(website_id, { session_id, session_uuid, url, referrer });+// } else if (type === 'event') {+// await saveEvent(website_id, {+// event_uuid,+// session_id,+// session_uuid,+// url,+// event_name,+// event_data,+// });+// } else {+// return badRequest(res);+// }+// }++// function clickhouse() {}diff --git a/queries/admin/account/createAccount.js b/queries/admin/account/createAccount.jsindex 193ed719f..928f9f457 100644--- a/queries/admin/account/createAccount.js+++ b/queries/admin/account/createAccount.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function createAccount(data) {return runQuery(diff --git a/queries/admin/account/deleteAccount.js b/queries/admin/account/deleteAccount.jsindex 8c4e2c0ca..6a5896d47 100644--- a/queries/admin/account/deleteAccount.js+++ b/queries/admin/account/deleteAccount.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function deleteAccount(user_id) {return runQuery(diff --git a/queries/admin/account/getAccountById.js b/queries/admin/account/getAccountById.jsindex de2605e18..92fe5b43f 100644--- a/queries/admin/account/getAccountById.js+++ b/queries/admin/account/getAccountById.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getAccountById(user_id) {return runQuery(diff --git a/queries/admin/account/getAccountByUsername.js b/queries/admin/account/getAccountByUsername.jsindex d476c38e6..a777c0eda 100644--- a/queries/admin/account/getAccountByUsername.js+++ b/queries/admin/account/getAccountByUsername.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getAccountByUsername(username) {return runQuery(diff --git a/queries/admin/account/getAccounts.js b/queries/admin/account/getAccounts.jsindex e6ebedf2d..e24476dfb 100644--- a/queries/admin/account/getAccounts.js+++ b/queries/admin/account/getAccounts.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getAccounts() {return runQuery(diff --git a/queries/admin/account/updateAccount.js b/queries/admin/account/updateAccount.jsindex b8d718f40..2137003f3 100644--- a/queries/admin/account/updateAccount.js+++ b/queries/admin/account/updateAccount.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function updateAccount(user_id, data) {return runQuery(diff --git a/queries/admin/website/createWebsite.js b/queries/admin/website/createWebsite.jsindex 3cb6887fe..8770d1ce2 100644--- a/queries/admin/website/createWebsite.js+++ b/queries/admin/website/createWebsite.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function createWebsite(user_id, data) {return runQuery(diff --git a/queries/admin/website/deleteWebsite.js b/queries/admin/website/deleteWebsite.jsindex 129351ea3..5d88a3b5e 100644--- a/queries/admin/website/deleteWebsite.js+++ b/queries/admin/website/deleteWebsite.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function deleteWebsite(website_id) {return runQuery(diff --git a/queries/admin/website/getAllWebsites.js b/queries/admin/website/getAllWebsites.jsindex 7e413fe81..03e7d86e8 100644--- a/queries/admin/website/getAllWebsites.js+++ b/queries/admin/website/getAllWebsites.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getAllWebsites() {let data = await runQuery(diff --git a/queries/admin/website/getUserWebsites.js b/queries/admin/website/getUserWebsites.jsindex 4cd759976..4db70aab1 100644--- a/queries/admin/website/getUserWebsites.js+++ b/queries/admin/website/getUserWebsites.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getUserWebsites(user_id) {return runQuery(diff --git a/queries/admin/website/getWebsiteById.js b/queries/admin/website/getWebsiteById.jsindex 8cf0f50ff..231cd8993 100644--- a/queries/admin/website/getWebsiteById.js+++ b/queries/admin/website/getWebsiteById.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getWebsiteById(website_id) {return runQuery(diff --git a/queries/admin/website/getWebsiteByShareId.js b/queries/admin/website/getWebsiteByShareId.jsindex 9fcc1ab3c..3148b0622 100644--- a/queries/admin/website/getWebsiteByShareId.js+++ b/queries/admin/website/getWebsiteByShareId.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getWebsiteByShareId(share_id) {return runQuery(diff --git a/queries/admin/website/getWebsiteByUuid.js b/queries/admin/website/getWebsiteByUuid.jsindex 36c41e67e..29e48a06c 100644--- a/queries/admin/website/getWebsiteByUuid.js+++ b/queries/admin/website/getWebsiteByUuid.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getWebsiteByUuid(website_uuid) {return runQuery(diff --git a/queries/admin/website/resetWebsite.js b/queries/admin/website/resetWebsite.jsindex 18f249b85..8a1c426c2 100644--- a/queries/admin/website/resetWebsite.js+++ b/queries/admin/website/resetWebsite.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function resetWebsite(website_id) {return runQuery(prisma.$queryRaw`delete from session where website_id=${website_id}`);diff --git a/queries/admin/website/updateWebsite.js b/queries/admin/website/updateWebsite.jsindex e2a169255..189bd938e 100644--- a/queries/admin/website/updateWebsite.js+++ b/queries/admin/website/updateWebsite.js@@ -1,4 +1,4 @@-import { prisma, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';export async function updateWebsite(website_id, data) {return runQuery(diff --git a/queries/analytics/event/getEventMetrics.js b/queries/analytics/event/getEventMetrics.jsindex 8a624f92d..41111e716 100644--- a/queries/analytics/event/getEventMetrics.js+++ b/queries/analytics/event/getEventMetrics.js@@ -1,13 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- getBetweenDatesClickhouse,- getDateQuery,- getDateQueryClickhouse,- getFilterQuery,- rawQuery,- rawQueryClickhouse,- runAnalyticsQuery,-} from 'lib/db';+import clickhouse from 'lib/clickhouse';+import { getDateQuery, getFilterQuery, rawQuery } from 'lib/db/relational';+import { runAnalyticsQuery } from 'lib/db/db';export async function getEventMetrics(...args) {return runAnalyticsQuery({@@ -53,16 +47,16 @@ async function clickhouseQuery() {const params = [website_id];- return rawQueryClickhouse(+ return clickhouse.rawQuery(`selectevent_name x,- ${getDateQueryClickhouse('created_at', unit, timezone)} t,+ ${clickhouse.getDateQuery('created_at', unit, timezone)} t,count(*) yfrom eventwhere website_id= $1- and ${getBetweenDatesClickhouse('created_at', start_at, end_at)}- ${getFilterQuery('event', filters, params)}+ and ${clickhouse.getBetweenDates('created_at', start_at, end_at)}+ ${clickhouse.getFilterQuery('event', filters, params)}group by x, torder by t`,diff --git a/queries/analytics/event/getEvents.js b/queries/analytics/event/getEvents.jsindex 7969877a5..42016fc03 100644--- a/queries/analytics/event/getEvents.js+++ b/queries/analytics/event/getEvents.js@@ -1,11 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- rawQueryClickhouse,- getDateFormatClickhouse,- prisma,- runAnalyticsQuery,- runQuery,-} from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';+import clickhouse from 'lib/clickhouse';+import { runAnalyticsQuery } from 'lib/db/db';export function getEvents(...args) {return runAnalyticsQuery({@@ -32,7 +28,7 @@ function relationalQuery(websites, start_at) {}function clickhouseQuery(websites, start_at) {- return rawQueryClickhouse(+ return clickhouse.rawQuery(`selectevent_id,@@ -43,7 +39,7 @@ function clickhouseQuery(websites, start_at) {event_namefrom eventwhere website_id in (${websites.join[',']}- and created_at >= ${getDateFormatClickhouse(start_at)})+ and created_at >= ${clickhouse.getDateFormat(start_at)})`,);}diff --git a/queries/analytics/event/saveEvent.js b/queries/analytics/event/saveEvent.jsindex ff4d52560..fc73c8b80 100644--- a/queries/analytics/event/saveEvent.js+++ b/queries/analytics/event/saveEvent.js@@ -1,12 +1,8 @@-import { CLICKHOUSE, RELATIONAL, KAFKA, URL_LENGTH } from 'lib/constants';-import {- getDateFormatClickhouse,- prisma,- rawQueryClickhouse,- runAnalyticsQuery,- runQuery,-} from 'lib/db';-import { sendKafkaMessage, getDateFormatKafka } from 'lib/db/kafka';+import { CLICKHOUSE, KAFKA, RELATIONAL, URL_LENGTH } from 'lib/constants';+import clickhouse from 'lib/clickhouse';+import kafka from 'lib/db/kafka';+import { prisma, runQuery } from 'lib/db/relational';+import { runAnalyticsQuery } from 'lib/db/db';export async function saveEvent(...args) {return runAnalyticsQuery({@@ -48,10 +44,10 @@ async function clickhouseQuery(website_id, { event_uuid, session_uuid, url, evenevent_name?.substr(0, 50),];- return rawQueryClickhouse(+ return clickhouse.rawQuery(`insert into umami.event (created_at, website_id, session_uuid, url, event_name)- values (${getDateFormatClickhouse(new Date())}, $1, $2, $3, $4);`,+ values (${clickhouse.getDateFormat(new Date())}, $1, $2, $3, $4);`,params,);}@@ -61,10 +57,10 @@ async function kafkaQuery(website_id, { event_uuid, session_uuid, url, event_namevent_uuid: event_uuid,website_id: website_id,session_uuid: session_uuid,- created_at: getDateFormatKafka(new Date()),+ created_at: kafka.getDateFormat(new Date()),url: url?.substr(0, URL_LENGTH),event_name: event_name?.substr(0, 50),};- await sendKafkaMessage(params, 'event');+ await kafka.sendKafkaMessage(params, 'event');}diff --git a/queries/analytics/pageview/getPageviewMetrics.js b/queries/analytics/pageview/getPageviewMetrics.jsindex 9d3eabaaa..3997fd197 100644--- a/queries/analytics/pageview/getPageviewMetrics.js+++ b/queries/analytics/pageview/getPageviewMetrics.js@@ -1,11 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- rawQueryClickhouse,- runAnalyticsQuery,- parseFilters,- rawQuery,- getBetweenDatesClickhouse,-} from 'lib/db';+import clickhouse from 'lib/clickhouse';+import { parseFilters, rawQuery } from 'lib/db/relational';+import { runAnalyticsQuery } from 'lib/db/db';export async function getPageviewMetrics(...args) {return runAnalyticsQuery({@@ -42,7 +38,7 @@ async function relationalQuery(website_id, start_at, end_at, column, table, filtasync function clickhouseQuery(website_id, start_at, end_at, column, table, filters = {}) {const params = [website_id];- const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(+ const { pageviewQuery, sessionQuery, eventQuery, joinSession } = clickhouse.parseFilters(table,column,filters,@@ -50,13 +46,13 @@ async function clickhouseQuery(website_id, start_at, end_at, column, table, filt'session_uuid',);- return rawQueryClickhouse(+ return clickhouse.rawQuery(`select ${column} x, count(*) yfrom ${table}${joinSession}where ${table}.website_id= $1- and ${getBetweenDatesClickhouse(table + '.created_at', start_at, end_at)}+ and ${clickhouse.getBetweenDates(table + '.created_at', start_at, end_at)}${pageviewQuery}${joinSession && sessionQuery}${eventQuery}diff --git a/queries/analytics/pageview/getPageviewParams.js b/queries/analytics/pageview/getPageviewParams.jsindex 549ff11c5..d77d328ee 100644--- a/queries/analytics/pageview/getPageviewParams.js+++ b/queries/analytics/pageview/getPageviewParams.js@@ -1,4 +1,4 @@-import { parseFilters, rawQuery, runAnalyticsQuery } from 'lib/db';+import { parseFilters, rawQuery, runAnalyticsQuery } from 'lib/db/relational';import { CLICKHOUSE, RELATIONAL } from 'lib/constants';export async function getPageviewParams(...args) {diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.jsindex 00ff857a8..6a786f580 100644--- a/queries/analytics/pageview/getPageviewStats.js+++ b/queries/analytics/pageview/getPageviewStats.js@@ -1,14 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- getBetweenDatesClickhouse,- getDateQuery,- getDateQueryClickhouse,- getDateStringQueryClickhouse,- parseFilters,- rawQuery,- rawQueryClickhouse,- runAnalyticsQuery,-} from 'lib/db';+import { getDateQuery, parseFilters, rawQuery } from 'lib/db/relational';+import { runAnalyticsQuery } from 'lib/db/db';+import clickhouse from 'lib/clickhouse';export async function getPageviewStats(...args) {return runAnalyticsQuery({@@ -62,7 +55,7 @@ async function clickhouseQuery(sessionKey = 'session_uuid',) {const params = [website_id];- const { pageviewQuery, sessionQuery, joinSession } = parseFilters(+ const { pageviewQuery, sessionQuery, joinSession } = clickhouse.parseFilters('pageview',null,filters,@@ -70,19 +63,19 @@ async function clickhouseQuery(sessionKey,);- return rawQueryClickhouse(+ return clickhouse.rawQuery(`select- ${getDateStringQueryClickhouse('g.t', unit)} as t,+ ${clickhouse.getDateStringQuery('g.t', unit)} as t,g.y as yfrom(select- ${getDateQueryClickhouse('created_at', unit, timezone)} t,+ ${clickhouse.getDateQuery('created_at', unit, timezone)} t,count(${count !== '*' ? `${count}${sessionKey}` : count}) yfrom pageview${joinSession}where pageview.website_id= $1- and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}+ and ${clickhouse.getBetweenDates('pageview.created_at', start_at, end_at)}${pageviewQuery}${sessionQuery}group by t) gdiff --git a/queries/analytics/pageview/getPageviews.js b/queries/analytics/pageview/getPageviews.jsindex 45463ec83..bccc5bdb9 100644--- a/queries/analytics/pageview/getPageviews.js+++ b/queries/analytics/pageview/getPageviews.js@@ -1,11 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- rawQueryClickhouse,- getDateFormatClickhouse,- prisma,- runAnalyticsQuery,- runQuery,-} from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';+import { runAnalyticsQuery } from 'lib/db/db';+import clickhouse from 'lib/clickhouse';export async function getPageviews(...args) {return runAnalyticsQuery({@@ -32,7 +28,7 @@ async function relationalQuery(websites, start_at) {}async function clickhouseQuery(websites, start_at) {- return rawQueryClickhouse(+ return clickhouse.rawQuery(`selectview_id,@@ -42,7 +38,7 @@ async function clickhouseQuery(websites, start_at) {urlfrom pageviewwhere website_id in (${websites.join[',']}- and created_at >= ${getDateFormatClickhouse(start_at)})+ and created_at >= ${clickhouse.getDateFormat(start_at)})`,);}diff --git a/queries/analytics/pageview/savePageView.js b/queries/analytics/pageview/savePageView.jsindex af0d88f60..926b0ad85 100644--- a/queries/analytics/pageview/savePageView.js+++ b/queries/analytics/pageview/savePageView.js@@ -1,12 +1,8 @@-import { CLICKHOUSE, RELATIONAL, KAFKA, URL_LENGTH } from 'lib/constants';-import {- getDateFormatClickhouse,- prisma,- rawQueryClickhouse,- runAnalyticsQuery,- runQuery,-} from 'lib/db';-import { sendKafkaMessage, getDateFormatKafka } from 'lib/db/kafka';+import { CLICKHOUSE, KAFKA, RELATIONAL, URL_LENGTH } from 'lib/constants';+import clickhouse from 'lib/clickhouse';+import { runAnalyticsQuery } from 'lib/db/db';+import kafka from 'lib/db/kafka';+import { prisma, runQuery } from 'lib/db/relational';export async function savePageView(...args) {return runAnalyticsQuery({@@ -37,10 +33,10 @@ async function clickhouseQuery(website_id, { session_uuid, url, referrer }) {referrer?.substr(0, URL_LENGTH),];- return rawQueryClickhouse(+ return clickhouse.rawQuery(`insert into umami.pageview (created_at, website_id, session_uuid, url, referrer)- values (${getDateFormatClickhouse(new Date())}, $1, $2, $3, $4);`,+ values (${clickhouse.getDateFormat(new Date())}, $1, $2, $3, $4);`,params,);}@@ -49,10 +45,10 @@ async function kafkaQuery(website_id, { session_uuid, url, referrer }) {const params = {website_id: website_id,session_uuid: session_uuid,- created_at: getDateFormatKafka(new Date()),+ created_at: kafka.getDateFormat(new Date()),url: url?.substr(0, URL_LENGTH),referrer: referrer?.substr(0, URL_LENGTH),};- await sendKafkaMessage(params, 'pageview');+ await kafka.sendKafkaMessage(params, 'pageview');}diff --git a/queries/analytics/session/createSession.js b/queries/analytics/session/createSession.jsindex 565d45a28..b6dcd563f 100644--- a/queries/analytics/session/createSession.js+++ b/queries/analytics/session/createSession.js@@ -1,13 +1,8 @@-import { CLICKHOUSE, RELATIONAL, KAFKA } from 'lib/constants';-import {- getDateFormatClickhouse,- prisma,- rawQueryClickhouse,- runAnalyticsQuery,- runQuery,-} from 'lib/db';-import { sendKafkaMessage, getDateFormatKafka } from 'lib/db/kafka';-import { getSessionByUuid } from 'queries';+import { CLICKHOUSE, KAFKA, RELATIONAL } from 'lib/constants';+import { prisma, runQuery } from 'lib/db/relational';+import clickhouse from 'lib/clickhouse';+import kafka from 'lib/db/kafka';+import { runAnalyticsQuery } from 'lib/db/db';export async function createSession(...args) {return runAnalyticsQuery({@@ -47,13 +42,11 @@ async function clickhouseQuery(country ? country : null,];- await rawQueryClickhouse(+ await clickhouse.rawQuery(`insert into umami.session (created_at, session_uuid, website_id, hostname, browser, os, device, screen, language, country)- values (${getDateFormatClickhouse(new Date())}, $1, $2, $3, $4, $5, $6, $7, $8, $9);`,+ values (${clickhouse.getDateFormat(new Date())}, $1, $2, $3, $4, $5, $6, $7, $8, $9);`,params,);-- return getSessionByUuid(session_uuid);}async function kafkaQuery(@@ -63,7 +56,7 @@ async function kafkaQuery(const params = {session_uuid: session_uuid,website_id: website_id,- created_at: getDateFormatKafka(new Date()),+ created_at: kafka.getDateFormat(new Date()),hostname: hostname,browser: browser,os: os,@@ -73,7 +66,5 @@ async function kafkaQuery(country: country ? country : null,};- await sendKafkaMessage(params, 'session');-- return getSessionByUuid(session_uuid);+ await kafka.sendKafkaMessage(params, 'session');}diff --git a/queries/analytics/session/getSessionByUuid.js b/queries/analytics/session/getSessionByUuid.jsindex 2b9acc1e5..6fa6dfbaa 100644--- a/queries/analytics/session/getSessionByUuid.js+++ b/queries/analytics/session/getSessionByUuid.js@@ -1,5 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import { rawQueryClickhouse, findUnique, prisma, runAnalyticsQuery, runQuery } from 'lib/db';+import { prisma, runQuery } from 'lib/db/relational';+import clickhouse from 'lib/clickhouse';+import { runAnalyticsQuery } from 'lib/db/db';export async function getSessionByUuid(...args) {return runAnalyticsQuery({@@ -21,7 +23,7 @@ async function relationalQuery(session_uuid) {async function clickhouseQuery(session_uuid) {const params = [session_uuid];- return rawQueryClickhouse(+ return clickhouse.rawQuery(`selectsession_uuid,@@ -38,5 +40,5 @@ async function clickhouseQuery(session_uuid) {where session_uuid = $1`,params,- ).then(data => findUnique(data));+ );}diff --git a/queries/analytics/session/getSessionMetrics.js b/queries/analytics/session/getSessionMetrics.jsindex 7da60bda5..6fde5b3dd 100644--- a/queries/analytics/session/getSessionMetrics.js+++ b/queries/analytics/session/getSessionMetrics.js@@ -1,11 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- getBetweenDatesClickhouse,- parseFilters,- rawQuery,- rawQueryClickhouse,- runAnalyticsQuery,-} from 'lib/db';+import clickhouse from 'lib/clickhouse';+import { runAnalyticsQuery } from 'lib/db/db';+import { parseFilters, rawQuery } from 'lib/db/relational';export async function getSessionMetrics(...args) {return runAnalyticsQuery({@@ -45,7 +41,7 @@ async function relationalQuery(website_id, start_at, end_at, field, filters = {}async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}) {const params = [website_id];- const { pageviewQuery, sessionQuery, joinSession } = parseFilters(+ const { pageviewQuery, sessionQuery, joinSession } = clickhouse.parseFilters('pageview',null,filters,@@ -53,7 +49,7 @@ async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}'session_uuid',);- return rawQueryClickhouse(+ return clickhouse.rawQuery(`select ${field} x, count(*) yfrom session as x@@ -62,7 +58,7 @@ async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}from pageview${joinSession}where pageview.website_id=$1- and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}+ and ${clickhouse.getBetweenDates('pageview.created_at', start_at, end_at)}${pageviewQuery}${sessionQuery})diff --git a/queries/analytics/session/getSessions.js b/queries/analytics/session/getSessions.jsindex bc48db1c8..57806c6f4 100644--- a/queries/analytics/session/getSessions.js+++ b/queries/analytics/session/getSessions.js@@ -1,11 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- getDateFormatClickhouse,- prisma,- rawQueryClickhouse,- runAnalyticsQuery,- runQuery,-} from 'lib/db';+import clickhouse from 'lib/clickhouse';+import { runAnalyticsQuery } from 'lib/db/db';+import { prisma, runQuery } from 'lib/db/relational';export async function getSessions(...args) {return runAnalyticsQuery({@@ -32,7 +28,7 @@ async function relationalQuery(websites, start_at) {}async function clickhouseQuery(websites, start_at) {- return rawQueryClickhouse(+ return clickhouse.rawQuery(`selectsession_id,@@ -48,7 +44,7 @@ async function clickhouseQuery(websites, start_at) {countryfrom sessionwhere website_id in (${websites.join[',']}- and created_at >= ${getDateFormatClickhouse(start_at)})+ and created_at >= ${clickhouse.getDateFormat(start_at)})`,);}diff --git a/queries/analytics/stats/getActiveVisitors.js b/queries/analytics/stats/getActiveVisitors.jsindex aac99085a..fa525314a 100644--- a/queries/analytics/stats/getActiveVisitors.js+++ b/queries/analytics/stats/getActiveVisitors.js@@ -1,6 +1,8 @@import { subMinutes } from 'date-fns';import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import { getDateFormatClickhouse, rawQuery, rawQueryClickhouse, runAnalyticsQuery } from 'lib/db';+import { rawQuery } from 'lib/db/relational';+import { runAnalyticsQuery } from 'lib/db/db';+import clickhouse from 'lib/clickhouse';export async function getActiveVisitors(...args) {return runAnalyticsQuery({@@ -27,12 +29,12 @@ async function relationalQuery(website_id) {async function clickhouseQuery(website_id) {const params = [website_id];- return rawQueryClickhouse(+ return clickhouse.rawQuery(`select count(distinct session_uuid) xfrom pageviewwhere website_id = $1- and created_at >= ${getDateFormatClickhouse(subMinutes(new Date(), 5))}+ and created_at >= ${clickhouse.getDateFormat(subMinutes(new Date(), 5))}`,params,);diff --git a/queries/analytics/stats/getWebsiteStats.js b/queries/analytics/stats/getWebsiteStats.jsindex dc0380e0b..e4fb4eb85 100644--- a/queries/analytics/stats/getWebsiteStats.js+++ b/queries/analytics/stats/getWebsiteStats.js@@ -1,14 +1,7 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import {- getDateQuery,- getBetweenDatesClickhouse,- getDateQueryClickhouse,- getTimestampInterval,- parseFilters,- rawQuery,- rawQueryClickhouse,- runAnalyticsQuery,-} from 'lib/db';+import { getDateQuery, getTimestampInterval, parseFilters, rawQuery } from 'lib/db/relational';+import { runAnalyticsQuery } from 'lib/db/db';+import clickhouse from 'lib/clickhouse';export async function getWebsiteStats(...args) {return runAnalyticsQuery({@@ -52,7 +45,7 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) {async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {const params = [website_id];- const { pageviewQuery, sessionQuery, joinSession } = parseFilters(+ const { pageviewQuery, sessionQuery, joinSession } = clickhouse.parseFilters('pageview',null,filters,@@ -60,7 +53,7 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {'session_uuid',);- return rawQueryClickhouse(+ return clickhouse.rawQuery(`selectsum(t.c) as "pageviews",@@ -69,14 +62,14 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {sum(if(max_time < min_time + interval 1 hour, max_time-min_time, 0)) as "totaltime"from (select pageview.session_uuid,- ${getDateQueryClickhouse('pageview.created_at', 'day')} time_series,+ ${clickhouse.getDateQuery('pageview.created_at', 'day')} time_series,count(*) c,min(created_at) min_time,max(created_at) max_timefrom pageview${joinSession}where pageview.website_id = $1- and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}+ and ${clickhouse.getBetweenDates('pageview.created_at', start_at, end_at)}${pageviewQuery}${sessionQuery}group by pageview.session_uuid, time_series