chore: fix super strange format issue

Author: ovr

packages/cubejs-schema-compiler/package.json

@@ -82,7 +82,8 @@
     "source-map-support": "^0.5.19",
     "sqlstring": "^2.3.1",
     "testcontainers": "^10.28.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.2.2",
+    "moment": "^2.30.1"
   },
   "license": "Apache-2.0",
   "eslintConfig": {

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

@@ -74,16 +74,13 @@ export class ClickHouseQuery extends BaseQuery {
     const timeUnit = this.diffTimeUnitForInterval(interval);
     const beginOfTime = 'fromUnixTimestamp(0)';
 
-    const dateBinResult = `date_add(${timeUnit},
+    return `date_add(${timeUnit},
         FLOOR(
           date_diff(${timeUnit}, ${alignedOrigin}, ${source}) /
           date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted})
         ) * date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted}),
         ${alignedOrigin}
     )`;
-
-    // Normalize the result to DateTime64(0) for consistent formatting
-    return `toDateTime64(${dateBinResult}, 0, '${this.timezone}')`;
   }
 
   public subtractInterval(date: string, interval: string): string {

packages/cubejs-schema-compiler/test/integration/clickhouse/ClickHouseDbRunner.ts

@@ -4,6 +4,8 @@ import { GenericContainer } from 'testcontainers';
 import type { StartedTestContainer } from 'testcontainers';
 import { format as formatSql } from 'sqlstring';
 import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+
 import { ClickHouseQuery } from '../../../src/adapter/ClickHouseQuery';
 import { BaseDbRunner } from '../utils/BaseDbRunner';
 
@@ -210,10 +212,14 @@ export class ClickHouseDbRunner extends BaseDbRunner {
           if (fieldMeta === undefined) {
             throw new Error(`Missing meta for field ${field}`);
           }
-          if (fieldMeta.type.includes('DateTime')) {
+
+          if (fieldMeta.type.includes('DateTime64')) {
+            row[field] = moment.utc(value).format(moment.HTML5_FMT.DATETIME_LOCAL_MS);
+          } else if (fieldMeta.type.includes('DateTime') /** Can be DateTime or DateTime('timezone') */) {
             if (typeof value !== 'string') {
               throw new Error(`Unexpected value for ${field}`);
             }
+
             row[field] = `${value.substring(0, 10)}T${value.substring(11, 22)}.000`;
           } else if (fieldMeta.type.includes('Date')) {
             row[field] = `${value}T00:00:00.000`;

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

@@ -1012,7 +1012,7 @@ describe('SQL Generation', () => {
               relationship: 'one_to_one'
             },
           }`
-        }).replace(`sql: \`\${CUBE}.location = 'San Francisco'\``, `sql: \`\${FILTER_PARAMS.cardsA.location.filter('location')}\``),
+        }).replace('sql: `${CUBE}.location = \'San Francisco\'`', 'sql: `${FILTER_PARAMS.cardsA.location.filter(\'location\')}`'),
         createCubeSchema({
           name: 'cardsB',
           sqlTable: 'card2_tbl',

yarn.lock

@@ -19505,10 +19505,10 @@ moment-timezone@^0.5.15, moment-timezone@^0.5.33, moment-timezone@^0.5.46, momen
   dependencies:
     moment "^2.29.4"
 
-moment@^2.17.1, moment@^2.24.0, moment@^2.25.3, moment@^2.29.1, moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
+moment@^2.17.1, moment@^2.24.0, moment@^2.25.3, moment@^2.29.1, moment@^2.29.4, moment@^2.30.1:
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
 [email protected]:
   version "2.0.0"