wip

Author: brendt

packages/database/src/Builder/ModelInspector.php

@@ -6,8 +6,6 @@
 use Tempest\Database\BelongsTo;
 use Tempest\Database\Config\DatabaseConfig;
 use Tempest\Database\Eager;
-use Tempest\Database\Exceptions\ModelDidNotHavePrimaryColumn;
-use Tempest\Database\Exceptions\ModelHadMultiplePrimaryColumns;
 use Tempest\Database\HasMany;
 use Tempest\Database\HasOne;
 use Tempest\Database\PrimaryKey;
@@ -311,7 +309,7 @@ public function isRelationLoaded(string|PropertyReflector|Relation $relation): b
             return false;
         }
 
-        if (! $relation instanceof Relation) {
+        if (! ($relation instanceof Relation)) {
             $relation = $this->getRelation($relation);
         }
 
@@ -327,7 +325,7 @@ public function isRelationLoaded(string|PropertyReflector|Relation $relation): b
             return false;
         }
 
-        return  true;
+        return true;
     }
 
     public function getSelectFields(): ImmutableArray
@@ -338,6 +336,10 @@ public function getSelectFields(): ImmutableArray
 
         $selectFields = arr();
 
+        if ($primaryKey = $this->getPrimaryKeyProperty()) {
+            $selectFields[] = $primaryKey->getName();
+        }
+
         foreach ($this->reflector->getPublicProperties() as $property) {
             $relation = $this->getRelation($property->getName());
 
@@ -360,10 +362,6 @@ public function getSelectFields(): ImmutableArray
             }
         }
 
-        if ($primaryKey = $this->getPrimaryKeyProperty()) {
-            $selectFields[] = $primaryKey->getName();
-        }
-
         return $selectFields;
     }
 
@@ -509,10 +507,6 @@ public function getPrimaryKeyProperty(): ?PropertyReflector
         return match ($primaryKeys->count()) {
             0 => null,
             default => $primaryKeys->first(),
-//            default => throw ModelHadMultiplePrimaryColumns::found(
-//                model: $this->model,
-//                properties: $primaryKeys->map(fn (PropertyReflector $property) => $property->getName())->toArray(),
-//            ),
         };
     }
 

packages/database/src/Exceptions/ModelHadMultiplePrimaryColumns.php

@@ -13,6 +13,9 @@
 use Tempest\Reflection\PropertyReflector;
 use Tempest\Validation\SkipValidation;
 
+use function Tempest\Support\arr;
+use function Tempest\Support\str;
+
 trait IsDatabaseModel
 {
     #[SkipValidation]
@@ -171,11 +174,8 @@ public function refresh(): self
     {
         $model = inspect($this);
 
-        if (! $model->hasPrimaryKey()) {
-            throw Exceptions\ModelDidNotHavePrimaryColumn::neededForMethod($this, 'refresh');
-        }
-
-        $loadedRelations = $model->getRelations()
+        $loadedRelations = $model
+            ->getRelations()
             ->filter(fn (Relation $relation) => $model->isRelationLoaded($relation));
 
         $primaryKeyProperty = $model->getPrimaryKeyProperty();
@@ -192,7 +192,7 @@ public function refresh(): self
             );
         }
 
-        foreach ($model->getValueFields() as  $property) {
+        foreach ($model->getValueFields() as $property) {
             $property->setValue(
                 object: $this,
                 value: $property->getValue($new),
@@ -209,21 +209,17 @@ public function load(string ...$relations): self
     {
         $model = inspect($this);
 
-        if (! $model->hasPrimaryKey()) {
-            throw Exceptions\ModelDidNotHavePrimaryColumn::neededForMethod($this, 'load');
-        }
-
         $primaryKeyProperty = $model->getPrimaryKeyProperty();
         $primaryKeyValue = $primaryKeyProperty->getValue($this);
 
         $new = self::get($primaryKeyValue, $relations);
 
-        foreach (new ClassReflector($new)->getPublicProperties() as $property) {
-            if (! in_array($property->getName(), $relations, strict: true)) {
-                continue;
-            }
+        $fieldsToUpdate = arr($relations)
+            ->map(fn (string $relation) => str($relation)->before('.')->toString())
+            ->unique();
 
-            $property->setValue($this, $property->getValue($new));
+        foreach ($fieldsToUpdate as $fieldToUpdate) {
+            $this->{$fieldToUpdate} = $new->{$fieldToUpdate};
         }
 
         return $this;
@@ -277,10 +273,6 @@ public function update(mixed ...$params): self
     {
         $model = inspect($this);
 
-        if (! $model->hasPrimaryKey()) {
-            throw Exceptions\ModelDidNotHavePrimaryColumn::neededForMethod($this, 'update');
-        }
-
         $model->validate(...$params);
 
         query($this)

packages/database/src/IsDatabaseModel.php

@@ -3,14 +3,12 @@
 namespace Tests\Tempest\Integration\Database\Builder;
 
 use Tempest\Database\DatabaseMigration;
-use Tempest\Database\Exceptions\ModelHadMultiplePrimaryColumns;
 use Tempest\Database\Migrations\CreateMigrationsTable;
 use Tempest\Database\PrimaryKey;
 use Tempest\Database\QueryStatement;
 use Tempest\Database\QueryStatements\CreateTableStatement;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
 
-use function Tempest\Database\inspect;
 use function Tempest\Database\query;
 
 final class CustomPrimaryKeyTest extends FrameworkIntegrationTestCase
@@ -47,16 +45,6 @@ public function test_update_or_create_with_custom_primary_key(): void
         $this->assertSame('Advanced Time Magic', $updated->magic);
     }
 
-    public function test_model_with_multiple_id_properties_throws_exception(): void
-    {
-        $this->expectException(ModelHadMultiplePrimaryColumns::class);
-        $this->expectExceptionMessage(
-            '`Tests\Tempest\Integration\Database\Builder\ModelWithMultipleIds` has multiple `Id` properties (uuid and external_id). Only one `Id` property is allowed per model.',
-        );
-
-        inspect(ModelWithMultipleIds::class)->getPrimaryKey();
-    }
-
     public function test_model_without_id_property_still_works(): void
     {
         $this->migrate(CreateMigrationsTable::class, CreateModelWithoutIdMigration::class);

tests/Integration/Database/Builder/CustomPrimaryKeyTest.php

@@ -585,47 +585,6 @@ public function test_delete_via_model_instance_with_primary_key(): void
         $this->assertSame('second', Foo::get($foo2->id)->bar);
     }
 
-    public function test_delete_via_model_instance_without_primary_key(): void
-    {
-        $this->migrate(
-            CreateMigrationsTable::class,
-            CreateModelWithoutPrimaryKeyMigration::class,
-        );
-
-        $model = new ModelWithoutPrimaryKey(name: 'Frieren', description: 'Elf mage');
-        $model->save();
-
-        $this->expectException(DeleteStatementWasInvalid::class);
-        $model->delete();
-    }
-
-    public function test_delete_via_model_class_without_primary_key(): void
-    {
-        $this->migrate(
-            CreateMigrationsTable::class,
-            CreateModelWithoutPrimaryKeyMigration::class,
-        );
-
-        query(ModelWithoutPrimaryKey::class)->create(name: 'Himmel', description: 'Hero');
-        query(ModelWithoutPrimaryKey::class)->create(name: 'Heiter', description: 'Priest');
-        query(ModelWithoutPrimaryKey::class)->create(name: 'Eisen', description: 'Warrior');
-
-        $this->assertCount(3, query(ModelWithoutPrimaryKey::class)->select()->all());
-
-        query(ModelWithoutPrimaryKey::class)
-            ->delete()
-            ->where('name', 'Himmel')
-            ->execute();
-
-        $remaining = query(ModelWithoutPrimaryKey::class)->select()->all();
-        $this->assertCount(2, $remaining);
-
-        $names = array_map(fn (ModelWithoutPrimaryKey $model) => $model->name, $remaining);
-        $this->assertContains('Heiter', $names);
-        $this->assertContains('Eisen', $names);
-        $this->assertNotContains('Himmel', $names);
-    }
-
     public function test_delete_with_uninitialized_primary_key(): void
     {
         $this->migrate(
@@ -973,8 +932,6 @@ final class StaticMethodTableNameModel
     use IsDatabaseModel;
 }
 
-
-
 #[Table('through')]
 final class ThroughModel
 {
@@ -1049,8 +1006,6 @@ public function down(): ?QueryStatement
 
 final class ModelWithoutPrimaryKey
 {
-    use IsDatabaseModel;
-
     public function __construct(
         public string $name,
         public string $description,

tests/Integration/Database/Builder/IsDatabaseModelTest.php

@@ -103,6 +103,8 @@ public function test_has_one_throws_exception_for_model_without_primary_key(): v
 #[Table('relation')]
 final class HasOneTestRelationModel
 {
+    public PrimaryKey $id;
+
     #[HasOne]
     public HasOneTestOwnerModel $owner;