[mb-commits] branch, mbs-5612, created. MBS-5612, revert the changes to load_for_release_groups in the previous commi...

The branch, mbs-5612 has been created
        at  62d5846b07e3ffae3da55891de37013adffc308a (commit)

- Log -----------------------------------------------------------------
commit 62d5846b07e3ffae3da55891de37013adffc308a
Author: warp <[email protected]>
Date:   Thu Nov 29 11:14:19 2012 +0100

    MBS-5612, revert the changes to load_for_release_groups in the previous commit, the previous sort behaviour was correct.

diff --git a/lib/MusicBrainz/Server/Data/Artwork.pm b/lib/MusicBrainz/Server/Data/Artwork.pm
index 46f04ee..a71b86b 100644
--- a/lib/MusicBrainz/Server/Data/Artwork.pm
+++ b/lib/MusicBrainz/Server/Data/Artwork.pm
@@ -153,9 +153,8 @@ sub load_for_release_groups
         ON release_group_cover_art.release = musicbrainz.release.id
         WHERE release.release_group IN (" . placeholders(@ids) . ")
         AND is_front = true
-        ORDER BY release.release_group,
-            release.date_year, release.date_month, release.date_day,
-            release_group_cover_art.release";
+        ORDER BY release.release_group, release_group_cover_art.release,
+                 release.date_year, release.date_month, release.date_day";
 
     $self->sql->select($query, @ids);
     while (my $row = $self->sql->next_row_hash_ref) {

commit aa5d506c026b89cd246657e7343116405c026f65
Author: warp <[email protected]>
Date:   Tue Nov 27 13:41:28 2012 +0100

    MBS-5612, Sort releases correctly when picking release group cover art.

diff --git a/lib/MusicBrainz/Server/Data/Artwork.pm b/lib/MusicBrainz/Server/Data/Artwork.pm
index bd10fa9..46f04ee 100644
--- a/lib/MusicBrainz/Server/Data/Artwork.pm
+++ b/lib/MusicBrainz/Server/Data/Artwork.pm
@@ -106,10 +106,14 @@ sub find_front_cover_by_release
         FROM cover_art_archive.index_listing
         JOIN cover_art_archive.cover_art
         ON cover_art_archive.cover_art.id = cover_art_archive.index_listing.id
+        JOIN musicbrainz.release
+        ON cover_art_archive.index_listing.release = musicbrainz.release.id
         WHERE cover_art_archive.index_listing.release
         IN (" . placeholders(@ids) . ")
         AND is_front = true
-        ORDER BY cover_art_archive.index_listing.ordering";
+        ORDER BY
+            release.date_year, release.date_month, release.date_day,
+            cover_art_archive.index_listing.ordering";
 
     my @artwork = query_to_list($self->c->sql, sub { $self->_new_from_row(@_) },
                                 $query, @ids);
@@ -149,8 +153,9 @@ sub load_for_release_groups
         ON release_group_cover_art.release = musicbrainz.release.id
         WHERE release.release_group IN (" . placeholders(@ids) . ")
         AND is_front = true
-        ORDER BY release.release_group, release_group_cover_art.release,
-                 release.date_year, release.date_month, release.date_day";
+        ORDER BY release.release_group,
+            release.date_year, release.date_month, release.date_day,
+            release_group_cover_art.release";
 
     $self->sql->select($query, @ids);
     while (my $row = $self->sql->next_row_hash_ref) {

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server