Fix #97

CHANGELOG.md

@@ -16,6 +16,11 @@ Types of changes
 
 ## [Unreleased]
 
+## 3.0.3 - 2021-04-23
+
+### Fixed
+* Fixed a group by clause when sorting by a particular field on ModelAbstract
+
 ## 3.0.2 - 2021-04-11
 
 ### Fixed
@@ -282,4 +287,4 @@ Types of changes
 ### Features
 * The initial release of Blog Taxonomy.
 
-[Unreleased]: https://github.com/GinoPane/oc-blogtaxonomy-plugin/compare/v3.0.2...HEAD
+[Unreleased]: https://github.com/GinoPane/oc-blogtaxonomy-plugin/compare/v3.0.3...HEAD

models/ModelAbstract.php

@@ -57,7 +57,7 @@ public function scopeListFrontend(Builder $query, array $options = [])
     {
         $this->withRelation($query, $options);
 
-        $this->queryOrderBy($query, $options);
+        $sortField = $this->queryOrderBy($query, $options);
 
         $this->queryDisplayEmpty($query, $options);
 
@@ -68,7 +68,7 @@ public function scopeListFrontend(Builder $query, array $options = [])
         // GROUP BY is required for SQLite to deal with HAVING
         // We use it for all connections just to keep implementation
         // independent from the connection being used
-        $this->queryGroupBy($query);
+        $this->queryGroupBy($query, $sortField);
 
         return $query->get();
     }
@@ -144,9 +144,9 @@ private function queryLimit(Builder $query, array $options)
      * @param Builder $query
      * @param array   $options
      *
-     * @return void
+     * @return string|null
      */
-    private function queryOrderBy(Builder $query, array $options)
+    private function queryOrderBy(Builder $query, array $options): ?string
     {
         if (!empty($options['sort']) && \array_key_exists($options['sort'], static::$sortingOptions)) {
             if ($options['sort'] === 'random') {
@@ -155,8 +155,12 @@ private function queryOrderBy(Builder $query, array $options)
                 list($sortField, $sortDirection) = explode(' ', $options['sort']);
 
                 $query->orderBy($sortField, $sortDirection);
+
+                return $sortField;
             }
         }
+
+        return null;
     }
 
     /**
@@ -191,11 +195,16 @@ protected function withRelation(Builder $query, array $options)
     }
 
     /**
-     * @param Builder $query
+     * @param Builder     $query
+     * @param string|null $sortField
      */
-    private function queryGroupBy(Builder $query)
+    private function queryGroupBy(Builder $query, ?string $sortField = null)
     {
-        $query->groupBy('id');
+        if ($sortField !== null) {
+            $query->groupBy('id', $sortField);
+        } else {
+            $query->groupBy('id');
+        }
     }
 
     /**

updates/version.yaml

@@ -1,3 +1,6 @@
+3.0.3:
+  - Fixed a group by clause when sorting by a particular field on ModelAbstract
+
 3.0.2:
   - Try to fix an issue with unsupported json data type on old DB servers