fix

Author: waralexrom

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

@@ -748,51 +748,46 @@ export class BaseQuery {
 
   // FIXME Temporary solution
   findPreAggregationForQueryRust() {
-    if (!this.preAggregations.preAggregationForQuery) {
-      let optionsOrder = this.options.order;
-      if (optionsOrder && !Array.isArray(optionsOrder)) {
-        optionsOrder = [optionsOrder];
-      }
-      const order = optionsOrder ? R.pipe(
-        R.map((hash) => ((!hash || !hash.id) ? null : hash)),
-        R.reject(R.isNil),
-      )(optionsOrder) : undefined;
-
-      const queryParams = {
-        measures: this.options.measures,
-        dimensions: this.options.dimensions,
-        segments: this.options.segments,
-        timeDimensions: this.options.timeDimensions,
-        timezone: this.options.timezone,
-        joinGraph: this.joinGraph,
-        cubeEvaluator: this.cubeEvaluator,
-        order,
-        filters: this.options.filters,
-        limit: this.options.limit ? this.options.limit.toString() : null,
-        rowLimit: this.options.rowLimit ? this.options.rowLimit.toString() : null,
-        offset: this.options.offset ? this.options.offset.toString() : null,
-        baseTools: this,
-        ungrouped: this.options.ungrouped,
-        exportAnnotatedSql: false,
-        preAggregationQuery: this.options.preAggregationQuery
-      };
+    let optionsOrder = this.options.order;
+    if (optionsOrder && !Array.isArray(optionsOrder)) {
+      optionsOrder = [optionsOrder];
+    }
+    const order = optionsOrder ? R.pipe(
+      R.map((hash) => ((!hash || !hash.id) ? null : hash)),
+      R.reject(R.isNil),
+    )(optionsOrder) : undefined;
 
-      const buildResult = nativeBuildSqlAndParams(queryParams);
+    const queryParams = {
+      measures: this.options.measures,
+      dimensions: this.options.dimensions,
+      segments: this.options.segments,
+      timeDimensions: this.options.timeDimensions,
+      timezone: this.options.timezone,
+      joinGraph: this.joinGraph,
+      cubeEvaluator: this.cubeEvaluator,
+      order,
+      filters: this.options.filters,
+      limit: this.options.limit ? this.options.limit.toString() : null,
+      rowLimit: this.options.rowLimit ? this.options.rowLimit.toString() : null,
+      offset: this.options.offset ? this.options.offset.toString() : null,
+      baseTools: this,
+      ungrouped: this.options.ungrouped,
+      exportAnnotatedSql: false,
+      preAggregationQuery: this.options.preAggregationQuery
+    };
 
-      if (buildResult.error) {
-        if (buildResult.error.cause === 'User') {
-          throw new UserError(buildResult.error.message);
-        } else {
-          throw new Error(buildResult.error.message);
-        }
-      }
+    const buildResult = nativeBuildSqlAndParams(queryParams);
 
-      const [, , preAggregation] = buildResult.result;
-      if (preAggregation) {
-        this.preAggregations.preAggregationForQuery = preAggregation;
+    if (buildResult.error) {
+      if (buildResult.error.cause === 'User') {
+        throw new UserError(buildResult.error.message);
+      } else {
+        throw new Error(buildResult.error.message);
       }
     }
-    return this.preAggregations.preAggregationForQuery;
+
+    const [, , preAggregation] = buildResult.result;
+    return preAggregation;
   }
 
   allCubeMembers(path) {

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

@@ -783,7 +783,7 @@ export class PreAggregations {
   findPreAggregationForQuery() {
     if (!this.preAggregationForQuery) {
       if (this.query.useNativeSqlPlanner && this.query.canUseNativeSqlPlannerPreAggregation) {
-        this.query.findPreAggregationForQueryRust();
+        this.preAggregationForQuery = this.query.findPreAggregationForQueryRust();
       } else {
         this.preAggregationForQuery =
           this
@@ -875,7 +875,7 @@ export class PreAggregations {
     const preAggregation = R.pipe(
       R.toPairs,
       R.filter(([_, a]) => a.type === 'rollup' || a.type === 'rollupJoin' || a.type === 'rollupLambda'),
-      R.find(([_, a]) => a.name === preAggregationName)
+      R.find(([k, _]) => k === preAggregationName)
     )(this.query.cubeEvaluator.preAggregationsForCube(cube));
     if (preAggregation) {
       const tableName = this.preAggregationTableName(cube, preAggregation[0], preAggregation[1]);

packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts

@@ -520,7 +520,7 @@ export class CubeEvaluator extends CubeSymbols {
     return this.cubeFromPath(path).preAggregations || {};
   }
 
-  public preAggregationsForCubeAsArray(path: string): Record<string, any> {
+  public preAggregationsForCubeAsArray(path: string) {
     return Object.entries(this.cubeFromPath(path).preAggregations || {}).map(([name, preAggregation]) => ({
       name,
       ...(preAggregation as Record<string, any>)