Merge pull request #61 from Kyslik/fix/self-referencing-relationship

Fix #60

Author: Kyslik

README.md

@@ -224,6 +224,7 @@ public function detail()
 ```
 
 ### Define belongsTo relation
+>**Note**: in case we have self-referencing model (like comments, categories); parent table will be aliased with `parent_` string, for more information see [issue #60](https://github.com/Kyslik/column-sortable/issues/60).
 
 ```
 /**

src/ColumnSortable/Sortable.php

@@ -61,11 +61,11 @@ private function queryOrderBuilder($query, array $sortParameters)
         $explodeResult = SortableLink::explodeSortParameter($column);
         if ( ! empty($explodeResult)) {
             $relationName = $explodeResult[0];
-            $column = $explodeResult[1];
+            $column       = $explodeResult[1];
 
             try {
                 $relation = $query->getRelation($relationName);
-                $query = $this->queryJoinBuilder($query, $relation);
+                $query    = $this->queryJoinBuilder($query, $relation);
             } catch (BadMethodCallException $e) {
                 throw new ColumnSortableException($relationName, 1, $e);
             } catch (\Exception $e) {
@@ -83,7 +83,7 @@ private function queryOrderBuilder($query, array $sortParameters)
             $query = $query->orderBy($column, $direction);
         } elseif ($this->columnExists($model, $column)) {
             $column = $model->getTable().'.'.$column;
-            $query = $query->orderBy($column, $direction);
+            $query  = $query->orderBy($column, $direction);
         }
 
         return $query;
@@ -122,16 +122,22 @@ private function parseSortParameters(array $sortParameters)
     private function queryJoinBuilder($query, $relation)
     {
         $relatedTable = $relation->getRelated()->getTable();
-        $parentTable = $relation->getParent()->getTable();
+        $parentTable  = $relation->getParent()->getTable();
+
+        if ($parentTable === $relatedTable) {
+            $query       = $query->from($parentTable.' as parent_'.$parentTable);
+            $parentTable = 'parent_'.$parentTable;
+            $relation->getParent()->setTable($parentTable);
+        }
 
         if ($relation instanceof HasOne) {
             $relatedPrimaryKey = $relation->getQualifiedForeignKeyName();
-            $parentPrimaryKey = $relation->getQualifiedParentKeyName();
+            $parentPrimaryKey  = $relation->getQualifiedParentKeyName();
 
             return $query->select($parentTable.'.*')->join($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
         } elseif ($relation instanceof BelongsTo) {
             $relatedPrimaryKey = $relation->getQualifiedOwnerKeyName();
-            $parentPrimaryKey = $relation->getQualifiedForeignKey();
+            $parentPrimaryKey  = $relation->getQualifiedForeignKey();
 
             return $query->select($parentTable.'.*')->join($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
         } else {
@@ -148,8 +154,8 @@ private function queryJoinBuilder($query, $relation)
      */
     private function columnExists($model, $column)
     {
-        return (isset($model->sortable)) ? in_array($column, $model->sortable) : Schema::hasColumn($model->getTable(),
-            $column);
+        return (isset($model->sortable)) ? in_array($column, $model->sortable) :
+            Schema::hasColumn($model->getTable(), $column);
     }
 
 
@@ -175,7 +181,7 @@ private function formatToSortParameters($sort)
 
         return ($each[0] === 0) ? ['sort' => $each[1], 'order' => $configDefaultOrder] : [
             'sort'  => $each[0],
-            'order' => $each[1]
+            'order' => $each[1],
         ];
     }
 }