fix: Use local dates for pre-aggregations to avoid timezone shift dis…

…crepancies on DST timezones for timezone unaware databases like MySQL (#1941)
cube-js · Jan 30, 2021 · f138e6f · f138e6f
1 parent be19976
commit f138e6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.js b/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.js
@@ -118,6 +118,10 @@ export class BaseTimeDimension extends BaseFilter {
     );
   }
 
+  localDateTimeFromParam() {
+    return this.query.dateTimeCast(this.query.paramAllocator.allocateParam(this.dateFromFormatted()));
+  }
+
   dateToFormatted() {
     if (!this.dateToFormattedValue) {
       this.dateToFormattedValue = this.formatToDate(this.dateRange[1]);
@@ -138,6 +142,10 @@ export class BaseTimeDimension extends BaseFilter {
     );
   }
 
+  localDateTimeToParam() {
+    return this.query.dateTimeCast(this.query.paramAllocator.allocateParam(this.dateToFormatted()));
+  }
+
   dateRangeGranularity() {
     if (!this.dateRange) {
       return null;

diff --git a/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js b/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js
@@ -659,8 +659,8 @@ export class PreAggregations {
         .concat(this.query.filters).concat(this.query.timeDimensions.map(dimension => dimension.dateRange && ({
           filterToWhere: () => this.query.timeRangeFilter(
             this.query.dimensionSql(dimension),
-            this.query.timeStampInClientTz(dimension.dateFromParam()),
-            this.query.timeStampInClientTz(dimension.dateToParam())
+            dimension.localDateTimeFromParam(),
+            dimension.localDateTimeToParam()
           )
         }))).filter(f => !!f);