wip

Author: brendt

packages/database/src/BelongsTo.php

@@ -18,6 +18,10 @@ final class BelongsTo implements Relation
 {
     public PropertyReflector $property;
 
+    public string $name {
+        get => $this->property->getName();
+    }
+
     private ?string $parent = null;
 
     public function __construct(

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

@@ -51,8 +51,8 @@ public function __construct(string|object $model, ?ImmutableArray $fields = null
         $this->select = new SelectStatement(
             table: $this->model->getTableDefinition(),
             fields: $fields ?? $this->model
-            ->getSelectFields()
-            ->map(fn (string $fieldName) => new FieldStatement("{$this->model->getTableName()}.{$fieldName}")->withAlias()),
+                ->getSelectFields()
+                ->map(fn (string $fieldName) => new FieldStatement("{$this->model->getTableName()}.{$fieldName}")->withAlias()),
         );
     }
 

packages/database/src/HasMany.php

@@ -18,6 +18,10 @@ final class HasMany implements Relation
 {
     public PropertyReflector $property;
 
+    public string $name {
+        get => $this->property->getName();
+    }
+
     private ?string $parent = null;
 
     public function __construct(

packages/database/src/HasOne.php

@@ -18,6 +18,10 @@ final class HasOne implements Relation
 {
     public PropertyReflector $property;
 
+    public string $name {
+        get => $this->property->getName();
+    }
+
     private ?string $parent = null;
 
     public function __construct(

packages/database/src/Mappers/SelectModelMapper.php

@@ -2,7 +2,10 @@
 
 namespace Tempest\Database\Mappers;
 
+use Tempest\Database\BelongsTo;
 use Tempest\Database\Builder\ModelInspector;
+use Tempest\Database\HasMany;
+use Tempest\Database\HasOne;
 use Tempest\Discovery\SkipDiscovery;
 use Tempest\Mapper\Mapper;
 
@@ -43,39 +46,39 @@ private function normalizeFields(ModelInspector $model, array $rows): array
 
         foreach ($rows as $row) {
             foreach ($row as $field => $value) {
-                $mainField = explode('.', $field)[0];
+                $parts = explode('.', $field);
+
+                $mainField = $parts[0];
 
                 // Main fields
                 if ($mainField === $mainTable) {
-                    $data[substr($field, strlen($mainTable) + 1)] = $value;
+                    $data[$parts[1]] = $value;
                     continue;
                 }
 
-                // BelongsTo
-                if ($belongsTo = $model->getBelongsTo($mainField)) {
-                    $data[$belongsTo->property->getName()][str_replace($mainField . '.', '', $field)] = $value;
-                    continue;
-                }
+                $relation = $model->getRelation($parts[0]);
+
+                // IF count > 2
 
-                // HasOne
-                if ($hasOne = $model->getHasOne($mainField)) {
-                    $data[$hasOne->property->getName()][str_replace($mainField . '.', '', $field)] = $value;
+                // BelongsTo
+                if ($relation instanceof BelongsTo || $relation instanceof HasOne) {
+                    $data[$relation->name][$parts[1]] = $value;
                     continue;
                 }
 
                 // HasMany
-                if ($hasMany = $model->getHasMany($mainField)) {
-                    $hasManyId = $row[$hasMany->idField()];
+                if ($relation instanceof HasMany) {
+                    $hasManyId = $row[$relation->idField()];
 
                     if ($hasManyId === null) {
                         // Empty has many relations are initialized it with an empty array
-                        $data[$hasMany->property->getName()] ??= [];
+                        $data[$relation->name] ??= [];
                         continue;
                     }
 
-                    $hasManyRelations[$hasMany->property->getName()] ??= $hasMany;
+                    $hasManyRelations[$relation->name] ??= $relation;
 
-                    $data[$hasMany->property->getName()][$hasManyId][str_replace($mainField . '.', '', $field)] = $value;
+                    $data[$relation->name][$hasManyId][str_replace($mainField . '.', '', $field)] = $value;
                 }
             }
         }

packages/database/src/Relation.php

@@ -8,6 +8,10 @@
 
 interface Relation extends PropertyAttribute
 {
+    public string $name {
+        get;
+    }
+
     public function setParent(string $name): self;
 
     public function getSelectFields(): ImmutableArray;

tests/Fixtures/Migrations/CreateAuthorTable.php

@@ -6,6 +6,7 @@
 
 use Tempest\Database\DatabaseMigration;
 use Tempest\Database\QueryStatement;
+use Tempest\Database\QueryStatements\BelongsToStatement;
 use Tempest\Database\QueryStatements\CreateTableStatement;
 use Tempest\Database\QueryStatements\DropTableStatement;
 use Tempest\Database\QueryStatements\PrimaryKeyStatement;
@@ -18,14 +19,11 @@ final class CreateAuthorTable implements DatabaseMigration
 
     public function up(): QueryStatement
     {
-        return new CreateTableStatement(
-            'authors',
-            [
-                new PrimaryKeyStatement(),
-                new TextStatement('name'),
-                new TextStatement('type', nullable: true),
-            ],
-        );
+        return CreateTableStatement::forModel(Author::class)
+            ->primary()
+            ->text('name')
+            ->text('type', nullable: true)
+            ->belongsTo('authors.publisher_id', 'publishers.id', nullable: true);
     }
 
     public function down(): QueryStatement

tests/Fixtures/Migrations/CreatePublishersTable.php

@@ -0,0 +1,29 @@
+<?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\Publisher;
+
+final class CreatePublishersTable implements DatabaseMigration
+{
+    private(set) string $name = '0000-00-00_create_publishers_table';
+
+    public function up(): QueryStatement
+    {
+        return CreateTableStatement::forModel(Publisher::class)
+            ->primary()
+            ->text('name')
+            ->text('description');
+    }
+
+    public function down(): QueryStatement
+    {
+        return DropTableStatement::forModel(Publisher::class);
+    }
+}

tests/Fixtures/Modules/Books/Models/Author.php

@@ -17,5 +17,6 @@ public function __construct(
 
         /** @var \Tests\Tempest\Fixtures\Modules\Books\Models\Book[] */
         public array $books = [],
+        public ?Publisher $publisher = null,
     ) {}
 }

tests/Fixtures/Modules/Books/Models/Publisher.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Tests\Tempest\Fixtures\Modules\Books\Models;
+
+use Tempest\Database\Id;
+
+final class Publisher
+{
+    public Id $id;
+
+    public string $name;
+
+    public string $description;
+}