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
fix CH return.
Brian Caof189035a7326
diff --git a/lib/db.js b/lib/db.jsindex 378ca7421..cb9237bb1 100644--- a/lib/db.js+++ b/lib/db.js@@ -277,14 +277,22 @@ export async function rawQueryClickhouse(query, params = [], debug = false) {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();if (db === POSTGRESQL || db === MYSQL) {- return queries[`${RELATIONAL}`]();+ return queries[RELATIONAL]();}if (db === CLICKHOUSE) {- return queries[`${CLICKHOUSE}`]();+ return queries[CLICKHOUSE]();}}diff --git a/lib/session.js b/lib/session.jsindex d8b66e54c..7c4476d6f 100644--- a/lib/session.js+++ b/lib/session.js@@ -37,8 +37,6 @@ export async function getSession(req) {let session = await getSessionByUuid(session_uuid);- session = Array.isArray(session) && session[0] ? session[0] : session;-if (!session) {try {session = await createSession(website_id, {diff --git a/queries/analytics/event/getEventMetrics.js b/queries/analytics/event/getEventMetrics.jsindex ff3fcf017..73f7e469e 100644--- a/queries/analytics/event/getEventMetrics.js+++ b/queries/analytics/event/getEventMetrics.js@@ -11,8 +11,8 @@ import {export async function getEventMetrics(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/event/getEvents.js b/queries/analytics/event/getEvents.jsindex 059c80142..fc5c0aeb4 100644--- a/queries/analytics/event/getEvents.js+++ b/queries/analytics/event/getEvents.js@@ -9,8 +9,8 @@ import {export function getEvents(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/event/saveEvent.js b/queries/analytics/event/saveEvent.jsindex abb32cbbe..41c068c36 100644--- a/queries/analytics/event/saveEvent.js+++ b/queries/analytics/event/saveEvent.js@@ -9,8 +9,8 @@ import {export async function saveEvent(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/pageview/getPageviewMetrics.js b/queries/analytics/pageview/getPageviewMetrics.jsindex e74473758..9d3eabaaa 100644--- a/queries/analytics/pageview/getPageviewMetrics.js+++ b/queries/analytics/pageview/getPageviewMetrics.js@@ -9,8 +9,8 @@ import {export async function getPageviewMetrics(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/pageview/getPageviewParams.js b/queries/analytics/pageview/getPageviewParams.jsindex fd25c77e5..2273f11a8 100644--- a/queries/analytics/pageview/getPageviewParams.js+++ b/queries/analytics/pageview/getPageviewParams.js@@ -3,8 +3,8 @@ import { MYSQL, POSTGRESQL, CLICKHOUSE, RELATIONAL } from 'lib/constants';export async function getPageviewParams(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.jsindex 0a320074e..00ff857a8 100644--- a/queries/analytics/pageview/getPageviewStats.js+++ b/queries/analytics/pageview/getPageviewStats.js@@ -12,8 +12,8 @@ import {export async function getPageviewStats(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/pageview/getPageviews.js b/queries/analytics/pageview/getPageviews.jsindex d7b286110..45463ec83 100644--- a/queries/analytics/pageview/getPageviews.js+++ b/queries/analytics/pageview/getPageviews.js@@ -9,8 +9,8 @@ import {export async function getPageviews(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/pageview/savePageView.js b/queries/analytics/pageview/savePageView.jsindex 72ab35fb0..c165b56d1 100644--- a/queries/analytics/pageview/savePageView.js+++ b/queries/analytics/pageview/savePageView.js@@ -9,8 +9,8 @@ import {export async function savePageView(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/session/createSession.js b/queries/analytics/session/createSession.jsindex 22b41ebdb..1af95fe65 100644--- a/queries/analytics/session/createSession.js+++ b/queries/analytics/session/createSession.js@@ -10,8 +10,8 @@ import { getSessionByUuid } from 'queries';export async function createSession(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/session/getSessionByUuid.js b/queries/analytics/session/getSessionByUuid.jsindex fde70e7f0..2b9acc1e5 100644--- a/queries/analytics/session/getSessionByUuid.js+++ b/queries/analytics/session/getSessionByUuid.js@@ -1,10 +1,10 @@import { CLICKHOUSE, RELATIONAL } from 'lib/constants';-import { rawQueryClickhouse, prisma, runAnalyticsQuery, runQuery } from 'lib/db';+import { rawQueryClickhouse, findUnique, prisma, runAnalyticsQuery, runQuery } from 'lib/db';export async function getSessionByUuid(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}@@ -38,5 +38,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 b9bbc708e..7da60bda5 100644--- a/queries/analytics/session/getSessionMetrics.js+++ b/queries/analytics/session/getSessionMetrics.js@@ -9,8 +9,8 @@ import {export async function getSessionMetrics(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/session/getSessions.js b/queries/analytics/session/getSessions.jsindex 09b55b8de..bc48db1c8 100644--- a/queries/analytics/session/getSessions.js+++ b/queries/analytics/session/getSessions.js@@ -9,8 +9,8 @@ import {export async function getSessions(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/stats/getActiveVisitors.js b/queries/analytics/stats/getActiveVisitors.jsindex 048845217..aac99085a 100644--- a/queries/analytics/stats/getActiveVisitors.js+++ b/queries/analytics/stats/getActiveVisitors.js@@ -4,8 +4,8 @@ import { getDateFormatClickhouse, rawQuery, rawQueryClickhouse, runAnalyticsQuerexport async function getActiveVisitors(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}diff --git a/queries/analytics/stats/getWebsiteStats.js b/queries/analytics/stats/getWebsiteStats.jsindex 9328b85b0..dc0380e0b 100644--- a/queries/analytics/stats/getWebsiteStats.js+++ b/queries/analytics/stats/getWebsiteStats.js@@ -12,8 +12,8 @@ import {export async function getWebsiteStats(...args) {return runAnalyticsQuery({- [`${RELATIONAL}`]: () => relationalQuery(...args),- [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),+ [RELATIONAL]: () => relationalQuery(...args),+ [CLICKHOUSE]: () => clickhouseQuery(...args),});}