Skip to content

Commit 11f3cb4

Browse files
committed
[WIP] fix(schema-compiler): Support member alias for TD with granularity
1 parent 78a5fc3 commit 11f3cb4

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3103,7 +3103,8 @@ export class BaseQuery {
31033103
const outputColumnTypes = [
31043104
...(query.dimensions || []).map(d => findSchemaType(d.dimension)),
31053105
...(query.timeDimensions || []).map(t => ({
3106-
name: `${this.aliasName(t.dimension)}_${t.granularity}`,
3106+
// TODO is it ok to do so?
3107+
name: this.aliasName(`${t.dimension}.${t.granularity}`),
31073108
type: 'TIMESTAMP'
31083109
})),
31093110
...(query.measures || []).map(m => findSchemaType(m.measure)),

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,13 @@ export class BaseTimeDimension extends BaseFilter {
7070
return super.aliasName();
7171
}
7272

73-
// @ts-ignore
74-
public unescapedAliasName(granularity: string) {
75-
const actualGranularity = granularity || this.granularityObj?.granularity || 'day';
73+
public unescapedAliasName(granularity?: string) {
74+
const actualGranularity = granularity ?? this.granularityObj?.granularity ?? 'day';
7675

77-
return `${this.query.aliasName(this.dimension)}_${actualGranularity}`; // TODO date here for rollups
76+
const fullName = `${this.dimension}.${actualGranularity}`;
77+
78+
// TODO date here for rollups
79+
return this.query.aliasName(fullName);
7880
}
7981

8082
public dateSeriesAliasName() {

0 commit comments

Comments
 (0)