Skip to content

fix(schema-compiler): return granularity-truncated queries in client time zone #8877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(schema-compiler): return granularity-truncated queries in client time zone #8877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export class BaseTimeDimension extends BaseFilter {
return this.convertedToTz();
}

return this.query.dimensionTimeGroupedColumn(this.convertedToTz(), <Granularity>granularity);
return this.query.convertTz(this.query.dimensionTimeGroupedColumn(this.query.dimensionSql(this), <Granularity>granularity));
}

public dimensionDefinition(): DimensionDefinition | SegmentDefinition {
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-schema-compiler/test/unit/base-query.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ describe('SQL Generation', () => {

const queryAndParams = query.buildSqlAndParams();

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"');
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"');
expect(queryAndParams[0]).toContain('GROUP BY 1, 2');
expect(queryAndParams[0]).toContain('ORDER BY 2');
});
Expand Down
Loading