Skip to content

Commit 7d38c8d

Browse files
committed
refactor(schema-compiler): More types for PreAggregations
1 parent 954bda4 commit 7d38c8d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ export class CubeStoreQuery extends BaseQuery {
284284
}
285285

286286
public overTimeSeriesForSelectRollup(cumulativeMeasures, otherMeasures, timeDimension, preAggregationForQuery) {
287-
const rollupMeasures = this.preAggregations?.rollupMeasures(preAggregationForQuery);
287+
const rollupMeasures = this.preAggregations.rollupMeasures(preAggregationForQuery);
288288
const renderedReference = rollupMeasures.map(measure => {
289289
const m = this.newMeasure(measure);
290290
const renderSql = () => {

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,22 +1515,23 @@ export class PreAggregations {
15151515
)(this.rollupTimeDimensions(preAggregationForQuery));
15161516
}
15171517

1518-
private rollupMembers(preAggregationForQuery: PreAggregationForQuery, type: 'measures' | 'dimensions' | 'timeDimensions'): string[] | PreAggregationTimeDimensionReference[] {
1518+
private rollupMembers<T extends 'measures' | 'dimensions' | 'timeDimensions'>(preAggregationForQuery: PreAggregationForQuery, type: T): PreAggregationReferences[T] {
15191519
return preAggregationForQuery.preAggregation.type === 'autoRollup' ?
1520-
preAggregationForQuery.preAggregation[type] :
1520+
// TODO proper types
1521+
(preAggregationForQuery.preAggregation as any)[type] :
15211522
this.evaluateAllReferences(preAggregationForQuery.cube, preAggregationForQuery.preAggregation, preAggregationForQuery.preAggregationName)[type];
15221523
}
15231524

15241525
public rollupMeasures(preAggregationForQuery: PreAggregationForQuery): string[] {
1525-
return this.rollupMembers(preAggregationForQuery, 'measures') as string[];
1526+
return this.rollupMembers(preAggregationForQuery, 'measures');
15261527
}
15271528

15281529
public rollupDimensions(preAggregationForQuery: PreAggregationForQuery): string[] {
1529-
return this.rollupMembers(preAggregationForQuery, 'dimensions') as string[];
1530+
return this.rollupMembers(preAggregationForQuery, 'dimensions');
15301531
}
15311532

15321533
public rollupTimeDimensions(preAggregationForQuery: PreAggregationForQuery): PreAggregationTimeDimensionReference[] {
1533-
return this.rollupMembers(preAggregationForQuery, 'timeDimensions') as PreAggregationTimeDimensionReference[];
1534+
return this.rollupMembers(preAggregationForQuery, 'timeDimensions');
15341535
}
15351536

15361537
public preAggregationId(preAggregation: PreAggregationForQuery): string {

0 commit comments

Comments
 (0)