fix(schema-compiler): Convert timezone for time dimensions in measures

cube-js · May 8, 2024 · 0bea221 · 0bea221
1 parent 990a767
commit 0bea221
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseMeasure.ts b/packages/cubejs-schema-compiler/src/adapter/BaseMeasure.ts
@@ -50,11 +50,22 @@ export class BaseMeasure {
 
   public measureSql() {
     if (this.expression) {
-      return this.query.evaluateSymbolSql(this.expressionCubeName, this.expressionName, this.definition(), 'measure');
+      return this.convertTzForRawTimeDimensionIfNeeded(() => this.query.evaluateSymbolSql(this.expressionCubeName, this.expressionName, this.definition(), 'measure'));
     }
     return this.query.measureSql(this);
   }
 
+  // We need this for measures however we don't for filters for performance reasons
+  public convertTzForRawTimeDimensionIfNeeded(sql) {
+    if (this.query.options.convertTzForRawTimeDimension) {
+      return this.query.evaluateSymbolSqlWithContext(sql, {
+        convertTzForRawTimeDimension: true
+      });
+    } else {
+      return sql();
+    }
+  }
+
   public cube() {
     if (this.expression) {
       return this.query.cubeEvaluator.cubeFromPath(this.expressionCubeName);