From c05a36e3047b393f1d5a22b5628595470beccbdb Mon Sep 17 00:00:00 2001 From: Konstantin Burkalev Date: Tue, 29 Oct 2024 14:03:41 +0200 Subject: [PATCH] =?UTF-8?q?fix(schema-compiler):=20return=20granularity-tr?= =?UTF-8?q?uncated=20queries=20in=C2=A0client=20time=20zone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts | 2 +- packages/cubejs-schema-compiler/test/unit/base-query.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts b/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts index 28e16a2c87a64..4445f0246707b 100644 --- a/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts +++ b/packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts @@ -114,7 +114,7 @@ export class BaseTimeDimension extends BaseFilter { return this.convertedToTz(); } - return this.query.dimensionTimeGroupedColumn(this.convertedToTz(), granularity); + return this.query.convertTz(this.query.dimensionTimeGroupedColumn(this.query.dimensionSql(this), granularity)); } public dimensionDefinition(): DimensionDefinition | SegmentDefinition { diff --git a/packages/cubejs-schema-compiler/test/unit/base-query.test.ts b/packages/cubejs-schema-compiler/test/unit/base-query.test.ts index bd57b53da0c4e..01f23174d6f47 100644 --- a/packages/cubejs-schema-compiler/test/unit/base-query.test.ts +++ b/packages/cubejs-schema-compiler/test/unit/base-query.test.ts @@ -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'); });