fix(database): reload loaded relations when using refresh

Closes #1491

Author: innocenzi

packages/database/src/IsDatabaseModel.php

@@ -170,19 +170,20 @@ public function refresh(): self
             throw Exceptions\ModelDidNotHavePrimaryColumn::neededForMethod($this, 'refresh');
         }
 
-        $primaryKeyProperty = $model->getPrimaryKeyProperty();
-        $primaryKeyValue = $primaryKeyProperty->getValue($this);
-
-        $refreshed = self::find(id: $primaryKeyValue)->first();
+        $relations = [];
 
-        foreach (new ClassReflector($refreshed)->getPublicProperties() as $property) {
-            if ($property->hasAttribute(Virtual::class)) {
+        foreach (new ClassReflector($this)->getPublicProperties() as $property) {
+            if (! $property->getValue($this)) {
                 continue;
             }
 
-            $property->setValue($this, $property->getValue($refreshed));
+            if ($model->isRelation($property->getName())) {
+                $relations[] = $property->getName();
+            }
         }
 
+        $this->load(...$relations);
+
         return $this;
     }
 

tests/Integration/Database/ModelsWithoutIdTest.php

@@ -234,6 +234,55 @@ public function test_refresh_works_for_models_with_id(): void
         $this->assertSame('data', $mixed->another_field);
     }
 
+    public function test_refresh_works_for_models_with_unloaded_relation(): void
+    {
+        $this->migrate(
+            CreateMigrationsTable::class,
+            CreateTestUserMigration::class,
+            CreateTestProfileMigration::class,
+        );
+
+        $user = query(TestUser::class)->create(
+            name: 'Frieren',
+            email: '[email protected]',
+        );
+
+        query(TestProfile::class)->create(
+            user: $user,
+            bio: 'Ancient elf mage',
+            age: 1000,
+        );
+
+        // Get user without loading the profile relation
+        $userWithoutProfile = query(TestUser::class)->findById($user->id);
+
+        $this->assertNull($userWithoutProfile->profile);
+
+        // Update the user's name in the database
+        query(TestUser::class)
+            ->update(name: 'Frieren the Mage')
+            ->where('id', $user->id->value)
+            ->execute();
+
+        // Refresh should work even with unloaded relations
+        $userWithoutProfile->refresh();
+
+        $this->assertSame('Frieren the Mage', $userWithoutProfile->name);
+        $this->assertSame('[email protected]', $userWithoutProfile->email);
+        $this->assertNull($userWithoutProfile->profile); // Relation should still be unloaded
+
+        // Load the relation
+        $userWithoutProfile->load('profile');
+
+        $this->assertInstanceOf(TestProfile::class, $userWithoutProfile->profile);
+        $this->assertSame('Ancient elf mage', $userWithoutProfile->profile->bio);
+        $this->assertSame(1000, $userWithoutProfile->profile->age);
+
+        $userWithoutProfile->refresh();
+
+        $this->assertInstanceOf(TestProfile::class, $userWithoutProfile->profile);
+    }
+
     public function test_load_works_for_models_with_id(): void
     {
         $this->migrate(CreateMigrationsTable::class, CreateMixedModelMigration::class);
@@ -272,6 +321,43 @@ public function test_load_with_relation_works_for_models_with_id(): void
         $this->assertSame('Ancient elf mage who loves magic and collecting spells', $user->profile->bio);
         $this->assertSame(1000, $user->profile->age);
     }
+
+    // this may be a bug, but I'm adding a test just to be sure we don't break the behavior by mistake.
+    // I believe ->load should just load the specified relations, but it also reloads all properties
+    public function test_load_method_refreshes_all_properties_not_just_relations(): void
+    {
+        $this->migrate(
+            CreateMigrationsTable::class,
+            CreateTestUserMigration::class,
+            CreateTestProfileMigration::class,
+        );
+
+        $user = query(TestUser::class)->create(
+            name: 'Frieren',
+            email: '[email protected]',
+        );
+
+        query(TestProfile::class)->create(
+            user: $user,
+            bio: 'Ancient elf mage',
+            age: 1000,
+        );
+
+        $userInstance = query(TestUser::class)->findById($user->id);
+        $userInstance->name = 'Fern';
+
+        query(TestUser::class)
+            ->update(email: '[email protected]')
+            ->where('id', $user->id->value)
+            ->execute();
+
+        $userInstance->load('profile');
+
+        $this->assertSame('Frieren', $userInstance->name); // "Fern" was discarded here
+        $this->assertSame('[email protected]', $userInstance->email);
+        $this->assertInstanceOf(TestProfile::class, $userInstance->profile);
+        $this->assertNotNull($userInstance->profile->bio);
+    }
 }
 
 final class LogEntry