wip

Author: brendt

packages/database/src/Mappers/SelectModelMapper.php

@@ -54,18 +54,26 @@ private function values(ModelInspector $model, array $data): array
         foreach ($data as $key => $value) {
             $relation = $model->getRelation($key);
 
-            if (! $relation instanceof HasMany) {
+            if ($relation instanceof BelongsTo) {
+                $relationModel = inspect($relation);
+
+                if (($data[$relation->name][$relationModel->getPrimaryKeyProperty()->getName()] ?? null) === null) {
+                    $data[$relation->name] = null;
+                }
+
                 continue;
             }
 
-            $mapped = [];
-            $relationModel = inspect($relation);
+            if ($relation instanceof HasMany) {
+                $mapped = [];
+                $relationModel = inspect($relation);
 
-            foreach ($value as $item) {
-                $mapped[] = $this->values($relationModel, $item);
-            }
+                foreach ($value as $item) {
+                    $mapped[] = $this->values($relationModel, $item);
+                }
 
-            $data[$key] = $mapped;
+                $data[$key] = $mapped;
+            }
         }
 
         return $data;

packages/mapper/src/Mappers/ArrayToObjectMapper.php

@@ -154,6 +154,10 @@ public function resolveValue(PropertyReflector $property, mixed $value): mixed
     {
         $caster = $this->casterFactory->forProperty($property);
 
+        if ($property->isNullable() && $value === null) {
+            return null;
+        }
+
         if ($caster === null) {
             return $value;
         }

tests/Integration/Database/Builder/IsDatabaseModelTest.php

@@ -617,6 +617,21 @@ public function test_delete_nonexistent_record(): void
 
         $this->assertNull(Foo::get($fooId));
     }
+
+    public function test_nullable_relations(): void
+    {
+        $this->migrate(
+            CreateMigrationsTable::class,
+            CreateANullableTable::class,
+            CreateBNullableTable::class,
+        );
+
+        $a = ANullableModel::create();
+
+        $a->load('b');
+
+        $this->assertNull($a->b);
+    }
 }
 
 final class Foo
@@ -963,3 +978,43 @@ public function up(): QueryStatement
             ->text('description');
     }
 }
+
+final class CreateANullableTable implements MigratesUp
+{
+    private(set) string $name = '100-create-a-nullable';
+
+    public function up(): QueryStatement
+    {
+        return new CreateTableStatement('a')
+            ->primary()
+            ->belongsTo('a.b_id', 'b.id', nullable: true);
+    }
+}
+
+final class CreateBNullableTable implements MigratesUp
+{
+    private(set) string $name = '100-create-b-nullable';
+
+    public function up(): QueryStatement
+    {
+        return new CreateTableStatement('b')
+            ->primary()
+            ->string('name');
+    }
+}
+
+#[Table('a')]
+final class ANullableModel
+{
+    use IsDatabaseModel;
+
+    public ?BNullableModel $b = null;
+}
+
+#[Table('b')]
+final class BNullableModel
+{
+    use IsDatabaseModel;
+
+    public string $name;
+}