wip

Author: brendt

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

@@ -9,6 +9,7 @@
 use Tempest\Database\Builder\ModelDefinition;
 use Tempest\Database\Builder\TableDefinition;
 use Tempest\Database\Id;
+use Tempest\Database\Mappers\DatabaseModelMapper;
 use Tempest\Database\Query;
 use Tempest\Database\QueryStatements\JoinStatement;
 use Tempest\Database\QueryStatements\OrderByStatement;
@@ -65,7 +66,10 @@ public function first(mixed ...$bindings): mixed
             return $query->fetchFirst();
         }
 
-        $result = map($query)->collection()->to($this->modelClass);
+        $result = map($query)
+            ->collection()
+            ->with(DatabaseModelMapper::class)
+            ->to($this->modelClass);
 
         if ($result === []) {
             return null;

…abase/src/Mappers/QueryToModelMapper.php …base/src/Mappers/DatabaseModelMapper.phppackages/database/src/Mappers/QueryToModelMapper.php renamed to packages/database/src/Mappers/DatabaseModelMapper.php packages/database/src/Mappers/QueryToModelMapper.php renamed to packages/database/src/Mappers/DatabaseModelMapper.php

@@ -5,21 +5,21 @@
 namespace Tempest\Database\Mappers;
 
 use Tempest\Database\Builder\ModelDefinition;
-use Tempest\Database\Query;
 use Tempest\Mapper\CasterFactory;
 use Tempest\Mapper\Mapper;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\PropertyReflector;
 
-final readonly class QueryToModelMapper implements Mapper
+// TODO: refactor
+final readonly class DatabaseModelMapper implements Mapper
 {
     public function __construct(
         private CasterFactory $casterFactory,
     ) {}
 
     public function canMap(mixed $from, mixed $to): bool
     {
-        return $from instanceof Query;
+        return false;
     }
 
     public function map(mixed $from, mixed $to): array

tests/Fixtures/Migrations/CreateIsbnTable.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures\Migrations;
+
+use Tempest\Database\DatabaseMigration;
+use Tempest\Database\QueryStatement;
+use Tempest\Database\QueryStatements\CreateTableStatement;
+use Tempest\Database\QueryStatements\DropTableStatement;
+use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
+use Tests\Tempest\Fixtures\Modules\Books\Models\Isbn;
+
+final class CreateIsbnTable implements DatabaseMigration
+{
+    private(set) string $name = '0000-00-00_create_isbns_table';
+
+    public function up(): QueryStatement
+    {
+        return CreateTableStatement::forModel(Isbn::class)
+            ->primary()
+            ->text('value')
+            ->belongsTo('isbns.book_id', 'books.id');
+    }
+
+    public function down(): QueryStatement
+    {
+        return DropTableStatement::forModel(Book::class);
+    }
+}

tests/Integration/Database/Mappers/DatabaseModelMapperTest.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Integration\Database\Mappers;
+
+use Tests\Tempest\Fixtures\Migrations\CreateIsbnTable;
+use Tempest\Database\Migrations\CreateMigrationsTable;
+use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
+use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
+use Tests\Tempest\Fixtures\Migrations\CreateChapterTable;
+use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+use function Tempest\Database\query;
+
+final class DatabaseModelMapperTest extends FrameworkIntegrationTestCase
+{
+    public function test_map(): void
+    {
+        $this->seed();
+
+        $query = query('books')
+            ->select(
+                'books.title',
+                'authors.name',
+            )
+            ->build()
+        ;
+    }
+
+    private function seed(): void
+    {
+        $this->migrate(
+            CreateMigrationsTable::class,
+            CreateAuthorTable::class,
+            CreateBookTable::class,
+            CreateChapterTable::class,
+            CreateIsbnTable::class,
+        );
+
+        query('authors')->insert(
+            ['name' => 'Brent'],
+            ['name' => 'Tolkien'],
+        )->execute();
+
+        query('books')->insert(
+            ['title' => 'LOTR 1', 'author_id' => 2],
+            ['title' => 'LOTR 2', 'author_id' => 2],
+            ['title' => 'LOTR 3', 'author_id' => 2],
+            ['title' => 'Timeline Taxi', 'author_id' => 1],
+        )->execute();
+
+        query('isbns')->insert(
+            ['value' => 'lotr-1', 'book_id' => 1],
+            ['value' => 'lotr-2', 'book_id' => 2],
+            ['value' => 'lotr-3', 'book_id' => 3],
+            ['value' => 'tt', 'book_id' => 4],
+        )->execute();
+
+        query('chapters')->insert(
+            ['title' => 'LOTR 1.1', 'book_id' => 1],
+            ['title' => 'LOTR 1.2', 'book_id' => 1],
+            ['title' => 'LOTR 1.3', 'book_id' => 1],
+            ['title' => 'LOTR 2.1', 'book_id' => 2],
+            ['title' => 'LOTR 2.2', 'book_id' => 2],
+            ['title' => 'LOTR 2.3', 'book_id' => 2],
+            ['title' => 'LOTR 3.1', 'book_id' => 3],
+            ['title' => 'LOTR 3.2', 'book_id' => 3],
+            ['title' => 'LOTR 3.3', 'book_id' => 3],
+            ['title' => 'Timeline Taxi Chapter 1', 'book_id' => 4],
+            ['title' => 'Timeline Taxi Chapter 2', 'book_id' => 4],
+            ['title' => 'Timeline Taxi Chapter 3', 'book_id' => 4],
+            ['title' => 'Timeline Taxi Chapter 4', 'book_id' => 4],
+        )->execute();
+    }
+}