Skip to content

Commit 37df397

Browse files
committed
fix(schema-compiler): return granularity-truncated queries in client time zone
1 parent 19750e1 commit 37df397

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class BaseTimeDimension extends BaseFilter {
114114
return this.convertedToTz();
115115
}
116116

117-
return this.query.dimensionTimeGroupedColumn(this.convertedToTz(), <Granularity>granularity);
117+
return this.query.convertTz(this.query.dimensionTimeGroupedColumn(this.query.dimensionSql(this), <Granularity>granularity));
118118
}
119119

120120
public dimensionDefinition(): DimensionDefinition | SegmentDefinition {

packages/cubejs-schema-compiler/test/unit/base-query.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ describe('SQL Generation', () => {
121121

122122
const queryAndParams = query.buildSqlAndParams();
123123

124-
expect(queryAndParams[0]).toContain('"cards".type "cards__type", date_trunc(\'day\', ("cards".created_at::timestamptz AT TIME ZONE \'America/Los_Angeles\')) "cards__created_at_day"');
124+
expect(queryAndParams[0]).toContain('"cards".type "cards__type", (date_trunc(\'day\', "cards".created_at)::timestamptz AT TIME ZONE \'America/Los_Angeles\') "cards__created_at_day"');
125125
expect(queryAndParams[0]).toContain('GROUP BY 1, 2');
126126
expect(queryAndParams[0]).toContain('ORDER BY 2');
127127
});

0 commit comments

Comments
 (0)