group sql is being weird

ampache · May 14, 2024 · 9e0b53b · 9e0b53b
1 parent f7db6e6
commit 9e0b53b
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/Repository/Model/Query.php b/src/Repository/Model/Query.php
@@ -1143,24 +1143,22 @@ public function get_sql($limit = true): string
         $sql        = $this->_get_base_sql();
         $filter_sql = "";
         $join_sql   = "";
-        $group_sql  = "";
         $having_sql = "";
         $order_sql  = "";
         if (!$this->_state['custom']) {
             $filter_sql = $this->_get_filter_sql();
             $join_sql   = $this->_get_join_sql();
-            $group_sql  = $this->_get_group_sql();
             $having_sql = $this->_get_having_sql();
             $order_sql  = $this->_get_sort_sql();
         }
         $limit_sql = $limit ? $this->_get_limit_sql() : '';
         $final_sql = $sql . $join_sql . $filter_sql . $having_sql;
 
         if (!$this->_state['custom']) {
-            if ($this->get_type() == 'artist' || $this->get_type() == 'album') {
+            if (!empty($this->_get_group_sql())) {
+                $final_sql .= " GROUP BY " . $this->_get_group_sql() . " ";
+            } elseif ($this->get_type() == 'artist' || $this->get_type() == 'album') {
                 $final_sql .= " GROUP BY `" . $this->get_type() . "`.`name`, `" . $this->get_type() . "`.`id` ";
-            } elseif (!empty($group_sql)) {
-                $final_sql .= " GROUP BY " . $group_sql . " ";
             }
         }