chore: dont check dimension if there is no dataRange

cube-js · Nov 24, 2023 · e4a8841 · e4a8841
1 parent e80eee1
commit e4a8841
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js b/packages/cubejs-schema-compiler/src/adapter/PreAggregations.js
@@ -154,12 +154,16 @@ export class PreAggregations {
 
     const matchedTimeDimension = preAggregation.partitionGranularity && !this.hasCumulativeMeasures &&
       this.query.timeDimensions.find(td => {
-        if (td.dimension === foundPreAggregation.references.timeDimensions[0].dimension && td.dateRange) {
+        if (!td.dateRange) {
+          return false;
+        }
+
+        if (td.dimension === foundPreAggregation.references.timeDimensions[0].dimension) {
           return true;
         }
 
         const parent = this.query.cubeEvaluator.byPath('dimensions', td.expressionPath());
-        if (parent?.aliasMember === foundPreAggregation.references.timeDimensions[0].dimension && td.dateRange) {
+        if (parent?.aliasMember === foundPreAggregation.references.timeDimensions[0].dimension) {
           return true;
         }
 

diff --git a/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.js b/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.js
@@ -308,13 +308,22 @@ export class CubeEvaluator extends CubeSymbols {
     return cubeAndName[0];
   }
 
+  /**
+   * @param {measures|dimensions|segments} type
+   * @param {string} path
+   * @returns boolean
+   */
   isInstanceOfType(type, path) {
     const cubeAndName = Array.isArray(path) ? path : path.split('.');
     return this.evaluatedCubes[cubeAndName[0]] &&
       this.evaluatedCubes[cubeAndName[0]][type] &&
       this.evaluatedCubes[cubeAndName[0]][type][cubeAndName[1]];
   }
 
+  /**
+   * @param {string} path
+   * @returns {*}
+   */
   byPathAnyType(path) {
     const type = ['measures', 'dimensions', 'segments'].find(t => this.isInstanceOfType(t, path));
 
@@ -325,6 +334,11 @@ export class CubeEvaluator extends CubeSymbols {
     return this.byPath(type, path);
   }
 
+  /**
+   * @param {measures|dimensions|segments} type
+   * @param {string} path
+   * @returns {*}
+   */
   byPath(type, path) {
     if (!type) {
       throw new Error(`Type can't be undefined for '${path}'`);