code · pull · Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025
diff --git a/packages/cubejs-backend-native/src/orchestrator.rs b/packages/cubejs-backend-native/src/orchestrator.rs
@@ -2,7 +2,8 @@ use crate::node_obj_deserializer::JsValueDeserializer;
 use crate::transport::MapCubeErrExt;
 use cubeorchestrator::query_message_parser::QueryResult;
 use cubeorchestrator::query_result_transform::{
-    DBResponsePrimitive, RequestResultData, RequestResultDataMulti, TransformedData,
+    DBResponsePrimitive, DBResponseValue, RequestResultData, RequestResultDataMulti,
+    TransformedData,
 };
 use cubeorchestrator::transport::{JsRawData, TransformDataRequest};
 use cubesql::compile::engine::df::scan::{FieldValue, ValueObject};
@@ -258,7 +259,12 @@ pub fn get_cubestore_result(mut cx: FunctionContext) -> JsResult<JsValue> {
                 let js_row = JsObject::new(&mut cx);
                 for (key, value) in result.columns.iter().zip(row.iter()) {
                     let js_key = cx.string(key);
-                    let js_value = cx.string(value.to_string());
+                    let js_value: Handle<'_, JsValue> = match value {
+                        DBResponseValue::Primitive(DBResponsePrimitive::Null) => cx.null().upcast(),
+                        // For compatibility, we convert all primitives to strings
+                        other => cx.string(other.to_string()).upcast(),
+                    };
+
                     js_row.set(&mut cx, js_key, js_value)?;
                 }
                 Ok(js_row)

diff --git a/packages/cubejs-cubestore-driver/package.json b/packages/cubejs-cubestore-driver/package.json
@@ -43,7 +43,6 @@
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
     "@types/csv-write-stream": "^2.0.0",
-    "@types/generic-pool": "^3.8.2",
     "@types/jest": "^29",
     "@types/node": "^20",
     "@types/ws": "^7.4.0",

diff --git a/packages/cubejs-databricks-jdbc-driver/package.json b/packages/cubejs-databricks-jdbc-driver/package.json
@@ -41,7 +41,6 @@
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
-    "@types/generic-pool": "^3.8.2",
     "@types/jest": "^29",
     "@types/node": "^20",
     "@types/ramda": "^0.27.34",

diff --git a/packages/cubejs-dbt-schema-extension/package.json b/packages/cubejs-dbt-schema-extension/package.json
@@ -33,7 +33,6 @@
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
     "@cubejs-backend/testing": "1.3.39",
-    "@types/generic-pool": "^3.8.2",
     "@types/jest": "^29",
     "jest": "^29",
     "stream-to-array": "^2.3.0",

diff --git a/packages/cubejs-druid-driver/package.json b/packages/cubejs-druid-driver/package.json
@@ -35,7 +35,6 @@
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
-    "@types/generic-pool": "^3.8.2",
     "@types/jest": "^29",
     "@types/node": "^20",
     "jest": "^29",

diff --git a/packages/cubejs-jdbc-driver/package.json b/packages/cubejs-jdbc-driver/package.json
@@ -28,7 +28,7 @@
     "@cubejs-backend/base-driver": "1.3.39",
     "@cubejs-backend/node-java-maven": "^0.1.3",
     "@cubejs-backend/shared": "1.3.39",
-    "generic-pool": "^3.8.2",
+    "generic-pool": "^3.9.0",
     "sqlstring": "^2.3.0"
   },
   "optionalDependencies": {
@@ -44,7 +44,6 @@
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
-    "@types/generic-pool": "^3.8.2",
     "@types/node": "^20",
     "@types/sqlstring": "^2.3.0",
     "typescript": "~5.2.2"

diff --git a/packages/cubejs-mongobi-driver/package.json b/packages/cubejs-mongobi-driver/package.json
@@ -30,7 +30,7 @@
     "@cubejs-backend/base-driver": "1.3.39",
     "@cubejs-backend/shared": "1.3.39",
     "@types/node": "^20",
-    "generic-pool": "^3.8.2",
+    "generic-pool": "^3.9.0",
     "moment": "^2.29.1",
     "mysql2": "^3.11.5"
   },
@@ -40,7 +40,6 @@
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
-    "@types/generic-pool": "^3.8.2",
     "testcontainers": "^10.28.0",
     "typescript": "~5.2.2"
   },

diff --git a/packages/cubejs-mysql-driver/package.json b/packages/cubejs-mysql-driver/package.json
@@ -29,13 +29,12 @@
   "dependencies": {
     "@cubejs-backend/base-driver": "1.3.39",
     "@cubejs-backend/shared": "1.3.39",
-    "generic-pool": "^3.8.2",
+    "generic-pool": "^3.9.0",
     "mysql": "^2.18.1"
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
     "@cubejs-backend/testing-shared": "1.3.39",
-    "@types/generic-pool": "^3.8.2",
     "@types/jest": "^29",
     "@types/mysql": "^2.15.21",
     "jest": "^29",

diff --git a/packages/cubejs-query-orchestrator/package.json b/packages/cubejs-query-orchestrator/package.json
@@ -33,13 +33,11 @@
     "@cubejs-backend/cubestore-driver": "1.3.39",
     "@cubejs-backend/shared": "1.3.39",
     "csv-write-stream": "^2.0.0",
-    "generic-pool": "^3.8.2",
     "lru-cache": "^11.1.0",
     "ramda": "^0.27.2"
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.3.39",
-    "@types/generic-pool": "^3.8.2",
     "@types/jest": "^29",
     "@types/node": "^20",
     "@types/ramda": "^0.27.32",

diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/QueryOrchestrator.ts b/packages/cubejs-query-orchestrator/src/orchestrator/QueryOrchestrator.ts
@@ -3,7 +3,7 @@ import R from 'ramda';
 import { getEnv } from '@cubejs-backend/shared';
 import { CubeStoreDriver } from '@cubejs-backend/cubestore-driver';
 
-import { QueryCache, QueryBody, TempTable } from './QueryCache';
+import { QueryCache, QueryBody, TempTable, PreAggTableToTempTable } from './QueryCache';
 import { PreAggregations, PreAggregationDescription, getLastUpdatedAtTimestamp } from './PreAggregations';
 import { DriverFactory, DriverFactoryByDataSource } from './DriverFactory';
 import { LocalQueueEventsBus } from './LocalQueueEventsBus';
@@ -224,28 +224,18 @@ export class QueryOrchestrator {
       };
     }
 
-    const usedPreAggregations = R.pipe(
+    const usedPreAggregations = R.pipe<
+      PreAggTableToTempTable[],
+      Record<string, TempTable>,
+      Record<string, unknown>
+    >(
       R.fromPairs,
-      R.map((pa: TempTable) => ({
+      R.mapObjIndexed((pa: TempTable) => ({
         targetTableName: pa.targetTableName,
         refreshKeyValues: pa.refreshKeyValues,
         lastUpdatedAt: pa.lastUpdatedAt,
       })),
-    )(
-      preAggregationsTablesToTempTables as unknown as [
-        number, // TODO: we actually have a string here
-        {
-          buildRangeEnd: string,
-          lastUpdatedAt: number,
-          queryKey: unknown,
-          refreshKeyValues: [{
-            'refresh_key': string,
-          }][],
-          targetTableName: string,
-          type: string,
-        },
-      ][]
-    );
+    )(preAggregationsTablesToTempTables);
 
     if (this.rollupOnlyMode && Object.keys(usedPreAggregations).length === 0) {
       throw new Error(

diff --git a/packages/cubejs-schema-compiler/package.json b/packages/cubejs-schema-compiler/package.json
@@ -68,6 +68,7 @@
     "@types/inflection": "^1.5.28",
     "@types/jest": "^29",
     "@types/node": "^20",
+    "@types/node-dijkstra": "^2.5.6",
     "@types/ramda": "^0.27.34",
     "@types/sqlstring": "^2.3.0",
     "@types/syntax-error": "^1.4.1",

diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseDimension.ts b/packages/cubejs-schema-compiler/src/adapter/BaseDimension.ts
@@ -142,6 +142,12 @@ export class BaseDimension {
     if (this.expression) {
       return `expr:${this.expressionName}`;
     }
-    return this.query.cubeEvaluator.pathFromArray(this.path() as string[]);
+
+    const path = this.path();
+    if (path === null) {
+      // Sanity check, this should not actually happen because we checked this.expression earlier
+      throw new Error('Unexpected null path');
+    }
+    return this.query.cubeEvaluator.pathFromArray(path);
   }
 }
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseFilter.ts b/packages/cubejs-schema-compiler/src/adapter/BaseFilter.ts
@@ -1,6 +1,6 @@
 import inlection from 'inflection';
 import moment from 'moment-timezone';
-import { contains, join, map } from 'ramda';
+import { includes, join, map } from 'ramda';
 import { FROM_PARTITION_RANGE, TO_PARTITION_RANGE } from '@cubejs-backend/shared';
 
 import { BaseDimension } from './BaseDimension';
@@ -134,7 +134,7 @@ export class BaseFilter extends BaseDimension {
   }
 
   public isDateOperator(): boolean {
-    return contains(this.camelizeOperator, DATE_OPERATORS);
+    return includes(this.camelizeOperator, DATE_OPERATORS);
   }
 
   public valuesArray() {

diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseMeasure.ts b/packages/cubejs-schema-compiler/src/adapter/BaseMeasure.ts
@@ -206,32 +206,32 @@ export class BaseMeasure {
     return this.measureDefinition();
   }
 
-  public aliasName() {
+  public aliasName(): string {
     return this.query.escapeColumnName(this.unescapedAliasName());
   }
 
-  public unescapedAliasName() {
+  public unescapedAliasName(): string {
     if (this.expression) {
       return this.query.aliasName(this.expressionName);
     }
     return this.query.aliasName(this.measure);
   }
 
-  public isCumulative() {
+  public isCumulative(): boolean {
     if (this.expression) { // TODO
       return false;
     }
     return BaseMeasure.isCumulative(this.measureDefinition());
   }
 
-  public isMultiStage() {
+  public isMultiStage(): boolean {
     if (this.expression) { // TODO
       return false;
     }
     return this.definition().multiStage;
   }
 
-  public isAdditive() {
+  public isAdditive(): boolean {
     if (this.expression) { // TODO
       return false;
     }
@@ -243,7 +243,7 @@ export class BaseMeasure {
       definition.type === 'min' || definition.type === 'max';
   }
 
-  public static isCumulative(definition) {
+  public static isCumulative(definition): boolean {
     return definition.type === 'runningTotal' || !!definition.rollingWindow;
   }
 
@@ -294,7 +294,7 @@ export class BaseMeasure {
     return this.query.minGranularity(granularityA, granularityB);
   }
 
-  public granularityFromInterval(interval: string) {
+  public granularityFromInterval(interval: string): string | undefined {
     if (!interval) {
       return undefined;
     }
@@ -312,25 +312,31 @@ export class BaseMeasure {
     return undefined;
   }
 
-  public shouldUngroupForCumulative() {
+  public shouldUngroupForCumulative(): boolean {
     return this.measureDefinition().rollingWindow && !this.isAdditive();
   }
 
   public sqlDefinition() {
     return this.measureDefinition().sql;
   }
 
-  public path() {
+  public path(): string[] | null {
     if (this.expression) {
       return null;
     }
     return this.query.cubeEvaluator.parsePath('measures', this.measure);
   }
 
-  public expressionPath() {
+  public expressionPath(): string {
     if (this.expression) {
       return `expr:${this.expression.expressionName}`;
     }
-    return this.query.cubeEvaluator.pathFromArray(this.path() as string[]);
+
+    const path = this.path();
+    if (path === null) {
+      // Sanity check, this should not actually happen because we checked this.expression earlier
+      throw new Error('Unexpected null path');
+    }
+    return this.query.cubeEvaluator.pathFromArray(path);
   }
 }