Skip to content

Commit 3f07f9d

Browse files
committed
refactor: simplify getHasManyDeepIntermediateTable method by removing unused parameter
1 parent 0950926 commit 3f07f9d

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/EloquentDataTable.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ protected function getHasManyDeepForeignKey($model): string
191191
}
192192

193193
// Fallback: try to infer from intermediate model or use related model's key
194-
$intermediateTable = $this->getHasManyDeepIntermediateTable($model, '');
194+
$intermediateTable = $this->getHasManyDeepIntermediateTable($model);
195195
$fallbackKey = $intermediateTable
196196
? \Illuminate\Support\Str::singular($intermediateTable).'_id'
197197
: $model->getRelated()->getKeyName();
@@ -219,7 +219,7 @@ protected function getHasManyDeepLocalKey($model): string
219219
}
220220

221221
// Fallback: use the intermediate model's key name, or parent if no intermediate
222-
$intermediateTable = $this->getHasManyDeepIntermediateTable($model, '');
222+
$intermediateTable = $this->getHasManyDeepIntermediateTable($model);
223223
$through = $this->getThroughModels($model);
224224
$fallbackKey = $model->getParent()->getKeyName();
225225
if ($intermediateTable && ! empty($through)) {
@@ -236,9 +236,8 @@ protected function getHasManyDeepLocalKey($model): string
236236
* Get the intermediate table name for a HasManyDeep relationship.
237237
*
238238
* @param \Staudenmeir\EloquentHasManyDeep\HasManyDeep<\Illuminate\Database\Eloquent\Model, \Illuminate\Database\Eloquent\Model> $model
239-
* @param string $lastAlias
240239
*/
241-
protected function getHasManyDeepIntermediateTable($model, $lastAlias): ?string
240+
protected function getHasManyDeepIntermediateTable($model): ?string
242241
{
243242
// Try to get intermediate models from the relationship
244243
// HasManyDeep stores intermediate models in a protected property
@@ -412,7 +411,7 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
412411
// For HasManyDeep, we need to join through intermediate models
413412
// The relationship query already knows the structure, so we'll use it
414413
// First, join to the first intermediate model (if not already joined)
415-
$intermediateTable = $this->getHasManyDeepIntermediateTable($model, $lastAlias);
414+
$intermediateTable = $this->getHasManyDeepIntermediateTable($model);
416415

417416
if ($intermediateTable && $intermediateTable !== $lastAlias) {
418417
// Join to intermediate table first

0 commit comments

Comments
 (0)