wip

Author: brendt

packages/database/src/Builder/QueryBuilders/InsertQueryBuilder.php

@@ -11,12 +11,15 @@
 use Tempest\Database\OnDatabase;
 use Tempest\Database\Query;
 use Tempest\Database\QueryStatements\InsertStatement;
+use Tempest\Mapper\Mappers\ArrayToObjectMapper;
 use Tempest\Mapper\SerializerFactory;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Support\Arr\ImmutableArray;
 use Tempest\Support\Conditions\HasConditions;
 
+use Tests\Tempest\Integration\ORM\Models\DateTimeModel;
 use function Tempest\Database\model;
+use function Tempest\map;
 
 final class InsertQueryBuilder implements BuildsQuery
 {
@@ -88,12 +91,12 @@ private function resolveData(): array
     {
         $entries = [];
 
+        $baseModelName = model($this->model)->getName();
+
         foreach ($this->rows as $model) {
-            // Raw entries are straight up added
+            // Raw entries are converted to model objects
             if (is_array($model) || $model instanceof ImmutableArray) {
-                $entries[] = $model;
-
-                continue;
+                $model = map($model)->with(ArrayToObjectMapper::class)->to($baseModelName);
             }
 
             // The rest are model objects

packages/mapper/src/SerializerFactoryInitializer.php

@@ -27,6 +27,7 @@
 use Tempest\Mapper\Serializers\SerializableSerializer;
 use Tempest\Mapper\Serializers\StringSerializer;
 use Tempest\Reflection\PropertyReflector;
+use Tempest\DateTime\DateTime as TempestDateTime;
 
 final class SerializerFactoryInitializer implements Initializer
 {
@@ -48,6 +49,7 @@ public function initialize(Container $container): SerializerFactory
             ->addSerializer(JsonSerializable::class, SerializableSerializer::class)
             ->addSerializer(BackedEnum::class, EnumSerializer::class)
             ->addSerializer(DateTime::class, DateTimeSerializer::fromProperty(...))
+            ->addSerializer(TempestDateTime::class, DateTimeSerializer::fromProperty(...))
             ->addSerializer(fn (PropertyReflector $property) => $property->getIterableType() !== null, ArrayOfObjectsSerializer::class);
     }
 }

packages/mapper/src/Serializers/DateTimeSerializer.php

@@ -4,9 +4,9 @@
 
 namespace Tempest\Mapper\Serializers;
 
-use DateTimeInterface as NativeDateTimeInterface;
+use DateTimeInterface as PhpDateTimeInterface;
 use Tempest\DateTime\DateTime;
-use Tempest\DateTime\DateTimeInterface;
+use Tempest\DateTime\DateTimeInterface as TempestDateTimeInterface;
 use Tempest\DateTime\FormatPattern;
 use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized;
 use Tempest\Mapper\Serializer;
@@ -16,26 +16,35 @@
 final readonly class DateTimeSerializer implements Serializer
 {
     public function __construct(
-        private FormatPattern|string $format = FormatPattern::ISO8601,
+        private FormatPattern|string|null $format = null,
     ) {}
 
     public static function fromProperty(PropertyReflector $property): self
     {
-        $format = $property->getAttribute(DateTimeFormat::class)->format ?? FormatPattern::ISO8601;
+        $format = $property->getAttribute(DateTimeFormat::class)->format ?? null;
 
         return new self($format);
     }
 
     public function serialize(mixed $input): string
     {
-        if ($input instanceof NativeDateTimeInterface) {
+        if ($input instanceof PhpDateTimeInterface) {
             $input = DateTime::parse($input);
         }
 
-        if (! ($input instanceof DateTimeInterface)) {
-            throw new ValueCouldNotBeSerialized(DateTimeInterface::class);
+        if (! ($input instanceof TempestDateTimeInterface)) {
+            throw new ValueCouldNotBeSerialized(TempestDateTimeInterface::class);
         }
 
-        return $input->format($this->format);
+        $format = $this->format;
+
+        if ($format === null) {
+            $format = match(true) {
+                $input instanceof TempestDateTimeInterface => FormatPattern::SQL_DATE_TIME,
+                default => 'Y-m-d H:i:s',
+            };
+        }
+
+        return $input->format($format);
     }
 }

tests/Integration/ORM/IsDatabaseModelTest.php

@@ -5,8 +5,9 @@
 namespace Tests\Tempest\Integration\ORM;
 
 use Carbon\Carbon;
+use DateTime;
 use DateTimeImmutable;
-use Integration\ORM\Migrations\CreateCasterEnumType;
+use Tempest\DateTime\DateTime as TempestDateTime;
 use Tempest\Database\Builder\ModelDefinition;
 use Tempest\Database\Exceptions\RelationWasMissing;
 use Tempest\Database\Exceptions\ValueWasMissing;
@@ -37,6 +38,7 @@
 use Tests\Tempest\Integration\ORM\Migrations\CreateCarbonModelTable;
 use Tests\Tempest\Integration\ORM\Migrations\CreateCasterModelTable;
 use Tests\Tempest\Integration\ORM\Migrations\CreateCTable;
+use Tests\Tempest\Integration\ORM\Migrations\CreateDateTimeModelTable;
 use Tests\Tempest\Integration\ORM\Migrations\CreateHasManyChildTable;
 use Tests\Tempest\Integration\ORM\Migrations\CreateHasManyParentTable;
 use Tests\Tempest\Integration\ORM\Migrations\CreateHasManyThroughTable;
@@ -48,12 +50,14 @@
 use Tests\Tempest\Integration\ORM\Models\CasterEnum;
 use Tests\Tempest\Integration\ORM\Models\CasterModel;
 use Tests\Tempest\Integration\ORM\Models\ChildModel;
+use Tests\Tempest\Integration\ORM\Models\DateTimeModel;
 use Tests\Tempest\Integration\ORM\Models\ModelWithValidation;
 use Tests\Tempest\Integration\ORM\Models\ParentModel;
 use Tests\Tempest\Integration\ORM\Models\StaticMethodTableNameModel;
 use Tests\Tempest\Integration\ORM\Models\ThroughModel;
 
 use function Tempest\Database\model;
+use function Tempest\Database\query;
 use function Tempest\map;
 
 /**
@@ -613,4 +617,23 @@ public function test_skipped_validation(): void
             $this->assertStringNotContainsString('skip', $validationFailed->getMessage());
         }
     }
+    
+    public function test_date_field(): void
+    {
+        $this->migrate(
+            CreateMigrationsTable::class,
+            CreateDateTimeModelTable::class,
+        );
+
+        $id = query(DateTimeModel::class)->insert([
+            'phpDateTime' => new DateTime('2024-01-01 00:00:00'),
+            'tempestDateTime' => TempestDateTime::parse('2024-01-01 00:00:00'),
+        ])->execute();
+
+        /** @var DateTimeModel $model */
+        $model = query(DateTimeModel::class)->select()->whereField('id', $id)->first();
+
+        $this->assertSame('2024-01-01 00:00:00', $model->phpDateTime->format('Y-m-d H:i:s'));
+        $this->assertSame('2024-01-01 00:00:00', $model->tempestDateTime->format('yyyy-MM-dd HH:mm:ss'));
+    }
 }

tests/Integration/ORM/Migrations/CreateDateTimeModelTable.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Tempest\Integration\ORM\Migrations;
+
+use Tempest\Database\DatabaseMigration;
+use Tempest\Database\QueryStatement;
+use Tempest\Database\QueryStatements\CreateTableStatement;
+use Tests\Tempest\Integration\ORM\Models\DateTimeModel;
+
+final class CreateDateTimeModelTable implements DatabaseMigration
+{
+    public string $name = '0001_datetime_model_table';
+
+    public function up(): QueryStatement
+    {
+        return CreateTableStatement::forModel(DateTimeModel::class)
+            ->primary()
+            ->datetime('phpDateTime')
+            ->datetime('tempestDateTime');
+    }
+
+    public function down(): null
+    {
+        return null;
+    }
+}

tests/Integration/ORM/Models/DateTimeModel.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Tempest\Integration\ORM\Models;
+
+use DateTime;
+use Tempest\Database\Id;
+use Tempest\DateTime\DateTime as TempestDateTime;
+
+final class DateTimeModel
+{
+    public function __construct(
+        public Id $id,
+        public DateTime $phpDateTime,
+        public TempestDateTime $tempestDateTime,
+    ) {}
+}