fix(mssql-driver): Respect timezone for origin in custom granularities

Author: ovr

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

@@ -69,17 +69,17 @@ export class ClickHouseQuery extends BaseQuery {
   public dateBin(interval: string, source: string, origin: string): string {
     // Pass timezone to dateTimeCast to ensure origin is in the same timezone as a source, because ClickHouse aligns
     // both timestamps internally to the same timezone before computing the difference, causing an unintended offset.
-    const alignedOrigin = this.dateTimeCast(`'${origin}'`, this.timezone);
+    const originAligned = this.dateTimeCast(`'${origin}'`, this.timezone);
     const intervalFormatted = this.formatInterval(interval);
     const timeUnit = this.diffTimeUnitForInterval(interval);
     const beginOfTime = 'fromUnixTimestamp(0)';
 
     return `date_add(${timeUnit},
         FLOOR(
-          date_diff(${timeUnit}, ${alignedOrigin}, ${source}) /
+          date_diff(${timeUnit}, ${originAligned}, ${source}) /
           date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted})
         ) * date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted}),
-        ${alignedOrigin}
+        ${originAligned}
     )`;
   }
 

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

@@ -90,7 +90,12 @@ export class MssqlQuery extends BaseQuery {
   }
 
   public convertTz(field) {
-    return `TODATETIMEOFFSET(${field}, '${moment().tz(this.timezone).format('Z')}')`;
+    const offset = moment().tz(this.timezone).format('Z');
+
+    // 1. Treating the field as UTC (add '+00:00' offset)
+    // 2. Switch to target timezone offset
+    // 3. Cast to DATETIME2 to get naive timestamp in target timezone
+    return `CAST(SWITCHOFFSET(TODATETIMEOFFSET(${field}, '+00:00'), '${offset}') AS DATETIME2)`;
   }
 
   public timeStampCast(value: string) {
@@ -106,21 +111,24 @@ export class MssqlQuery extends BaseQuery {
   }
 
   /**
-   * Returns sql for source expression floored to timestamps aligned with
-   * intervals relative to origin timestamp point.
-   * The formula operates with seconds diffs so it won't produce human-expected dates aligned with offset date parts.
+   * Returns SQL for source expression floored to timestamps aligned with
+   * intervals relative to the origin timestamp point.
+   * The formula operates with seconds diffs, so it won't produce human-expected dates aligned with offset date parts.
    */
   public dateBin(interval: string, source: string, origin: string): string {
+    // Both source and origin are now DATETIME2 in the query timezone (naive timestamps),
+    // ensuring their in the same timezone context for correct date bin calculation.
+    const originAligned = this.dateTimeCast(`'${origin}'`);
     const beginOfTime = this.dateTimeCast('DATEFROMPARTS(1970, 1, 1)');
     const timeUnit = this.diffTimeUnitForInterval(interval);
 
     // Need to explicitly cast one argument of floor to float to trigger correct sign logic
     return `DATEADD(${timeUnit},
         FLOOR(
-          CAST(DATEDIFF(${timeUnit}, ${this.dateTimeCast(`'${origin}'`)}, ${source}) AS FLOAT) /
+          CAST(DATEDIFF(${timeUnit}, ${originAligned}, ${source}) AS FLOAT) /
           DATEDIFF(${timeUnit}, ${beginOfTime}, ${this.addInterval(beginOfTime, interval)})
         ) * DATEDIFF(${timeUnit}, ${beginOfTime}, ${this.addInterval(beginOfTime, interval)}),
-        ${this.dateTimeCast(`'${origin}'`)}
+        ${originAligned}
     )`;
   }
 

packages/cubejs-schema-compiler/test/integration/mssql/custom-granularities.test.ts

@@ -158,8 +158,7 @@ describe('Custom Granularities', () => {
     { joinGraph, cubeEvaluator, compiler }
   ));
 
-  /// TODO: fix date bin calculation... for some reason it goes from 2023-12-31T23:00:00.000Z
-  xit('works with five_minutes_from_utc_origin custom granularity in Europe/Paris timezone', async () => dbRunner.runQueryTest(
+  it('works with five_minutes_from_utc_origin custom granularity in Europe/Paris timezone', async () => dbRunner.runQueryTest(
     {
       measures: ['orders.count'],
       timeDimensions: [{
@@ -188,8 +187,7 @@ describe('Custom Granularities', () => {
     { joinGraph, cubeEvaluator, compiler }
   ));
 
-  /// TODO: fix date bin calculation... for some reason it goes from 2023-12-31T23:00:00.000Z
-  xit('works with five_minutes_from_local_origin custom granularity in Europe/Paris timezone', async () => dbRunner.runQueryTest(
+  it('works with five_minutes_from_local_origin custom granularity in Europe/Paris timezone', async () => dbRunner.runQueryTest(
     {
       measures: ['orders.count'],
       timeDimensions: [{