fix(schema-compiler): Fix ungrouped cumulative queries incorrect sql generation

Author: KSDaemon

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

@@ -31,7 +31,10 @@ export class BaseDimension {
     return this.dimensionSql() === this.aliasName();
   }
 
-  public cumulativeSelectColumns() {
+  public cumulativeSelectColumns(baseQueryAliasName: string): string[] {
+    if (baseQueryAliasName) {
+      return [`${baseQueryAliasName}.${this.aliasName()}`];
+    }
     return [`${this.aliasName()}`];
   }
 

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

@@ -35,8 +35,11 @@ export class BaseMeasure {
     return this.measureSql() === this.aliasName();
   }
 
-  public cumulativeSelectColumns() {
-    return [`${this.cumulativeMeasureSql()} ${this.aliasName()}`];
+  public cumulativeSelectColumns(baseQueryAliasName: string): string[] {
+    if (baseQueryAliasName) {
+      return [`${baseQueryAliasName}.${this.aliasName()}`];
+    }
+    return [`${this.aliasName()}`];
   }
 
   public cumulativeMeasureSql() {

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

@@ -789,9 +789,6 @@ export class BaseQuery {
    * @returns {string}
    */
   fullKeyQueryAggregate() {
-    if (this.from) {
-      return this.simpleQuery();
-    }
     const {
       multipliedMeasures,
       regularMeasures,
@@ -1426,16 +1423,17 @@ export class BaseQuery {
   }
 
   overTimeSeriesSelect(cumulativeMeasures, dateSeriesSql, baseQuery, dateJoinConditionSql, baseQueryAlias) {
-    const forSelect = this.overTimeSeriesForSelect(cumulativeMeasures);
+    const forSelect = this.overTimeSeriesForSelect(cumulativeMeasures, baseQueryAlias);
     return `SELECT ${forSelect} FROM ${dateSeriesSql}` +
       ` LEFT JOIN (${baseQuery}) ${this.asSyntaxJoin} ${baseQueryAlias} ON ${dateJoinConditionSql}` +
       this.groupByClause();
   }
 
-  overTimeSeriesForSelect(cumulativeMeasures) {
-    return this.dimensions.map(s => s.cumulativeSelectColumns()).concat(this.dateSeriesSelect()).concat(
-      cumulativeMeasures.map(s => s.cumulativeSelectColumns()),
-    ).filter(c => !!c)
+  overTimeSeriesForSelect(cumulativeMeasures, baseQueryAlias) {
+    return this.dimensions.map(s => s.cumulativeSelectColumns(baseQueryAlias))
+      .concat(this.dateSeriesSelect())
+      .concat(cumulativeMeasures.map(s => s.cumulativeSelectColumns(baseQueryAlias)))
+      .filter(c => !!c)
       .join(', ');
   }
 
@@ -1792,16 +1790,16 @@ export class BaseQuery {
       }));
   }
 
-  groupedUngroupedSelect(select, ungrouped, granularityOverride) {
+  groupedUngroupedSelect(selectFn, ungrouped, granularityOverride) {
     return this.evaluateSymbolSqlWithContext(
-      select,
+      selectFn,
       { ungrouped, granularityOverride, overTimeSeriesAggregate: true }
     );
   }
 
-  ungroupedMeasureSelect(select) {
+  ungroupedMeasureSelect(selectFn) {
     return this.evaluateSymbolSqlWithContext(
-      select,
+      selectFn,
       { ungrouped: true }
     );
   }