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
Merge branch 'fix-4123' of https://github.com/ElfenB/umami into ElfenB-fix-4123
Mike Cao0fff8fbb866e
diff --cc src/lib/clickhouse.tsindex ae44c9147,570fdd851..bf9d72677--- a/src/lib/clickhouse.ts+++ b/src/lib/clickhouse.ts@@@ -1,10 -1,10 +1,10 @@@import { type ClickHouseClient, createClient } from '@clickhouse/client';import { formatInTimeZone } from 'date-fns-tz';import debug from 'debug';+ import { CLICKHOUSE } from '@/lib/db';-import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS } from './constants';+import { DATA_TYPE, DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS } from './constants';import { filtersObjectToArray } from './params';-import type { QueryFilters, QueryOptions } from './types';+import type { Operator, PropertyFilter, QueryFilters, QueryOptions } from './types';export const CLICKHOUSE_DATE_FORMATS = {utc: '%Y-%m-%dT%H:%i:%SZ',@@@ -79,9 -70,8 +79,15 @@@ function getSearchSQL(column: string, preturn `and positionCaseInsensitive(${column}, {${param}:String}) > 0`;}- function mapFilter(column: string, operator: Operator, name: string, type: string = 'String', paramName?: string) {-function mapFilter(column: string, operator: string, name: string, type: string = 'String') {- const value = `{${name}:${type}}`;++function mapFilter(++ column: string,++ operator: Operator,++ name: string,++ type: string = 'String',++ paramName?: string,++) {+ const param = paramName ?? name;+ const value = `{${param}:${type}}`;switch (operator) {case OPERATORS.equals:@@@ -380,15 -195,13 +386,23 @@@ async function pagedRawQuery.filter(n => n).join('\n');- const count = await rawQuery(`select count(*) as num from (${query}) t`, queryParams).then(- res => res[0].num,- );+ const { maxResults } = filters;+ const countQuery = maxResults+ ? `select count(*) as num from (select 1 from (${query}) t limit ${+maxResults}) t2`+ : `select count(*) as num from (${query}) t`;+ const count = await rawQuery(countQuery, queryParams).then(res => res[0].num);const data = await rawQuery(`${query}${statements}`, queryParams, name);- return { data, count, page: +page, pageSize: size, orderBy, search, isCapped: !!maxResults && +count >= +maxResults };- return { data, count, page: +page, pageSize: size, orderBy, search };++ return {++ data,++ count,++ page: +page,++ pageSize: size,++ orderBy,++ search,++ isCapped: !!maxResults && +count >= +maxResults,++ };}async function rawQuery<T = unknown>(diff --cc src/lib/prisma.tsindex 7f400d05b,1ff00d833..6cdb33cfd--- a/src/lib/prisma.ts+++ b/src/lib/prisma.ts@@@ -1,10 -1,10 +1,16 @@@import { PrismaPg } from '@prisma/adapter-pg';import { readReplicas } from '@prisma/extension-read-replicas';import debug from 'debug';- import { DATA_TYPE, DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS, SESSION_COLUMNS } from './constants';+ import { PrismaClient } from '@/generated/prisma/client';-import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS, SESSION_COLUMNS } from './constants';++import {++ DATA_TYPE,++ DEFAULT_PAGE_SIZE,++ FILTER_COLUMNS,++ OPERATORS,++ SESSION_COLUMNS,++} from './constants';import { filtersObjectToArray } from './params';-import type { Operator, QueryFilters, QueryOptions } from './types';+import type { Operator, PropertyFilter, QueryFilters, QueryOptions } from './types';const log = debug('umami:prisma');@@@ -68,14 -55,6 +74,18 @@@ function getDateSQL(field: string, unitreturn `to_char(date_trunc('${unit}', ${field}), '${DATE_FORMATS_UTC[unit]}')`;}- function getDateStringSQL(field: string, unit: keyof typeof DATE_STRING_FORMATS = 'utc', timezone?: string): string {++function getDateStringSQL(++ field: string,++ unit: keyof typeof DATE_STRING_FORMATS = 'utc',++ timezone?: string,++): string {+ if (timezone && !isUtcTimezone(timezone)) {+ return `to_char(${field} at time zone '${timezone}', '${DATE_STRING_FORMATS[unit]}')`;+ }++ return `to_char(${field}, '${DATE_STRING_FORMATS.utc}')`;+}+function getDateWeeklySQL(field: string, timezone?: string) {return `concat(extract(dow from (${field} at time zone '${timezone}')), ':', to_char((${field} at time zone '${timezone}'), 'HH24'))`;}@@@ -470,15 -254,13 +480,22 @@@ async function pagedRawQuery.filter(n => n).join('\n');- const count = await rawQuery(`select count(*) as num from (${query}) t`, queryParams).then(- res => res[0].num,- );+ const { maxResults } = filters;+ const countQuery = maxResults+ ? `select count(*) as num from (select 1 from (${query}) t limit ${+maxResults}) t2`+ : `select count(*) as num from (${query}) t`;+ const count = await rawQuery(countQuery, queryParams).then(res => Number(res[0].num));const data = await rawQuery(`${query}${statements}`, queryParams, name);- return { data, count, page: +page, pageSize: size, orderBy, isCapped: !!maxResults && +count >= +maxResults };- return { data, count, page: +page, pageSize: size, orderBy };++ return {++ data,++ count,++ page: +page,++ pageSize: size,++ orderBy,++ isCapped: !!maxResults && +count >= +maxResults,++ };}function getSearchParameters(query: string, filters: Record<string, any>[]) {