fix(database): prevent infinite loop when creating a model with a HasOne relationship (#1962)

Co-authored-by: Tom Nunn <tnunn@emovia.net>

Author: nunntom

packages/database/src/Builder/QueryBuilders/InsertQueryBuilder.php

@@ -293,11 +293,12 @@ private function handleStandardHasOneRelation(HasOne $hasOne, object|array $rela
         }
 
         // TODO: we might need to bake this into the naming strategy class
-        $foreignKeyColumn = Intl\singularize_last_word($ownerModel->getTableName()) . '_' . $ownerModel->getPrimaryKey();
+        $foreignKeyProperty = Intl\singularize_last_word($ownerModel->getTableName());
+        $foreignKeyColumn = $foreignKeyProperty . '_' . $ownerModel->getPrimaryKey();
 
         $preparedData = is_array($relation)
             ? [...$relation, ...[$foreignKeyColumn => $parentId->value]]
-            : [...$this->convertObjectToArray($relation), ...[$foreignKeyColumn => $parentId->value]];
+            : [...$this->convertObjectToArray($relation, [$foreignKeyProperty]), ...[$foreignKeyColumn => $parentId->value]];
 
         $relatedModelQuery = new InsertQueryBuilder(
             model: $hasOne->property->getType()->asClass(),

tests/Integration/Database/Builder/IsDatabaseModelTest.php

@@ -184,6 +184,26 @@ public function test_all_with_relations(): void
         $this->assertEquals(1, $book->author->id->value);
     }
 
+    public function test_create_with_hasone_relation(): void
+    {
+        $this->database->migrate(
+            CreateMigrationsTable::class,
+            CreatePublishersTable::class,
+            CreateAuthorTable::class,
+            CreateBookTable::class,
+            CreateIsbnTable::class,
+        );
+
+        $book = Book::create(
+            title: 'Book Title',
+            isbn: Isbn::new(value: '123-456-789'),
+        );
+
+        $book = Book::findById($book->id)->load('isbn');
+
+        $this->assertSame('123-456-789', $book->isbn->value);
+    }
+
     public function test_missing_relation_exception(): void
     {
         $this->database->migrate(