Removal of redundant SoftDelete check

Author: selecod

src/EloquentDataTable.php

@@ -138,7 +138,6 @@ protected function isNotEagerLoaded($relation)
     protected function joinEagerLoadedColumn($relation, $relationColumn)
     {
         $table     = '';
-        $deletedAt = false;
         $lastQuery = $this->query;
         foreach (explode('.', $relation) as $eachRelation) {
             $model = $lastQuery->getRelation($eachRelation);
@@ -164,45 +163,33 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
                     $table     = $model->getRelated()->getTable();
                     $foreign   = $model->getQualifiedForeignKeyName();
                     $other     = $model->getQualifiedParentKeyName();
-                    $deletedAt = $this->checkSoftDeletesOnModel($model->getRelated());
                     break;
 
                 case $model instanceof BelongsTo:
                     $table     = $model->getRelated()->getTable();
                     $foreign   = $model->getQualifiedForeignKey();
                     $other     = $model->getQualifiedOwnerKeyName();
-                    $deletedAt = $this->checkSoftDeletesOnModel($model->getRelated());
                     break;
 
                 default:
                     throw new Exception('Relation ' . get_class($model) . ' is not yet supported.');
             }
-            $this->performJoin($table, $foreign, $other, $deletedAt);
+            $this->performJoin($table, $foreign, $other);
             $lastQuery = $model->getQuery();
         }
 
         return $table . '.' . $relationColumn;
     }
 
-    protected function checkSoftDeletesOnModel($model)
-    {
-        if (in_array('Illuminate\Database\Eloquent\SoftDeletes', class_uses($model))) {
-            return $model->getQualifiedDeletedAtColumn();
-        }
-
-        return false;
-    }
-
     /**
      * Perform join query.
      *
      * @param string $table
      * @param string $foreign
      * @param string $other
-     * @param string $deletedAt
      * @param string $type
      */
-    protected function performJoin($table, $foreign, $other, $deletedAt = false, $type = 'left')
+    protected function performJoin($table, $foreign, $other, $type = 'left')
     {
         $joins = [];
         foreach ((array) $this->getBaseQueryBuilder()->joins as $key => $join) {
@@ -212,9 +199,5 @@ protected function performJoin($table, $foreign, $other, $deletedAt = false, $ty
         if (! in_array($table, $joins)) {
             $this->getBaseQueryBuilder()->join($table, $foreign, '=', $other, $type);
         }
-
-        if ($deletedAt !== false) {
-            $this->getBaseQueryBuilder()->whereNull($deletedAt);
-        }
     }
 }