Fix wrong value on DateTime values (#24)

Author: welpie21

src/Cbor/CBOR.php

@@ -7,6 +7,7 @@
 use Beau\CborPHP\classes\TaggedValue;
 use Beau\CborPHP\exceptions\CborException;
 use Brick\Math\BigDecimal;
+use DateInterval;
 use DateTime;
 use DateTimeImmutable;
 use DateTimeInterface;
@@ -30,6 +31,28 @@
 use Surreal\Cbor\Types\Table;
 use Surreal\Cbor\Types\Uuid;
 
+/**
+ * @throws Exception
+ */
+function cborCustomDateToDate(array $date): DateTime {
+    [$seconds, $nanoseconds] = $date;
+
+    // Convert nanoseconds to microseconds (PHP's maximum precision)
+    $microseconds = intval($nanoseconds / 1000);
+
+    // Create DateTime directly with microseconds using DateTimeImmutable and format
+    $formatted = date('Y-m-d H:i:s', $seconds) . '.' . sprintf('%06d', $microseconds);
+
+    // Create DateTime object from formatted string
+    $date = DateTime::createFromFormat('Y-m-d H:i:s.u', $formatted);
+
+    if($date === false) {
+        throw new Exception("Failed to create DateTime from CBOR custom date format");
+    }
+
+    return $date;
+}
+
 class CBOR
 {
     /**
@@ -162,9 +185,7 @@ public static function decode(string $data): mixed
                 CustomTag::STRING_UUID => Uuid::fromString($tagged->value),
                 CustomTag::STRING_DECIMAL => BigDecimal::of($tagged->value),
 
-                CustomTag::CUSTOM_DATETIME => (new DateTime())
-                    ->setTimestamp($tagged->value[0])
-                    ->setTime(0, 0, 0, $tagged->value[1]),
+                CustomTag::CUSTOM_DATETIME => cborCustomDateToDate($tagged->value),
 
                 CustomTag::STRING_DURATION => new Duration($tagged->value),
                 CustomTag::CUSTOM_DURATION => Duration::fromCompact([$tagged->value[0], $tagged->value[1]]),

tests/core/functionality/DateTimeTest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace core\functionality;
+
+use DateTime;
+use Exception;
+use PHPUnit\Framework\TestCase;
+use Surreal\Cbor\Types\Record\RecordId;
+use Surreal\Surreal;
+
+final class DateTimeTest extends TestCase
+{
+    private function getDb(): Surreal
+    {
+        $db = new Surreal();
+
+        $db->connect("http://localhost:8000", [
+            "namespace" => "test",
+            "database" => "test"
+        ]);
+
+        return $db;
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testDateTime(): void
+    {
+        $db = $this->getDb();
+        $dateTime = new DateTime("2025-03-31 08:10:38.821000");
+
+        [[$record]] = $db->query("SELECT VALUE timestamp FROM dates:1");
+
+        $this->assertEquals($dateTime, $record);
+    }
+}

tests/v1/assets/setup.surql

@@ -25,6 +25,9 @@ DEFINE TABLE test
 DEFINE TABLE future_test
 	PERMISSIONS FULL;
 
+DEFINE TABLE dates
+    PERMISSIONS FULL;
+
 DEFINE TABLE user
     PERMISSIONS
         FOR select WHERE id = $auth.id;
@@ -45,4 +48,9 @@ CREATE user CONTENT {
 
 DEFINE FUNCTION fn::greet($name: string) {
 	RETURN "Hello, " + $name + "!";
+};
+
+DELETE dates:1;
+CREATE dates:1 CONTENT {
+    timestamp: d'2025-03-31T08:10:38.821Z'
 };

tests/v2/assets/setup.surql

@@ -31,6 +31,9 @@ DEFINE TABLE upsert
 DEFINE TABLE future_test
 	PERMISSIONS FULL;
 
+DEFINE TABLE dates
+    PERMISSIONS FULL;
+
 DEFINE TABLE user
     PERMISSIONS
         FOR select WHERE id = $auth.id;
@@ -52,4 +55,9 @@ CREATE user CONTENT {
 
 DEFINE FUNCTION fn::greet($name: string) {
 	RETURN "Hello, " + $name + "!";
+};
+
+DELETE dates:1;
+CREATE dates:1 CONTENT {
+    timestamp: d'2025-03-31T08:10:38.821Z'
 };