Better handling of timezones in dates, with tests

Author: matt-aitken

internal-packages/tsql/src/query/escape.test.ts

@@ -120,11 +120,20 @@ describe("SQLValueEscaper", () => {
       ).toBe("[[1, 2], [3, 4]]");
     });
 
-    it("should escape dates with toDateTime64", () => {
+    it("should escape dates with toDateTime64 and default UTC timezone", () => {
       const date = new Date("2024-01-15T10:30:00.500Z");
       const result = escaper.visit(date);
-      expect(result).toContain("toDateTime64");
-      expect(result).toContain("2024-01-15");
+      expect(result).toBe("toDateTime64('2024-01-15 10:30:00.500000', 6, 'UTC')");
+    });
+
+    it("should escape dates with custom timezone", () => {
+      const escaperWithTz = new SQLValueEscaper({
+        dialect: "clickhouse",
+        timezone: "America/New_York",
+      });
+      const date = new Date("2024-01-15T10:30:00.500Z");
+      const result = escaperWithTz.visit(date);
+      expect(result).toBe("toDateTime64('2024-01-15 10:30:00.500000', 6, 'America/New_York')");
     });
   });
 
@@ -136,11 +145,20 @@ describe("SQLValueEscaper", () => {
       expect(escaper.visit(false)).toBe("false");
     });
 
-    it("should escape dates with toDateTime", () => {
+    it("should escape dates with toDateTime and default UTC timezone", () => {
       const date = new Date("2024-01-15T10:30:00.500Z");
       const result = escaper.visit(date);
-      expect(result).toContain("toDateTime");
-      expect(result).toContain("2024-01-15");
+      expect(result).toBe("toDateTime('2024-01-15 10:30:00.500000', 'UTC')");
+    });
+
+    it("should escape dates with custom timezone", () => {
+      const escaperWithTz = new SQLValueEscaper({
+        dialect: "tsql",
+        timezone: "Europe/London",
+      });
+      const date = new Date("2024-01-15T10:30:00.500Z");
+      const result = escaperWithTz.visit(date);
+      expect(result).toBe("toDateTime('2024-01-15 10:30:00.500000', 'Europe/London')");
     });
   });
 });

internal-packages/tsql/src/query/escape.ts

@@ -200,9 +200,11 @@ export class SQLValueEscaper {
     const datetimeString = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${ms}000`;
 
     if (this.dialect === "tsql") {
-      return `toDateTime(${this.visitString(datetimeString)})`;
+      return `toDateTime(${this.visitString(datetimeString)}, ${this.visitString(this.timezone)})`;
     }
-    return `toDateTime64(${this.visitString(datetimeString)}, 6, ${this.visitString(this.timezone)})`;
+    return `toDateTime64(${this.visitString(datetimeString)}, 6, ${this.visitString(
+      this.timezone
+    )})`;
   }
 
   private visitArray(value: EscapableValue[]): string {
@@ -261,4 +263,3 @@ export function getClickHouseType(value: unknown): string {
   // Default to String for unknown types
   return "String";
 }
-

internal-packages/tsql/src/query/printer.test.ts

@@ -867,12 +867,48 @@ describe("ClickHousePrinter", () => {
   });
 
   describe("Functions", () => {
-    it("should print toDateTime", () => {
+    it("should print toDateTime with column argument", () => {
       const { sql } = printQuery("SELECT toDateTime(created_at) FROM task_runs");
 
       expect(sql).toContain("toDateTime(created_at)");
     });
 
+    it("should print toDateTime with string and timezone arguments", () => {
+      const { sql, params } = printQuery(
+        "SELECT toDateTime('2024-01-15 10:30:00', 'UTC') FROM task_runs"
+      );
+
+      // String values are parameterized for security
+      expect(sql).toContain("toDateTime(");
+      expect(sql).toMatch(/toDateTime\(\{tsql_val_\d+: String\}, \{tsql_val_\d+: String\}\)/);
+      expect(Object.values(params)).toContain("2024-01-15 10:30:00");
+      expect(Object.values(params)).toContain("UTC");
+    });
+
+    it("should print toDateTime with timezone containing special characters", () => {
+      const { sql, params } = printQuery(
+        "SELECT toDateTime('2024-01-15 10:30:00', 'America/New_York') FROM task_runs"
+      );
+
+      // String values are parameterized for security
+      expect(sql).toContain("toDateTime(");
+      expect(sql).toMatch(/toDateTime\(\{tsql_val_\d+: String\}, \{tsql_val_\d+: String\}\)/);
+      expect(Object.values(params)).toContain("2024-01-15 10:30:00");
+      expect(Object.values(params)).toContain("America/New_York");
+    });
+
+    it("should print toDateTime64 with precision and timezone", () => {
+      const { sql, params } = printQuery(
+        "SELECT toDateTime64('2024-01-15 10:30:00.500000', 6, 'Europe/London') FROM task_runs"
+      );
+
+      // String values are parameterized, but numeric precision is inline
+      expect(sql).toContain("toDateTime64(");
+      expect(sql).toMatch(/toDateTime64\(\{tsql_val_\d+: String\}, 6, \{tsql_val_\d+: String\}\)/);
+      expect(Object.values(params)).toContain("2024-01-15 10:30:00.500000");
+      expect(Object.values(params)).toContain("Europe/London");
+    });
+
     it("should print now()", () => {
       const { sql } = printQuery("SELECT * FROM task_runs WHERE created_at > now()");