Skip to content

Commit

Permalink
fix détection soft deletes
Browse files Browse the repository at this point in the history
  • Loading branch information
lgtaxn committed Dec 24, 2019
1 parent e8e1070 commit 0d1bfda
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/Eloquent/JoinRelBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@

class JoinRelBuilder
{
/**
* Nom du trait utilisé par le modèle pour gérer les soft deletes.
*/
const SOFT_DELETES_TRAIT = 'Illuminate\Database\Eloquent\SoftDeletes';

/**
* Instance du modèle.
*
Expand Down Expand Up @@ -148,7 +143,7 @@ protected function buildCondition(Relation $relation, $callback, $withTrashed)
$join->where($morphType, '=', $relation->getMorphClass());
}

if (!$withTrashed && in_array(static::SOFT_DELETES_TRAIT, class_uses($relation->getRelated()))) {
if (!$withTrashed && method_exists($relation->getRelated(), 'getQualifiedDeletedAtColumn')) {
$join->whereNull($relation->getRelated()->getQualifiedDeletedAtColumn());
}

Expand Down

0 comments on commit 0d1bfda

Please sign in to comment.