lint

Author: waralexrom

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

@@ -740,12 +740,13 @@ export class BaseQuery {
     }
 
     const res = buildResult.result;
+    const [query, params, preAggregation] = res;
     // FIXME
-    res[1] = [...res[1]];
-    if (res[2]) {
-      this.preAggregations.preAggregationForQuery = res[2];
+    const paramsArray = [...params];
+    if (preAggregation) {
+      this.preAggregations.preAggregationForQuery = preAggregation;
     }
-    return res;
+    return [query, paramsArray];
   }
 
   // FIXME Temporary solution
@@ -789,9 +790,9 @@ export class BaseQuery {
         }
       }
 
-      const res = buildResult.result;
-      if (res[2]) {
-        this.preAggregations.preAggregationForQuery = res[2];
+      const [, , preAggregation] = buildResult.result;
+      if (preAggregation) {
+        this.preAggregations.preAggregationForQuery = preAggregation;
       }
     }
     return this.preAggregations.preAggregationForQuery;

packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations.test.ts

@@ -569,7 +569,6 @@ describe('PreAggregations', () => {
     });
   });
 
-
   if (getEnv('nativeSqlPlanner')) {
     it('simple pre-aggregation proxy time dimension', () => compiler.compile().then(() => {
       const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {

rust/cubesqlplanner/cubesqlplanner/src/planner/base_query.rs

@@ -130,11 +130,9 @@ impl<IT: InnerTypes> BaseQuery<IT> {
                         result,
                         pre_aggregation_optimizer.get_used_pre_aggregations(),
                     )
-                } else { //TODO multiple pre-aggregations sources required changes in BaseQuery
-                    (
-                        plan.clone(),
-                        Vec::new(),
-                    )
+                } else {
+                    //TODO multiple pre-aggregations sources required changes in BaseQuery
+                    (plan.clone(), Vec::new())
                 }
             } else {
                 (plan.clone(), Vec::new())