Merge branch 'analytics' of https://github.com/umami-software/umami into dev

franciscao633 · franciscao633 · commit b75c15dc43f1 · 2025-12-17T09:35:51.000-08:00
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
@@ -61,7 +61,7 @@ function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {
 
 function getDateSQL(field: string, unit: string, timezone?: string) {
   if (timezone) {
-    return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'))`;
+    return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'), '${timezone}')`;
   }
   return `toDateTime(date_trunc('${unit}', ${field}))`;
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {`
`61`	`61`
`62`	`62`	`function getDateSQL(field: string, unit: string, timezone?: string) {`
`63`	`63`	`if (timezone) {`
`64`		- return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'))`;
	`64`	+ return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'), '${timezone}')`;
`65`	`65`	`}`
`66`	`66`	return `toDateTime(date_trunc('${unit}', ${field}))`;
`67`	`67`	`}`