Revert "Merge branch 'fix_missing_recently_albums' of git://github.co…

…m/fcharlier/sonerezh into fcharlier-fix_missing_recently_albums" This reverts commit 15f4b9f, reversing changes made to 2cded9d because it introduced a very very slow query on the database.
Sonerezh · Dec 18, 2016 · 7daf3ea · 7daf3ea
1 parent 2a13a70
commit 7daf3ea
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/Controller/SongsController.php b/app/Controller/SongsController.php
@@ -229,7 +229,7 @@ public function albums() {
             if ($page == 1) {
                 $latests = $this->Song->find('all', array(
                     'fields' => array('Song.id', 'Song.band', 'Song.album', 'Song.cover'),
-                    'group' => array('Song.album', 'Song.band'),
+                    'group' => 'Song.album',
                     'order' => 'Song.created DESC',
                     'limit' => 6
                 ));
@@ -246,14 +246,14 @@ public function albums() {
         } else {
             $subQuery = $db->buildStatement(
                 array(
-                    'fields' => array('MIN(subsong.id)', 'subsong.album', 'subsong.band'),
+                    'fields' => array('MIN(subsong.id)', 'subsong.album'),
                     'table' => $db->fullTableName($this->Song),
                     'alias' => 'subsong',
-                    'group' => array('subsong.album', 'subsong.band')
+                    'group' => 'subsong.album'
                 ),
                 $this->Song
             );
-            $subQuery = ' (Song.id, Song.album, Song.band) IN (' . $subQuery . ') ';
+            $subQuery = ' (Song.id, Song.album) IN (' . $subQuery . ') ';
 
             if ($page == 1) {
                 $latests = $this->Song->find('all', array(