Skip to content

Commit

Permalink
fully qualify columns on statuses queries
Browse files Browse the repository at this point in the history
  • Loading branch information
d8vjork committed Sep 18, 2023
1 parent c2125bb commit 090f092
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/HasStatuses.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public function statuses(): Attribute
*/
public function scopeOfStatus(Builder $query, ModelStatus $status)
{
$query->where('status', $status->value ?? $status->name);
$query->where($this->qualifyColumn('status'), $status->value ?? $status->name);
}

/**
Expand All @@ -292,6 +292,9 @@ public function scopeOfStatus(Builder $query, ModelStatus $status)
*/
public function scopeOfStatuses(Builder $query, array $statuses)
{
$query->whereIn('status', array_map(fn (ModelStatus $statusCase) => $statusCase->value ?? $statusCase->name, $statuses));
$query->whereIn(
$this->qualifyColumn('status'),
array_map(fn (ModelStatus $statusCase) => $statusCase->value ?? $statusCase->name, $statuses)
);
}
}

0 comments on commit 090f092

Please sign in to comment.