wip

brendt · brendt · commit 1279dfd84cf8 · 2025-05-15T09:41:46.000+02:00
diff --git a/packages/database/src/BelongsTo.php b/packages/database/src/BelongsTo.php
@@ -18,15 +18,28 @@ final class BelongsTo implements Relation
 {
     public PropertyReflector $property;
 
+    private ?string $parent = null;
+
     public function __construct(
         private readonly ?string $relationJoin = null,
         private readonly ?string $ownerJoin = null,
     ) {}
 
+    public function setParent(string $name): self
+    {
+        $this->parent = $name;
+
+        return $this;
+    }
+
     public function getOwnerFieldName(): string
     {
         if ($this->ownerJoin) {
-            return explode('.', $this->ownerJoin)[1];
+            if (strpos($this->ownerJoin, '.') !== false) {
+                return explode('.', $this->ownerJoin)[1];
+            } else {
+                return $this->ownerJoin;
+            }
         }
 
         $relationModel = model($this->property->getType()->asClass());
@@ -40,7 +53,9 @@ public function getSelectFields(): ImmutableArray
 
         return $relationModel
             ->getSelectFields()
-            ->map(fn ($field) => new FieldStatement($relationModel->getTableName() . '.' . $field)->withAlias());
+            ->map(fn ($field) => new FieldStatement(
+                $relationModel->getTableName() . '.' . $field
+            )->withAlias()->withAliasPrefix($this->parent));
     }
 
     public function getJoinStatement(): JoinStatement
diff --git a/packages/database/src/Builder/ModelInspector.php b/packages/database/src/Builder/ModelInspector.php
@@ -18,6 +18,7 @@
 use Tempest\Validation\SkipValidation;
 use Tempest\Validation\Validator;
 
+use function Tempest\Database\model;
 use function Tempest\get;
 use function Tempest\Support\arr;
 use function Tempest\Support\str;
@@ -28,7 +29,8 @@ final class ModelInspector
 
     public function __construct(
         private object|string $model,
-    ) {
+    )
+    {
         if ($this->model instanceof ClassReflector) {
             $this->modelClass = $this->model;
         } else {
@@ -219,6 +221,38 @@ public function getRelation(string|PropertyReflector $name): ?Relation
         return $this->getBelongsTo($name) ?? $this->getHasOne($name) ?? $this->getHasMany($name);
     }
 
+    public function resolveRelations(string $relationString, string $parent = ''): array
+    {
+        if ($relationString === '') {
+            return [];
+        }
+
+        $relationNames = explode('.', $relationString);
+
+        $currentRelationName = $relationNames[0];
+
+        $currentRelation = $this->getRelation($currentRelationName);
+
+        if ($currentRelation === null) {
+            return [];
+        }
+
+        unset($relationNames[0]);
+
+        $newRelationString = implode('.', $relationNames);
+        $currentRelation->setParent($parent);
+        $newParent = ltrim(sprintf(
+            '%s.%s',
+            $parent,
+            $currentRelationName,
+        ), '.');
+
+        return [
+            $currentRelation,
+            ...model($currentRelation->property->getType()->asClass())->resolveRelations($newRelationString, $newParent)
+        ];
+    }
+
     public function getEagerRelations(): array
     {
         if (! $this->isObjectModel()) {
diff --git a/packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php b/packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php
@@ -258,14 +258,14 @@ private function getIncludedRelations(): array
 
         $relations = $definition->getEagerRelations();
 
-        foreach ($this->relations as $relation) {
-            $relation = $definition->getRelation($relation);
+        foreach ($this->relations as $relationString) {
+            $resolvedRelations = $definition->resolveRelations($relationString);
 
-            if (! $relation) {
+            if ($resolvedRelations === []) {
                 continue;
             }
 
-            $relations[$relation->property->getName()] = $relation;
+            $relations = [...$relations, ...$resolvedRelations];
         }
 
         return $relations;
diff --git a/packages/database/src/HasMany.php b/packages/database/src/HasMany.php
@@ -18,18 +18,29 @@ final class HasMany implements Relation
 {
     public PropertyReflector $property;
 
+    private ?string $parent = null;
+
     public function __construct(
         public ?string $ownerJoin = null,
         public ?string $relationJoin = null,
     ) {}
 
+    public function setParent(string $name): self
+    {
+        $this->parent = $name;
+
+        return $this;
+    }
+
     public function getSelectFields(): ImmutableArray
     {
         $relationModel = model($this->property->getIterableType()->asClass());
 
         return $relationModel
             ->getSelectFields()
-            ->map(fn ($field) => new FieldStatement($relationModel->getTableName() . '.' . $field)->withAlias());
+            ->map(fn ($field) => new FieldStatement(
+                $relationModel->getTableName() . '.' . $field,
+            )->withAlias()->withAliasPrefix($this->parent));
     }
 
     public function idField(): string
diff --git a/packages/database/src/HasOne.php b/packages/database/src/HasOne.php
@@ -18,18 +18,29 @@ final class HasOne implements Relation
 {
     public PropertyReflector $property;
 
+    private ?string $parent = null;
+
     public function __construct(
         public ?string $ownerJoin = null,
         public ?string $relationJoin = null,
     ) {}
 
+    public function setParent(string $name): self
+    {
+        $this->parent = $name;
+
+        return $this;
+    }
+
     public function getSelectFields(): ImmutableArray
     {
         $relationModel = model($this->property->getType()->asClass());
 
         return $relationModel
             ->getSelectFields()
-            ->map(fn ($field) => new FieldStatement($relationModel->getTableName() . '.' . $field)->withAlias());
+            ->map(fn ($field) => new FieldStatement(
+                $relationModel->getTableName() . '.' . $field,
+            )->withAlias()->withAliasPrefix($this->parent));
     }
 
     public function getJoinStatement(): JoinStatement
diff --git a/packages/database/src/QueryStatements/FieldStatement.php b/packages/database/src/QueryStatements/FieldStatement.php
@@ -11,6 +11,7 @@
 final class FieldStatement implements QueryStatement
 {
     private bool $withAlias = false;
+    private ?string $aliasPrefix = null;
 
     public function __construct(
         private readonly string|Stringable $field,
@@ -27,7 +28,8 @@ public function compile(DatabaseDialect $dialect): string
 
             if ($this->withAlias) {
                 $alias = sprintf(
-                    '`%s`',
+                    '`%s%s`',
+                    $this->aliasPrefix ? "$this->aliasPrefix." : "",
                     str_replace('`', '', $field),
                 );
             }
@@ -52,6 +54,13 @@ public function compile(DatabaseDialect $dialect): string
         return sprintf('%s AS `%s`', $field, trim($alias, '`'));
     }
 
+    public function withAliasPrefix(?string $prefix = null): self
+    {
+        $this->aliasPrefix = $prefix;
+
+        return $this;
+    }
+
     public function withAlias(): self
     {
         $this->withAlias = true;
diff --git a/packages/database/src/Relation.php b/packages/database/src/Relation.php
@@ -8,6 +8,8 @@
 
 interface Relation extends PropertyAttribute
 {
+    public function setParent(string $name): self;
+
     public function getSelectFields(): ImmutableArray;
 
     public function getJoinStatement(): JoinStatement;
diff --git a/packages/database/tests/QueryStatements/FieldStatementTest.php b/packages/database/tests/QueryStatements/FieldStatementTest.php
@@ -81,4 +81,15 @@ public function test_with_alias(): void
                 ->compile(DatabaseDialect::MYSQL),
         );
     }
+
+    public function test_with_alias_prefix(): void
+    {
+        $this->assertSame(
+            'authors.name AS `parent.authors.name`',
+            new FieldStatement('authors.name')
+                ->withAlias()
+                ->withAliasPrefix('parent')
+                ->compile(DatabaseDialect::SQLITE),
+        );
+    }
 }
diff --git a/tests/Integration/Database/BelongsToTest.php b/tests/Integration/Database/BelongsToTest.php
@@ -75,4 +75,15 @@ public function test_belongs_to_with_owner_join_field_and_table(): void
             $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
+
+    public function test_belongs_to_with_parent(): void
+    {
+        $model = model(OwnerModel::class);
+        $relation = $model->getRelation('relation')->setParent('parent');
+
+        $this->assertSame(
+            'relation.name AS `parent.relation.name`',
+            $relation->getSelectFields()[0]->compile(DatabaseDialect::SQLITE),
+        );
+    }
 }
diff --git a/tests/Integration/Database/Fixtures/HasOneRelationModel.php b/tests/Integration/Database/Fixtures/HasOneRelationModel.php
@@ -24,4 +24,6 @@ final class HasOneRelationModel
 
     #[HasOne(relationJoin: 'overwritten.overwritten_id')]
     public OwnerModel $relationJoinFieldAndTable;
+
+    public string $name;
 }
diff --git a/tests/Integration/Database/Fixtures/OwnerModel.php b/tests/Integration/Database/Fixtures/OwnerModel.php
@@ -23,4 +23,6 @@ final class OwnerModel
 
     #[BelongsTo(ownerJoin: 'overwritten.overwritten_id')]
     public RelationModel $ownerJoinFieldAndTable;
+
+    public string $name;
 }
diff --git a/tests/Integration/Database/Fixtures/RelationModel.php b/tests/Integration/Database/Fixtures/RelationModel.php
@@ -28,4 +28,6 @@ final class RelationModel
     /** @var \Tests\Tempest\Integration\Database\Fixtures\OwnerModel[] */
     #[HasMany(relationJoin: 'overwritten.overwritten_id')]
     public array $relationJoinFieldAndTable = [];
+
+    public string $name;
 }
diff --git a/tests/Integration/Database/HasManyTest.php b/tests/Integration/Database/HasManyTest.php
@@ -4,6 +4,7 @@
 
 use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\HasMany;
+use Tests\Tempest\Integration\Database\Fixtures\OwnerModel;
 use Tests\Tempest\Integration\Database\Fixtures\RelationModel;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
 
@@ -70,4 +71,15 @@ public function test_has_many_with_overwritten_relation_join_field_and_table():
             $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
+
+    public function test_has_many_with_parent(): void
+    {
+        $model = model(RelationModel::class);
+        $relation = $model->getRelation('owners')->setParent('parent');
+
+        $this->assertSame(
+            'owner.relation_id AS `parent.owner.relation_id`',
+            $relation->getSelectFields()[0]->compile(DatabaseDialect::SQLITE),
+        );
+    }
 }
diff --git a/tests/Integration/Database/HasOneTest.php b/tests/Integration/Database/HasOneTest.php
@@ -5,6 +5,7 @@
 use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\HasOne;
 use Tests\Tempest\Integration\Database\Fixtures\HasOneRelationModel;
+use Tests\Tempest\Integration\Database\Fixtures\RelationModel;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
 
 use function Tempest\Database\model;
@@ -70,4 +71,15 @@ public function test_has_one_with_overwritten_relation_join_field_and_table(): v
             $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
+
+    public function test_has_one_with_parent(): void
+    {
+        $model = model(HasOneRelationModel::class);
+        $relation = $model->getRelation('owner')->setParent('parent');
+
+        $this->assertSame(
+            'owner.relation_id AS `parent.owner.relation_id`',
+            $relation->getSelectFields()[0]->compile(DatabaseDialect::SQLITE),
+        );
+    }
 }
diff --git a/tests/Integration/ORM/IsDatabaseModelTest.php b/tests/Integration/ORM/IsDatabaseModelTest.php
@@ -324,10 +324,14 @@ public function test_has_one_relation(): void
 
         new ThroughModel(parent: $parent, child: $childA, child2: $childB)->save();
 
-        $child = ChildModel::get($childA->id, ['through.parent']);
-        $child2 = ChildModel::get($childB->id, ['through2.parent']);
+        $child = ChildModel::select()
+            ->with('through.parent')
+            ->get($childA->id);
 
         $this->assertSame('parent', $child->through->parent->name);
+
+        $child2 = ChildModel::get($childB->id, ['through2.parent']);
+
         $this->assertSame('parent', $child2->through2->parent->name);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -258,14 +258,14 @@ private function getIncludedRelations(): array`
`258`	`258`
`259`	`259`	`$relations = $definition->getEagerRelations();`
`260`	`260`
`261`		`- foreach ($this->relations as $relation) {`
`262`		`- $relation = $definition->getRelation($relation);`
	`261`	`+ foreach ($this->relations as $relationString) {`
	`262`	`+ $resolvedRelations = $definition->resolveRelations($relationString);`
`263`	`263`
`264`		`- if (! $relation) {`
	`264`	`+ if ($resolvedRelations === []) {`
`265`	`265`	`continue;`
`266`	`266`	`}`
`267`	`267`
`268`		`- $relations[$relation->property->getName()] = $relation;`
	`268`	`+ $relations = [...$relations, ...$resolvedRelations];`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`return $relations;`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`interface Relation extends PropertyAttribute`
`10`	`10`	`{`
	`11`	`+ public function setParent(string $name): self;`
	`12`	`+`
`11`	`13`	`public function getSelectFields(): ImmutableArray;`
`12`	`14`
`13`	`15`	`public function getJoinStatement(): JoinStatement;`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,6 @@ final class HasOneRelationModel`
`24`	`24`
`25`	`25`	`#[HasOne(relationJoin: 'overwritten.overwritten_id')]`
`26`	`26`	`public OwnerModel $relationJoinFieldAndTable;`
	`27`	`+`
	`28`	`+ public string $name;`
`27`	`29`	`}`