fix notes after review

packages/cubejs-schema-compiler/src/adapter/BaseQuery.js

@@ -1485,23 +1485,22 @@ export class BaseQuery {
     }
 
     // We can't do meaningful query if few time dimensions with different ranges passed,
-    // it won't be possible to join them together without loosing some rows.
+    // it won't be possible to join them together without losing some rows.
     const rangedTimeDimensions = this.timeDimensions.filter(d => d.dateRange && d.granularity);
     const uniqTimeDimensionWithRanges = R.uniqBy(d => d.dateRange, rangedTimeDimensions);
     if (uniqTimeDimensionWithRanges.length > 1) {
       throw new Error('Can\'t build query for time dimensions with different date ranges');
     }
 
     // We need to generate time series table for the lowest granularity among all time dimensions
-    let dateSeriesDimension;
-    const dateSeriesGranularity = this.timeDimensions.filter(d => d.granularity)
-      .reduce((acc, d) => {
-        const mg = this.minGranularity(acc, d.resolvedGranularity());
+    const [dateSeriesDimension, dateSeriesGranularity] = this.timeDimensions.filter(d => d.granularity)
+      .reduce(([prevDim, prevGran], d) => {
+        const mg = this.minGranularity(prevGran, d.resolvedGranularity());
         if (mg === d.resolvedGranularity()) {
-          dateSeriesDimension = d;
+          return [d, mg];
         }
-        return mg;
-      }, undefined);
+        return [prevDim, mg];
+      }, [null, null]);
 
     const dateSeriesSql = this.dateSeriesSql(dateSeriesDimension);
 

packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts

@@ -85,7 +85,7 @@ export class BaseTimeDimension extends BaseFilter {
     return this.query.escapeColumnName(`${this.dimension}_series`);
   }
 
-  public dateSeriesSelectColumn(dateSeriesAliasName: string, dateSeriesGranularity: string) {
+  public dateSeriesSelectColumn(dateSeriesAliasName: string | null, dateSeriesGranularity?: string) {
     if (!this.granularityObj) {
       return null;
     }