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

This reverts commit ca365fa.

Author: KSDaemon

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

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

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

@@ -35,16 +35,15 @@ export class BaseMeasure {
     return this.measureSql() === this.aliasName();
   }
 
-  public cumulativeSelectColumns(baseQueryAliasName?: string): string[] {
-    return [`${this.cumulativeMeasureSql(baseQueryAliasName)} ${this.aliasName()}`];
+  public cumulativeSelectColumns() {
+    return [`${this.cumulativeMeasureSql()} ${this.aliasName()}`];
   }
 
-  public cumulativeMeasureSql(baseQueryAliasName?: string) {
+  public cumulativeMeasureSql() {
     return this.query.evaluateSymbolSqlWithContext(
       () => this.measureSql(),
       {
-        ungroupedAliasesForCumulative: { [this.measure]: this.aliasName() },
-        ungroupedBaseQueryAliasForCumulative: baseQueryAliasName
+        ungroupedAliasesForCumulative: { [this.measure]: this.aliasName() }
       }
     );
   }

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

@@ -789,6 +789,9 @@ export class BaseQuery {
    * @returns {string}
    */
   fullKeyQueryAggregate() {
+    if (this.from) {
+      return this.simpleQuery();
+    }
     const {
       multipliedMeasures,
       regularMeasures,
@@ -1423,17 +1426,16 @@ export class BaseQuery {
   }
 
   overTimeSeriesSelect(cumulativeMeasures, dateSeriesSql, baseQuery, dateJoinConditionSql, baseQueryAlias) {
-    const forSelect = this.overTimeSeriesForSelect(cumulativeMeasures, baseQueryAlias);
+    const forSelect = this.overTimeSeriesForSelect(cumulativeMeasures);
     return `SELECT ${forSelect} FROM ${dateSeriesSql}` +
       ` LEFT JOIN (${baseQuery}) ${this.asSyntaxJoin} ${baseQueryAlias} ON ${dateJoinConditionSql}` +
       this.groupByClause();
   }
 
-  overTimeSeriesForSelect(cumulativeMeasures, baseQueryAlias) {
-    return this.dimensions.map(s => s.cumulativeSelectColumns(baseQueryAlias))
-      .concat(this.dateSeriesSelect())
-      .concat(cumulativeMeasures.map(s => s.cumulativeSelectColumns(baseQueryAlias)))
-      .filter(c => !!c)
+  overTimeSeriesForSelect(cumulativeMeasures) {
+    return this.dimensions.map(s => s.cumulativeSelectColumns()).concat(this.dateSeriesSelect()).concat(
+      cumulativeMeasures.map(s => s.cumulativeSelectColumns()),
+    ).filter(c => !!c)
       .join(', ');
   }
 
@@ -1790,16 +1792,16 @@ export class BaseQuery {
       }));
   }
 
-  groupedUngroupedSelect(selectFn, ungrouped, granularityOverride) {
+  groupedUngroupedSelect(select, ungrouped, granularityOverride) {
     return this.evaluateSymbolSqlWithContext(
-      selectFn,
+      select,
       { ungrouped, granularityOverride, overTimeSeriesAggregate: true }
     );
   }
 
-  ungroupedMeasureSelect(selectFn) {
+  ungroupedMeasureSelect(select) {
     return this.evaluateSymbolSqlWithContext(
-      selectFn,
+      select,
       { ungrouped: true }
     );
   }
@@ -2264,28 +2266,17 @@ export class BaseQuery {
             this.safeEvaluateSymbolContext().leafMeasures[this.safeEvaluateSymbolContext().currentMeasure] = true;
           }
         }
-
+        const primaryKeys = this.cubeEvaluator.primaryKeys[cubeName];
+        const orderBySql = (symbol.orderBy || []).map(o => ({ sql: this.evaluateSql(cubeName, o.sql), dir: o.dir }));
         let sql;
-        let orderBySql = [];
-
-        if ((this.safeEvaluateSymbolContext().ungroupedAliasesForCumulative || {})[memberPath]) {
-          sql = this.safeEvaluateSymbolContext().ungroupedAliasesForCumulative[memberPath];
-          if (this.safeEvaluateSymbolContext().ungroupedBaseQueryAliasForCumulative) {
-            sql = `${this.safeEvaluateSymbolContext().ungroupedBaseQueryAliasForCumulative}.${sql}`;
-          }
-        } else {
-          const primaryKeys = this.cubeEvaluator.primaryKeys[cubeName];
-          orderBySql = (symbol.orderBy || []).map(o => ({ sql: this.evaluateSql(cubeName, o.sql), dir: o.dir }));
-          if (symbol.type !== 'rank') {
-            sql = symbol.sql && this.evaluateSql(cubeName, symbol.sql) ||
-              primaryKeys.length && (
-                primaryKeys.length > 1 ?
-                  this.concatStringsSql(primaryKeys.map((pk) => this.castToString(this.primaryKeySql(pk, cubeName))))
-                  : this.primaryKeySql(primaryKeys[0], cubeName)
-              ) || '*';
-          }
+        if (symbol.type !== 'rank') {
+          sql = symbol.sql && this.evaluateSql(cubeName, symbol.sql) ||
+            primaryKeys.length && (
+              primaryKeys.length > 1 ?
+                this.concatStringsSql(primaryKeys.map((pk) => this.castToString(this.primaryKeySql(pk, cubeName))))
+                : this.primaryKeySql(primaryKeys[0], cubeName)
+            ) || '*';
         }
-
         const result = this.renderSqlMeasure(
           name,
           sql && this.applyMeasureFilters(
@@ -2302,7 +2293,6 @@ export class BaseQuery {
           parentMeasure,
           orderBySql,
         );
-
         if (
           this.safeEvaluateSymbolContext().compositeCubeMeasures ||
           this.safeEvaluateSymbolContext().leafMeasures