Fix issue with circular loads on ORM

Author: WendellAdriel

packages/database/src/Builder/ModelInspector.php

@@ -365,7 +365,7 @@ public function getSelectFields(): ImmutableArray
         return $selectFields;
     }
 
-    public function resolveRelations(string $relationString, string $parent = ''): array
+    public function resolveRelations(string $relationString, string $parent = '', array $visitedPaths = []): array
     {
         if ($relationString === '') {
             return [];
@@ -384,6 +384,11 @@ public function resolveRelations(string $relationString, string $parent = ''): a
         unset($relationNames[0]);
 
         $relationModel = inspect($currentRelation);
+        $modelType = $relationModel->getName();
+
+        if (in_array($modelType, $visitedPaths, true)) {
+            return [$currentRelationName => $currentRelation->setParent($parent)];
+        }
 
         $newRelationString = implode('.', $relationNames);
         $currentRelation->setParent($parent);
@@ -395,10 +400,13 @@ public function resolveRelations(string $relationString, string $parent = ''): a
 
         $relations = [$currentRelationName => $currentRelation];
 
-        return [...$relations, ...$relationModel->resolveRelations($newRelationString, $newParent)];
+        return [
+            ...$relations,
+            ...$relationModel->resolveRelations($newRelationString, $newParent, [...$visitedPaths, $this->getName()]),
+        ];
     }
 
-    public function resolveEagerRelations(string $parent = ''): array
+    public function resolveEagerRelations(string $parent = '', array $visitedPaths = []): array
     {
         if (! $this->isObjectModel()) {
             return [];
@@ -418,14 +426,23 @@ public function resolveEagerRelations(string $parent = ''): array
                 continue;
             }
 
-            $relations[$property->getName()] = $currentRelation->setParent($parent);
             $newParent = ltrim(sprintf(
                 '%s.%s',
                 $parent,
                 $currentRelationName,
             ), '.');
 
-            foreach (inspect($currentRelation)->resolveEagerRelations($newParent) as $name => $nestedEagerRelation) {
+            $relationModel = inspect($currentRelation);
+            $modelType = $relationModel->getName();
+
+            if (in_array($modelType, $visitedPaths, true)) {
+                continue;
+            }
+
+            $relations[$property->getName()] = $currentRelation->setParent($parent);
+            $newVisitedPaths = [...$visitedPaths, $this->getName()];
+
+            foreach ($relationModel->resolveEagerRelations($newParent, $newVisitedPaths) as $name => $nestedEagerRelation) {
                 $relations[$name] = $nestedEagerRelation;
             }
         }

tests/Fixtures/Models/ProfileWithEager.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures\Models;
+
+use Tempest\Database\Eager;
+use Tempest\Database\IsDatabaseModel;
+use Tempest\Database\PrimaryKey;
+use Tempest\Database\Table;
+
+#[Table('profiles_with_eager')]
+final class ProfileWithEager
+{
+    use IsDatabaseModel;
+
+    public function __construct(
+        public PrimaryKey $id,
+        public string $bio,
+        #[Eager]
+        public ?UserWithEager $user = null,
+    ) {}
+}

tests/Fixtures/Models/UserWithEager.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures\Models;
+
+use Tempest\Database\Eager;
+use Tempest\Database\IsDatabaseModel;
+use Tempest\Database\PrimaryKey;
+use Tempest\Database\Table;
+
+#[Table('users_with_eager')]
+final class UserWithEager
+{
+    use IsDatabaseModel;
+
+    public function __construct(
+        public PrimaryKey $id,
+        public string $name,
+        #[Eager]
+        public ?ProfileWithEager $profile = null,
+    ) {}
+}

tests/Integration/Database/CircularEagerLoadingTest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Integration\Database;
+
+use Tests\Tempest\Fixtures\Models\UserWithEager;
+use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
+use function Tempest\Database\inspect;
+
+/**
+ * @internal
+ */
+final class CircularEagerLoadingTest extends FrameworkIntegrationTestCase
+{
+    public function test_circular_eager_loading_does_not_cause_infinite_loop(): void
+    {
+        $userInspector = inspect(UserWithEager::class);
+        $eagerRelations = $userInspector->resolveEagerRelations();
+
+        $this->assertArrayHasKey('profile', $eagerRelations);
+        $this->assertArrayNotHasKey('profile.user', $eagerRelations);
+        $this->assertCount(1, $eagerRelations);
+    }
+
+    public function test_circular_with_relations_does_not_cause_infinite_loop(): void
+    {
+        $userInspector = inspect(UserWithEager::class);
+        $relations = $userInspector->resolveRelations('profile.user.profile');
+
+        $this->assertArrayHasKey('profile', $relations);
+        $this->assertArrayHasKey('user', $relations);
+        $this->assertCount(2, $relations);
+    }
+}