refactor: convert dates to timestamps

simPod · Jan 29, 2025 · f1fab3f · f1fab3f
1 parent 9a90f8e
commit f1fab3f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/Param/ParamValueConverterRegistry.php b/src/Param/ParamValueConverterRegistry.php
@@ -267,14 +267,15 @@ private static function decimalConverter(): Closure
     private static function dateConverter(): Closure
     {
         return static fn (DateTimeInterface|string|int|float $value) => $value instanceof DateTimeInterface
+            // We cannot convert to timestamp yet https://github.com/ClickHouse/ClickHouse/issues/75217
             ? $value->format('Y-m-d')
             : $value;
     }
 
     private static function dateTimeConverter(): Closure
     {
         return static fn (DateTimeInterface|string|int|float $value) => $value instanceof DateTimeInterface
-            ? $value->format('Y-m-d H:i:s')
+            ? $value->getTimestamp()
             : $value;
     }
 

diff --git a/src/Sql/ValueFormatter.php b/src/Sql/ValueFormatter.php
@@ -71,7 +71,7 @@ public function format(mixed $value, string|null $paramName = null, string|null
                 $value = $value->setTimezone($this->dateTimeZone);
             }
 
-            return "'" . $value->format('Y-m-d H:i:s') . "'";
+            return (string) $value->getTimestamp();
         }
 
         if ($value instanceof Expression) {

diff --git a/tests/Client/Http/RequestFactoryTest.php b/tests/Client/Http/RequestFactoryTest.php
@@ -79,10 +79,9 @@ public function testParamParsed(): void
         );
 
         $now     = new DateTimeImmutable();
-        $nowDate = $now->format('Y-m-d');
 
         $request = $requestFactory->prepareSqlRequest(
-            'SELECT {p1:String}, {p_2:Date}',
+            'SELECT {p1:String}, {p_2:DateTime}',
             new RequestSettings(
                 [],
                 [],
@@ -104,7 +103,7 @@ public function testParamParsed(): void
                     'Content-Disposition: form-data; name="param_p_2"',
                     'Content-Length: 10',
                     '',
-                    $nowDate,
+                    $now->getTimestamp(),
                 ],
             ),
             $body,

diff --git a/tests/Sql/ValueFormatterTest.php b/tests/Sql/ValueFormatterTest.php
@@ -68,9 +68,9 @@ public static function providerFormat(): iterable
             'SELECT * FROM table WHERE (a,b) IN (:tuples)',
         ];
 
-        yield 'DateTimeImmutable' => ["'2020-01-31 01:23:45'", new DateTimeImmutable('2020-01-31 01:23:45')];
+        yield 'DateTimeImmutable' => ['1580433825', new DateTimeImmutable('2020-01-31 01:23:45')];
         yield 'DateTimeImmutable different PHP and ClickHouse timezones' => [
-            "'2020-01-31 01:23:45'",
+            '1580433825',
             new DateTimeImmutable('2020-01-31 02:23:45', new DateTimeZone('Europe/Prague')),
         ];