Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nunntom wants to merge 4 commits into
base: 3.x
Choose a base branch
from
+23 −2
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e322f1e
Add test for creating model with has-one relationship
Feb 12, 2026
beda3a8
Fix infinite loop when creating a model with a hasone relationship
Feb 12, 2026
b53b45a
Create Author table to fix test in CI
Feb 13, 2026
f5e8cae
Create Publishers table to fix test in CI
Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/database/src/Builder/QueryBuilders/InsertQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,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(),
Expand Down
20 changes: 20 additions & 0 deletions tests/Integration/Database/Builder/IsDatabaseModelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,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(
Expand Down
Loading