fix column-sortable not working with withCount() Kyslik#49

fix Kyslik#49 Kyslik#49
ster · Aug 24, 2023 · c33286f · c33286f
1 parent 80a7f05
commit c33286f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/ColumnSortable/Sortable.php b/src/ColumnSortable/Sortable.php
@@ -219,6 +219,10 @@ private function formJoin($query, $parentTable, $relatedTable, $parentPrimaryKey
     {
         $joinType = config('columnsortable.join_type', 'leftJoin');
 
-        return $query->select($parentTable.'.*')->{$joinType}($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
+        if ($query->getQuery()->columns === null) {
+            $query->select($parentTable.'.*');
+        }
+
+        return $query->{$joinType}($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
     }
 }