refactor(clickhouse): use isoformat instead of manual specification

Author: cpcloud

ibis/backends/clickhouse/compiler/values.py

@@ -346,26 +346,32 @@ def _literal(op, *, value, dtype, **kw):
 
         return interval(value, unit=dtype.resolution.upper())
     elif dtype.is_timestamp():
-        funcname = "toDateTime"
-        fmt = "%Y-%m-%dT%H:%M:%S"
-
+        funcname = "makeDateTime"
         if micros := value.microsecond:
             funcname += "64"
-            fmt += ".%f"
 
-        args = [value.strftime(fmt)]
+        args = [
+            value.year,
+            value.month,
+            value.day,
+            value.hour,
+            value.minute,
+            value.second,
+        ]
 
         if micros % 1000:
+            args.append(micros)
             args.append(6)
-        elif micros // 1000:
+        elif millis := micros // 1000:
+            args.append(millis)
             args.append(3)
 
         if (timezone := dtype.timezone) is not None:
             args.append(timezone)
 
         return F[funcname](*args)
     elif dtype.is_date():
-        return F.toDate(value.strftime("%Y-%m-%d"))
+        return F.toDate(value.isoformat())
     elif dtype.is_array():
         value_type = dtype.value_type
         values = [

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/d/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDate(toDateTime('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toDate(makeDateTime(2009, 5, 17, 12, 34, 56)) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/h/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfHour(toDateTime('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfHour(makeDateTime(2009, 5, 17, 12, 34, 56)) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/m/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfMinute(toDateTime('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfMinute(makeDateTime(2009, 5, 17, 12, 34, 56)) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/minute/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfMinute(toDateTime('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfMinute(makeDateTime(2009, 5, 17, 12, 34, 56)) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/w/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toMonday(toDateTime('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toMonday(makeDateTime(2009, 5, 17, 12, 34, 56)) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/y/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfYear(toDateTime('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfYear(makeDateTime(2009, 5, 17, 12, 34, 56)) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"

ibis/backends/clickhouse/tests/snapshots/test_literals/test_fine_grained_timestamp_literals/micros/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDateTime64('2015-01-01T12:34:56.789321', 6) AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789321)"
+  makeDateTime64(2015, 1, 1, 12, 34, 56, 789321, 6) AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789321)"

ibis/backends/clickhouse/tests/snapshots/test_literals/test_fine_grained_timestamp_literals/micros_tz/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDateTime64('2015-01-01T12:34:56.789321', 6, 'UTC') AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789321, tzinfo=tzutc())"
+  makeDateTime64(2015, 1, 1, 12, 34, 56, 789321, 6, 'UTC') AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789321, tzinfo=tzutc())"

ibis/backends/clickhouse/tests/snapshots/test_literals/test_fine_grained_timestamp_literals/millis/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDateTime64('2015-01-01T12:34:56.789000', 3) AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789000)"
+  makeDateTime64(2015, 1, 1, 12, 34, 56, 789, 3) AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789000)"

ibis/backends/clickhouse/tests/snapshots/test_literals/test_fine_grained_timestamp_literals/millis_tz/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDateTime64('2015-01-01T12:34:56.789000', 3, 'UTC') AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789000, tzinfo=tzutc())"
+  makeDateTime64(2015, 1, 1, 12, 34, 56, 789, 3, 'UTC') AS "datetime.datetime(2015, 1, 1, 12, 34, 56, 789000, tzinfo=tzutc())"

ibis/backends/clickhouse/tests/snapshots/test_literals/test_timestamp_literals/expr0/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDateTime('2015-01-01T12:34:56') AS "datetime.datetime(2015, 1, 1, 12, 34, 56)"
+  makeDateTime(2015, 1, 1, 12, 34, 56) AS "datetime.datetime(2015, 1, 1, 12, 34, 56)"

ibis/backends/clickhouse/tests/snapshots/test_literals/test_timestamp_literals/expr1/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDateTime('2015-01-01T12:34:56') AS "datetime.datetime(2015, 1, 1, 12, 34, 56)"
+  makeDateTime(2015, 1, 1, 12, 34, 56) AS "datetime.datetime(2015, 1, 1, 12, 34, 56)"

ibis/backends/clickhouse/tests/snapshots/test_literals/test_timestamp_literals/expr2/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDateTime('2015-01-01T12:34:56') AS "datetime.datetime(2015, 1, 1, 12, 34, 56)"
+  makeDateTime(2015, 1, 1, 12, 34, 56) AS "datetime.datetime(2015, 1, 1, 12, 34, 56)"