Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/Phaseolies/Database/Entity/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -1678,7 +1678,9 @@ protected function loadRelationCount(Collection $collection, string $relation, ?
$relationType = $firstModel->getLastRelationType();
$relatedModel = $firstModel->getLastRelatedModel();
$foreignKey = $firstModel->getLastForeignKey();
$localKey = $firstModel->getLastLocalKey();
$localKey = $relationType === "bindToMany"
? $firstModel->getKeyName()
: $firstModel->getLastLocalKey();

// Collect all local keys
$localKeys = array_map(fn($model) => $model->{$localKey}, $models);
Expand Down Expand Up @@ -1710,7 +1712,7 @@ protected function loadRelationCount(Collection $collection, string $relation, ?
// Set the count on each model
$countAttribute = $relation . '_count';
foreach ($models as $model) {
$key = $model->{$localKey};
$key = $model->getKey();
$model->{$countAttribute} = $counts[$key] ?? 0;
}
}
Expand Down Expand Up @@ -1738,7 +1740,6 @@ protected function loadManyToManyCount(Collection $collection, string $relation,
$foreignKey = $firstModel->getLastForeignKey();
$relatedKey = $firstModel->getLastRelatedKey();
$pivotTable = $firstModel->getLastPivotTable();
$localKey = $firstModel->getLastLocalKey();

$relatedModelInstance = new $relatedModel();
$relatedTable = $relatedModelInstance->getTable();
Expand Down Expand Up @@ -1768,7 +1769,7 @@ protected function loadManyToManyCount(Collection $collection, string $relation,
// Set the count on each model
$countAttribute = $relation . '_count';
foreach ($models as $model) {
$key = $model->{$localKey};
$key = $model->getKey();
$model->{$countAttribute} = $counts[$key] ?? 0;
}
}
Expand Down
Loading