Fixed a bug in custom select statement inclusion

wasxxm · Mar 7, 2022 · 6b2b79d · 6b2b79d
1 parent 50c71f7
commit 6b2b79d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/ColumnSortable/Sortable.php b/src/ColumnSortable/Sortable.php
@@ -344,8 +344,11 @@ private function formJoin(
     {
         $joinType = config('columnsortable.join_type', 'leftJoin');
 
-        $query->select($parentTable . '.*')
-            ->{$joinType}($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
+        if ($query->getQuery()->columns === null) {
+            $query->select($parentTable.'.*');
+        }
+
+        $query->{$joinType}($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
 
         if ($sub1RelatedTable) {
             $query->{$joinType}($sub1RelatedTable, $sub1RelatedParentPrimaryKey, '=', $sub1RelatedPrimaryKey);